[Git][java-team/jtreg][master] 3 commits: Update jtreg6 dependences for openjdk-11 and 17 (Closes: #1041282)
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Fri Aug 18 17:33:46 BST 2023
Tony Mancill pushed to branch master at Debian Java Maintainers / jtreg
Commits:
f90c037a by tony mancill at 2023-08-16T16:42:36-07:00
Update jtreg6 dependences for openjdk-11 and 17 (Closes: #1041282)
- - - - -
f1a5acda by tony mancill at 2023-08-18T09:08:18-07:00
Correct typo in patch description
- - - - -
2cc79a7c by tony mancill at 2023-08-18T09:08:18-07:00
Prepare changelog for upload
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/jtreg6.links
- + debian/patches/add-logger-to-classpath.patch
- + debian/patches/add-release-options.patch
- debian/patches/series
- − debian/patches/use-release-instead-of-source-target.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jtreg6 (6.2+1-2) unstable; urgency=medium
+
+ * Team upload.
+ * Update jtreg6 dependences for openjdk-11 and 17 (Closes: #1041282)
+ Thank you to Vladimir Petko for the patch
+
+ -- tony mancill <tmancill at debian.org> Wed, 16 Aug 2023 16:39:38 -0700
+
jtreg6 (6.2+1-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -13,7 +13,11 @@ Build-Depends:
libjtharness-java (>= 6.0),
libxalan2-java,
libhamcrest-java,
- testng
+ libtestng7-java,
+ libasmtools-java,
+ libjcommander-java,
+ libguice-java,
+ zip
Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/jtreg.git
Vcs-Browser: https://salsa.debian.org/java-team/jtreg
@@ -28,9 +32,12 @@ Depends:
javahelp2,
libjtharness-java (>= 6.0),
libhamcrest-java,
- libxalan2-java
-Recommends: testng
-Conflicts: jtreg
+ libxalan2-java,
+ libasmtools-java,
+ libjcommander-java,
+ libslf4j-java
+Recommends: libtestng7-java
+Conflicts: jtreg, jtreg7
Description: Regression Test Harness for the OpenJDK platform
jtreg is the test harness used by the OpenJDK test framework.
This framework is intended primarily for regression tests.
=====================================
debian/jtreg6.links
=====================================
@@ -1,6 +1,7 @@
usr/share/jtreg/bin/jtreg /usr/bin/jtreg
usr/share/jtreg/bin/jtdiff /usr/bin/jtdiff
+usr/share/java/hamcrest.jar /usr/share/jtreg/lib/hamcrest.jar
usr/share/java/hamcrest-core.jar /usr/share/jtreg/lib/hamcrest-core.jar
usr/share/java/javatest.jar /usr/share/jtreg/lib/javatest.jar
usr/share/java/jcommander.jar /usr/share/jtreg/lib/jcommander.jar
@@ -8,7 +9,9 @@ usr/share/java/jh.jar /usr/share/jtreg/lib/jh.jar
usr/share/java/jtreg.jar /usr/share/jtreg/lib/jtreg.jar
usr/share/java/junit4.jar /usr/share/jtreg/lib/junit.jar
usr/share/java/testng.jar /usr/share/jtreg/lib/testng.jar
+usr/share/java/asmtools.jar /usr/share/jtreg/lib/asmtools.jar
+usr/share/java/hamcrest.jar /usr/share/jtreg/share/java/hamcrest.jar
usr/share/java/hamcrest-core.jar /usr/share/jtreg/share/java/hamcrest-core.jar
usr/share/java/javatest.jar /usr/share/jtreg/share/java/javatest.jar
usr/share/java/jcommander.jar /usr/share/jtreg/share/java/jcommander.jar
@@ -16,3 +19,4 @@ usr/share/java/jh.jar /usr/share/jtreg/share/java/jh.jar
usr/share/java/jtreg.jar /usr/share/jtreg/share/java/jtreg.jar
usr/share/java/junit4.jar /usr/share/jtreg/share/java/junit.jar
usr/share/java/testng.jar /usr/share/jtreg/share/java/testng.jar
+usr/share/java/asmtools.jar /usr/share/jtreg/share/java/asmtools.jar
=====================================
debian/patches/add-logger-to-classpath.patch
=====================================
@@ -0,0 +1,55 @@
+Description: Add slf4j to the classpath in line with jcommander patch
+ Some jtreg tests are failing due to the missing slf4j (dependency of testng7).
+ Add slf4j to the classpath in line with the jcommander patch.
+Author: Vladimir Petko <vladimir.petko at canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/jtreg6/+bug/2012320
+Last-Update: 2023-03-31
+--- a/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
++++ b/src/share/classes/com/sun/javatest/regtest/exec/MainAction.java
+@@ -576,6 +576,8 @@
+ .append(script.getJUnitPath())
+ .append(script.getTestNGPath())
+ .append(new SearchPath("/usr/share/java/jcommander.jar"))
++ .append(new SearchPath("/usr/share/java/slf4j-simple.jar"))
++ .append(new SearchPath("/usr/share/java/slf4j-api.jar"))
+ .asList();
+
+ Version v = script.getRequiredVersion();
+--- a/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
++++ b/src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
+@@ -820,6 +820,8 @@
+ if (needTestNG) {
+ install(params.getTestNGPath(), md);
+ install(new SearchPath("/usr/share/java/jcommander.jar"), md);
++ install(new SearchPath("/usr/share/java/slf4j-simple.jar"), md);
++ install(new SearchPath("/usr/share/java/slf4j-api.jar"), md);
+ }
+ mp.append(md);
+ }
+@@ -830,6 +832,8 @@
+ if (needTestNG) {
+ cp.append(params.getTestNGPath());
+ cp.append(new SearchPath("/usr/share/java/jcommander.jar"));
++ cp.append(new SearchPath("/usr/share/java/slf4j-simple.jar"));
++ cp.append(new SearchPath("/usr/share/java/slf4j-api.jar"));
+ }
+ }
+
+@@ -925,6 +929,8 @@
+ if (needTestNG) {
+ install(params.getTestNGPath(), md);
+ install(new SearchPath("/usr/share/java/jcommander.jar"), md);
++ install(new SearchPath("/usr/share/java/slf4j-simple.jar"), md);
++ install(new SearchPath("/usr/share/java/slf4j-api.jar"), md);
+ }
+ mp.append(md);
+ }
+@@ -936,6 +942,8 @@
+ if (needTestNG) {
+ fp.append(params.getTestNGPath());
+ fp.append(new SearchPath("/usr/share/java/jcommander.jar"));
++ fp.append(new SearchPath("/usr/share/java/slf4j-simple.jar"));
++ fp.append(new SearchPath("/usr/share/java/slf4j-api.jar"));
+ }
+ }
+
=====================================
debian/patches/add-release-options.patch
=====================================
@@ -0,0 +1,31 @@
+Description: Set release option to be able to compile with default-jdk
+ jtreg6 does not set release option and produces class files corresponding
+ to the compiling jdk. This is expected behavior and patch is not
+ needed upstream.
+ We require this patch only to avoid dependency on openjdk-8.
+Author: Vladimir Petko <vladimir.petko at canonical.com>
+Forwarded: not-needed
+Last-Update: 2023-08-11
+--- a/make/Defs.gmk
++++ b/make/Defs.gmk
+@@ -149,7 +149,7 @@
+
+ # Only use -source -target, to support legacy platforms, when building with JDK 8
+ # Otherwise, use default values for $JDKHOME/bin/javac
+-SUPPORT_OLD_SOURCE_TARGET = $(shell $(JDKJAVAC) -version 2>&1 | grep '[8]' > /dev/null && echo true )
++SUPPORT_OLD_SOURCE_TARGET = $(shell $(JDKJAVAC) -version 2>&1 | grep '1\.8\.' > /dev/null && echo true )
+ ifneq ($(SUPPORT_OLD_SOURCE_TARGET),)
+ OLD_JAVAC_SOURCE_TARGET = -source 1.2 -target 1.1
+ AGENT_JAVAC_SOURCE_TARGET = -source 5 -target 5
+@@ -157,7 +157,10 @@
+ REGTEST_TOOL_PATCH_JAVA_BASE_OPTIONS =
+ else
+ EXTRA_LINT_OPTS = -rawtypes,-unchecked
+- REGTEST_TOOL_PATCH_JAVA_BASE_OPTIONS = --patch-module java.base=$(JAVADIR)
++ REGTEST_TOOL_PATCH_JAVA_BASE_OPTIONS =
++ OLD_JAVAC_SOURCE_TARGET = --release 8
++ AGENT_JAVAC_SOURCE_TARGET = --release 8
++ TOOL_JAVAC_SOURCE_TARGET = --release 8
+ endif
+
+ ifdef JDK5HOME
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+add-release-options.patch
launchers.patch
add-jcommander-to-classpath.patch
-use-release-instead-of-source-target.patch
+add-logger-to-classpath.patch
=====================================
debian/patches/use-release-instead-of-source-target.patch deleted
=====================================
@@ -1,22 +0,0 @@
-Description: use 'release' instead of 'target' and 'source'
- When running jtreg with openjdk-8 and the agentvm it will fail to run with
- "java.lang.NoSuchMethodError: java.nio.ByteBuffer.flip()Ljava/nio/ByteBuffer".
- An easy fix is to replace "source=1.7 target=1.7" with "release=7" in the
- ant build script.
-Author: Tiago Stürmer Daitx <tiago.daitx at ubuntu.com>
-Bug-Debian: https://bugs.debian.org/913853
-Bug-Ubuntu: https://launchpad.net/bugs/1803628
-Last-Update: 2018-11-01
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/make/build.xml
-+++ b/make/build.xml
-@@ -172,7 +172,7 @@
-
- <target name="-compile-jtreg.classes">
- <mkdir dir="${build.classes.dir}"/>
-- <javac encoding="iso-8859-1" source="1.8" target="1.8"
-+ <javac encoding="iso-8859-1" release="8"
- debug="true" debuglevel="source,lines"
- srcdir="${src.classes.dir}"
- destdir="${build.classes.dir}"
=====================================
debian/rules
=====================================
@@ -11,18 +11,23 @@ DATE := $(shell dpkg-parsechangelog --show-field Date)
dh $@ --with javahelper
override_dh_auto_build:
- ant -f make/build.xml \
- -Dant.jar=/usr/share/java/ant.jar \
- -Djtreg.build.resources=/usr/share/java \
- -Djh.jar=/usr/share/java/jh.jar \
- -Djhall.jar=/usr/share/java/jhall.jar \
- -Djunit.jar=/usr/share/java/junit4.jar \
- -Dtestng.jar=/usr/share/java/testng.jar \
- -Djavatest.jar=/usr/share/java/javatest.jar \
- -Dbuild.date.time='$(DATE)' \
- -Dbuild.version=$(VERSION) \
- -Dbuild.milestone=src \
- -Dbuild.number=$(BUILD_NUMBER)
+ cd make && \
+ make ANT=/usr/share/ant \
+ ANT_JAR=/usr/share/java/ant.jar \
+ ASMTOOLS_JAR=/usr/share/java/asmtools.jar \
+ BUILDDIR=../dist \
+ BUILD_MILESTONE=src \
+ BUILD_NUMBER=$(BUILD_NUMBER) \
+ BUILD_VERSION=$(VERSION) \
+ BUILD_VERSION_STRING="$(VERSION)+$(BUILD_NUMBER)" \
+ GOOGLE_GUICE_JAR=/usr/share/java/guice.jar \
+ HAMCREST_JAR=/usr/share/java/hamcrest.jar \
+ JAVATEST_JAR=/usr/share/java/javatest.jar \
+ JCOMMANDER_JAR=/usr/share/java/jcommander.jar \
+ JDKHOME=$(JAVA_HOME) \
+ JUNIT_JAR=/usr/share/java/junit4.jar \
+ TESTNG_JAR=/usr/share/java/testng.jar
+ mv dist/images/jtreg dist/
dh_auto_build
# Generate the manpages
View it on GitLab: https://salsa.debian.org/java-team/jtreg/-/compare/18fe40fc470b04bc735b425bba250db61340fcb3...2cc79a7c14e39c093a2be8f6dea5a111abc9fefb
--
View it on GitLab: https://salsa.debian.org/java-team/jtreg/-/compare/18fe40fc470b04bc735b425bba250db61340fcb3...2cc79a7c14e39c093a2be8f6dea5a111abc9fefb
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/20230818/14e4ec65/attachment.htm>
More information about the pkg-java-commits
mailing list