[Git][java-team/jtreg][master] 4 commits: cherry-pick upstream patches fixing Java 21 build warnings.

Tony Mancill (@tmancill) gitlab at salsa.debian.org
Fri Jan 26 05:00:41 GMT 2024



Tony Mancill pushed to branch master at Debian Java Maintainers / jtreg


Commits:
882890fb by Vladimir Petko at 2024-01-25T17:21:44+13:00
cherry-pick upstream patches fixing Java 21 build warnings.

- - - - -
cfbde3ad by Vladimir Petko at 2024-01-25T17:23:26+13:00
changelog

- - - - -
267c3959 by Vladimir Petko at 2024-01-26T11:27:19+13:00
fix typo in the patch header

- - - - -
4b4b2cc7 by Tony Mancill at 2024-01-26T05:00:25+00:00
Merge branch 'master' into 'master'

Resolve Java 21 FTBFS

See merge request java-team/jtreg!3
- - - - -


4 changed files:

- debian/changelog
- + debian/patches/java21-suppress-serial.patch
- + debian/patches/java21-this-escape.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jtreg6 (6.2+1-4) UNRELEASED; urgency=medium
+
+  * d/p/java21-*: cherry-pick upstream patches fixing Java 21 build
+    warnings (Closes: #1057511).
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Thu, 25 Jan 2024 17:22:22 +1300
+
 jtreg6 (6.2+1-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/java21-suppress-serial.patch
=====================================
@@ -0,0 +1,26 @@
+Description: cannot compile jtreg with jdk-19
+ Java 19 introduced a [serial] linter warning. The build fails due to
+ '[serial] non-transient instance field of a serializable class declared with
+ a non-serializable type'.
+Author: Jonathan Gibbons <jjg at openjdk.org>
+Origin: upstream, https://github.com/openjdk/jtreg/commit/f4f1a41e4add3187b2c73f95c06591ae2de475a4
+Bug: https://bugs.openjdk.org/browse/CODETOOLS-7903346
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057511
+Forwarded: not-needed
+Applied-Upstream: f4f1a41e4add3187b2c73f95c06591ae2de475a4
+diff --git a/src/share/classes/com/sun/javatest/diff/SuperDiff.java b/src/share/classes/com/sun/javatest/diff/SuperDiff.java
+index b40fe38..8c8d92b 100644
+--- a/src/share/classes/com/sun/javatest/diff/SuperDiff.java
++++ b/src/share/classes/com/sun/javatest/diff/SuperDiff.java
+@@ -212,10 +212,9 @@ class SuperDiff extends Diff {
+         }
+     }
+
++    @SuppressWarnings("serial")
+     static class SuperTable extends TreeMap<YearDay, Map<String, File>> {
+
+-        static final long serialVersionUID = 5933594140534747584L;
+-
+         SuperTable(File inDir, String resultPath) {
+             super();
+             for (File pDir : inDir.listFiles()) {


=====================================
debian/patches/java21-this-escape.patch
=====================================
@@ -0,0 +1,106 @@
+Description: fix [this-escape] warnings by declaring classes final.
+ [this-escape] warning is generated when a class's constructor calls
+ a method that can be overriden.
+Author: Jonathan Gibbons <jjg at openjdk.org>
+Origin: upstream, https://github.com/openjdk/jtreg/commit/48935be4685ec5c99b3fe15c10439946944c9f7e
+Bug: https://bugs.openjdk.org/browse/CODETOOLS-7903516
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057511
+Forwarded: not-needed
+Applied-Upstream: 48935be4685ec5c99b3fe15c10439946944c9f7e
+--- a/src/share/classes/com/sun/javatest/regtest/agent/AgentServer.java
++++ b/src/share/classes/com/sun/javatest/regtest/agent/AgentServer.java
+@@ -57,7 +57,7 @@
+
+
+ @SuppressWarnings("removal") // Security Manager and related APIs
+-public class AgentServer implements ActionHelper.OutputHandler {
++public final class AgentServer implements ActionHelper.OutputHandler {
+
+     /**
+      * Main program used to invoke and run the server in child JVMs
+--- a/src/share/classes/com/sun/javatest/regtest/agent/SearchPath.java
++++ b/src/share/classes/com/sun/javatest/regtest/agent/SearchPath.java
+@@ -37,7 +37,7 @@
+  * A path, as in an ordered set of file system locations, such as directories,
+  * zip files and jar files.
+  */
+-public class SearchPath {
++public final class SearchPath {
+     /**
+      * Create an empty path.
+      */
+--- a/src/share/classes/com/sun/javatest/regtest/config/Locations.java
++++ b/src/share/classes/com/sun/javatest/regtest/config/Locations.java
+@@ -44,7 +44,7 @@
+ /**
+  * Utilities to locate source and class files used by a test.
+  */
+-public class Locations {
++public final class Locations {
+     /**
+      * Used to report problems that are found.
+      */
+--- a/src/share/classes/com/sun/javatest/regtest/config/ParseException.java
++++ b/src/share/classes/com/sun/javatest/regtest/config/ParseException.java
+@@ -34,7 +34,7 @@
+  *
+  * @author Iris A Garcia
+  */
+-public class ParseException extends TestRunException
++public final class ParseException extends TestRunException
+ {
+     static final long serialVersionUID = 5598548899306920122L;
+     public ParseException(String msg) {
+@@ -44,7 +44,7 @@
+     public ParseException(Throwable t) {
+         super(PARSE_EXCEPTION + t.getMessage());
+         initCause(t);
+-    } // ParseExeptionException()
++    }
+
+     //----------misc statics----------------------------------------------------
+
+--- a/src/share/classes/com/sun/javatest/regtest/config/RegressionParameters.java
++++ b/src/share/classes/com/sun/javatest/regtest/config/RegressionParameters.java
+@@ -65,7 +65,7 @@
+ import static com.sun.javatest.regtest.util.StringUtils.join;
+
+
+-public class RegressionParameters
++public final class RegressionParameters
+     extends BasicInterviewParameters
+     implements Parameters.EnvParameters
+ {
+--- a/src/share/classes/com/sun/javatest/regtest/config/RegressionTestFinder.java
++++ b/src/share/classes/com/sun/javatest/regtest/config/RegressionTestFinder.java
+@@ -66,7 +66,7 @@
+   * @see com.sun.javatest.TestFinder
+   * @see com.sun.javatest.finder.TagTestFinder
+   */
+-public class RegressionTestFinder extends TagTestFinder
++public final class RegressionTestFinder extends TagTestFinder
+ {
+     /**
+      * Constructs the list of file names to exclude for pruning in the search
+--- a/src/share/classes/com/sun/javatest/regtest/config/RegressionTestSuite.java
++++ b/src/share/classes/com/sun/javatest/regtest/config/RegressionTestSuite.java
+@@ -51,7 +51,7 @@
+ import com.sun.javatest.regtest.tool.RegressionContextManager;
+
+
+-public class RegressionTestSuite extends TestSuite
++public final class RegressionTestSuite extends TestSuite
+ {
+     static Map<File, SoftReference<RegressionTestSuite>> cache;
+
+--- a/src/share/classes/com/sun/javatest/regtest/util/StreamCopier.java
++++ b/src/share/classes/com/sun/javatest/regtest/util/StreamCopier.java
+@@ -34,7 +34,7 @@
+ /**
+  * A thread to copy an input stream/reader to an output stream/writer.
+  */
+-public class StreamCopier extends Thread {
++public final class StreamCopier extends Thread {
+
+     public StreamCopier(InputStream in, PrintWriter out, LineScanner scanner) {
+         super(Thread.currentThread().getName() + "_StreamCopier_" + (serial++));


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,5 @@ launchers.patch
 add-jcommander-to-classpath.patch
 add-logger-to-classpath.patch
 reproducible-build.patch
+java21-this-escape.patch
+java21-suppress-serial.patch



View it on GitLab: https://salsa.debian.org/java-team/jtreg/-/compare/2def4e86b0fe9b46935fb8e34a15830ef0ec104f...4b4b2cc7fee6dcceb61d02921ce9139628b56e38

-- 
View it on GitLab: https://salsa.debian.org/java-team/jtreg/-/compare/2def4e86b0fe9b46935fb8e34a15830ef0ec104f...4b4b2cc7fee6dcceb61d02921ce9139628b56e38
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/20240126/51feddef/attachment.htm>


More information about the pkg-java-commits mailing list