[Git][java-team/jmh][master] 7 commits: d/p/codetools-*.patch: Add patches to resolve Java 25 ftbfs (Closes: #1128168).
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Sun Mar 22 08:40:17 GMT 2026
Pierre Gruet pushed to branch master at Debian Java Maintainers / jmh
Commits:
fa656fef by Vladimir Petko at 2026-02-18T15:45:47+13:00
d/p/codetools-*.patch: Add patches to resolve Java 25 ftbfs (Closes: #1128168).
- - - - -
867bd5b1 by Vladimir Petko at 2026-02-18T15:47:26+13:00
changelog
- - - - -
84a960f1 by Vladimir Petko at 2026-02-19T08:13:01+13:00
d/p/codetools-7904156-proposed.patch: drop origin field, move value into Bug:
- - - - -
105e540d by Vladimir Petko at 2026-02-19T08:14:25+13:00
d/p/codetools-7904155-proposed.patch: drop patch.
- - - - -
6047b08a by Vladimir Petko at 2026-02-19T08:42:26+13:00
d/rules: remove SecurityManager tests.
- - - - -
25e098bc by Vladimir Petko at 2026-02-19T08:45:00+13:00
changelog
- - - - -
4e114496 by Pierre Gruet at 2026-03-22T09:40:15+01:00
Merge branch 'java25' into 'master'
Resolve Java 25 ftbfs
See merge request java-team/jmh!1
- - - - -
5 changed files:
- debian/changelog
- + debian/patches/codetools-7903596.patch
- + debian/patches/codetools-7904156-proposed.patch
- + debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+jmh (1.37-3) UNRELEASED; urgency=medium
+
+ * Resolve Java 25 ftbfs (Closes: #1128168):
+ - d/p/codetools-7903596.patch: Explicitly enable annotation
+ processors.
+ - d/p/codetools-7904156-proposed.patch: Add Java 25 safepoints
+ regular expression.
+ - d/rules: remove Security Manager tests.
+
+ -- Vladimir Petko <vladimir.petko at canonical.com> Wed, 18 Feb 2026 15:46:50 +1300
+
jmh (1.37-2) unstable; urgency=medium
* Upload to unstable
=====================================
debian/patches/codetools-7903596.patch
=====================================
@@ -0,0 +1,129 @@
+From 2aa089c4f089d3a5e647a413c01ada1234b9e7de Mon Sep 17 00:00:00 2001
+From: Jaikiran Pai <jpai at openjdk.org>
+Date: Fri, 6 Dec 2024 14:27:49 +0000
+Subject: [PATCH] 7903596: JMH: Explicitly enable annotation processors
+Origin: upstream, https://github.com/openjdk/jmh/commit/2aa089c4f089d3a5e647a413c01ada1234b9e7de
+Bug: https://bugs.openjdk.org/browse/CODETOOLS-7903596
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1128168
+Co-authored-by: Aleksey Shipilev <shade at openjdk.org>
+Reviewed-by: shade
+---
+ .../resources/archetype-resources/pom.xml | 3 ++
+ .../java/org/openjdk/jmh/ct/CompileTest.java | 5 +++-
+ jmh-core-it/pom.xml | 19 +++++++++++++
+ .../javax.annotation.processing.Processor | 28 -------------------
+ pom.xml | 3 ++
+ 5 files changed, 29 insertions(+), 29 deletions(-)
+ delete mode 100644 jmh-core-it/src/test/resources/META-INF/services/javax.annotation.processing.Processor
+
+diff --git a/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml b/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml
+index 761842cc..15562793 100644
+--- a/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml
++++ b/jmh-archetypes/jmh-java-benchmark-archetype/src/main/resources/archetype-resources/pom.xml
+@@ -88,6 +88,9 @@ THE POSSIBILITY OF SUCH DAMAGE.
+ <compilerVersion>\${javac.target}</compilerVersion>
+ <source>\${javac.target}</source>
+ <target>\${javac.target}</target>
++ <annotationProcessors>
++ <annotationProcessor>org.openjdk.jmh.generators.BenchmarkProcessor</annotationProcessor>
++ </annotationProcessors>
+ </configuration>
+ </plugin>
+ <plugin>
+diff --git a/jmh-core-ct/src/test/java/org/openjdk/jmh/ct/CompileTest.java b/jmh-core-ct/src/test/java/org/openjdk/jmh/ct/CompileTest.java
+index a48e6123..58af2aff 100644
+--- a/jmh-core-ct/src/test/java/org/openjdk/jmh/ct/CompileTest.java
++++ b/jmh-core-ct/src/test/java/org/openjdk/jmh/ct/CompileTest.java
+@@ -112,7 +112,10 @@ public class CompileTest {
+ private static Collection<String> javacOptions(boolean annProc, Class<?> klass) {
+ Collection<String> result = new ArrayList<>();
+
+- if (!annProc) {
++ if (annProc) {
++ result.add("-processor");
++ result.add("org.openjdk.jmh.generators.BenchmarkProcessor");
++ } else {
+ result.add("-proc:none");
+ }
+
+diff --git a/jmh-core-it/pom.xml b/jmh-core-it/pom.xml
+index 42afd7b7..b942a7c8 100644
+--- a/jmh-core-it/pom.xml
++++ b/jmh-core-it/pom.xml
+@@ -151,6 +151,25 @@ questions.
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
++ <executions>
++ <execution>
++ <id>test-compile</id>
++ <phase>test-compile</phase>
++ <goals>
++ <goal>testCompile</goal>
++ </goals>
++ <configuration>
++ <!--
++ Support for CustomTest: we want the JMH's processor to fire first, and then
++ see if it claims all JMH annotations, and nothing else.
++ -->
++ <annotationProcessors>
++ <annotationProcessor>org.openjdk.jmh.generators.BenchmarkProcessor</annotationProcessor>
++ <annotationProcessor>org.openjdk.jmh.it.annsteal.CustomBenchmarkProcessor</annotationProcessor>
++ </annotationProcessors>
++ </configuration>
++ </execution>
++ </executions>
+ </plugin>
+ </plugins>
+ </build>
+diff --git a/jmh-core-it/src/test/resources/META-INF/services/javax.annotation.processing.Processor b/jmh-core-it/src/test/resources/META-INF/services/javax.annotation.processing.Processor
+deleted file mode 100644
+index add9c846..00000000
+--- a/jmh-core-it/src/test/resources/META-INF/services/javax.annotation.processing.Processor
++++ /dev/null
+@@ -1,28 +0,0 @@
+-# Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation. Oracle designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Oracle in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-# or visit www.oracle.com if you need additional information or have any
+-# questions.
+-#
+-
+-# The order of these two processors is important: we want the JMH's processor
+-# to fire first, and then see if it claims all JMH annotations, and nothing else.
+-org.openjdk.jmh.generators.BenchmarkProcessor
+-org.openjdk.jmh.it.annsteal.CustomBenchmarkProcessor
+\ No newline at end of file
+diff --git a/pom.xml b/pom.xml
+index b516bec6..a1c80ccc 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -176,6 +176,9 @@ questions.
+ <compilerVersion>1.8</compilerVersion>
+ <source>1.8</source>
+ <target>1.8</target>
++ <annotationProcessors>
++ <annotationProcessor>org.openjdk.jmh.generators.BenchmarkProcessor</annotationProcessor>
++ </annotationProcessors>
+ </configuration>
+ </plugin>
+ <plugin>
+--
+2.51.0
=====================================
debian/patches/codetools-7904156-proposed.patch
=====================================
@@ -0,0 +1,39 @@
+Description: Add regular expression for Java 25 SafePointsProfiler
+ Java 25 adds extra logging after total time spent in safepoint.
+Author: Vladimir Petko <vladimir.petko at canonical.com>
+Bug: https://github.com/openjdk/jmh/pull/170
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1128168
+Last-Update: 2026-02-18
+
+diff --git a/jmh-core/src/main/java/org/openjdk/jmh/profile/SafepointsProfiler.java b/jmh-core/src/main/java/org/openjdk/jmh/profile/SafepointsProfiler.java
+index eeaa03a7b..bc98f1b11 100644
+--- a/jmh-core/src/main/java/org/openjdk/jmh/profile/SafepointsProfiler.java
++++ b/jmh-core/src/main/java/org/openjdk/jmh/profile/SafepointsProfiler.java
+@@ -219,6 +219,9 @@ public SafepointProfilerResult aggregate(Collection<SafepointProfilerResult> res
+ private static final Pattern JDK_13_LINE =
+ Pattern.compile("\\[([0-9\\.,]*)s\\]\\[info\\]\\[safepoint( *)\\] (.*) Reaching safepoint: ([0-9\\.,]*) ns, (.*) Total: ([0-9\\.,]*) ns");
+
++ private static final Pattern JDK_25_LINE =
++ Pattern.compile("\\[([0-9\\.,]*)s\\]\\[info\\]\\[safepoint( *)\\] (.*) Reaching safepoint: ([0-9\\.,]*) ns, (.*) Total: ([0-9\\.,]*) ns,(.*)");
++
+ /**
+ * Parse the line into the triplet. This is tested with unit tests, make sure to
+ * update those if changing this code.
+@@ -272,6 +275,18 @@ static ParsedData parse(String line) {
+ }
+ }
+
++ {
++ Matcher m = JDK_25_LINE.matcher(line);
++ if (m.matches()) {
++ return new ParsedData(
++ 25,
++ parseSecToNs(m.group(1)),
++ parseNs(m.group(6)),
++ parseNs(m.group(4))
++ );
++ }
++ }
++
+ return null;
+ }
=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+codetools-7903596.patch
+codetools-7904156-proposed.patch
=====================================
debian/rules
=====================================
@@ -7,3 +7,7 @@ execute_after_dh_auto_install:
# Removing codeless jar automatically installed in /usr/share/java. We keep
# the artifact for the build because it contains tests.
$(RM) debian/libjmh-java/usr/share/java/jmh-core-ct*.jar
+
+override_dh_auto_test:
+ rm -rf jmh-core-it/src/test/java/org/openjdk/jmh/it/security
+ dh_auto_test
View it on GitLab: https://salsa.debian.org/java-team/jmh/-/compare/22a98c28ecc38f0936e2cdb74674a8f3934aae37...4e114496bba293b6d42e49d0d74d4b4d3b6d9203
--
View it on GitLab: https://salsa.debian.org/java-team/jmh/-/compare/22a98c28ecc38f0936e2cdb74674a8f3934aae37...4e114496bba293b6d42e49d0d74d4b4d3b6d9203
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260322/f80af636/attachment.htm>
More information about the pkg-java-commits
mailing list