[Git][java-team/grengine][master] 3 commits: Patching files to build against OpenJDK-21
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Sun Dec 17 21:06:43 GMT 2023
Pierre Gruet pushed to branch master at Debian Java Maintainers / grengine
Commits:
ece37722 by Pierre Gruet at 2023-12-17T21:32:43+01:00
Patching files to build against OpenJDK-21
- - - - -
f853d88c by Pierre Gruet at 2023-12-17T21:33:28+01:00
Updating changelog
- - - - -
4b77a7d4 by Pierre Gruet at 2023-12-17T21:34:21+01:00
Upload to unstable
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/openjdk-21.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+grengine (3.0.2+dfsg-2) unstable; urgency=medium
+
+ * Patching files to build against OpenJDK-21 (Closes: #1057505)
+
+ -- Pierre Gruet <pgt at debian.org> Sun, 17 Dec 2023 21:34:15 +0100
+
grengine (3.0.2+dfsg-1) unstable; urgency=medium
* New upstream version 3.0.2+dfsg
=====================================
debian/patches/openjdk-21.patch
=====================================
@@ -0,0 +1,172 @@
+Description: with openjdk-21, one gets build-time errors like the one in the
+ bug thread linked below. The proposed changes are not the only solutions and
+ maybe not the best ones, especially if one wants to inherit some of the
+ altered classes.
+Author: Pierre Gruet <pgt at debian.org>
+Bug-Debian: https://bugs.debian.org/1057505
+Forwarded: https://gitlab.com/jexler/grengine/-/issues/7
+Last-Update: 2023-12-17
+
+--- a/src/main/java/ch/artecat/grengine/Grengine.java
++++ b/src/main/java/ch/artecat/grengine/Grengine.java
+@@ -623,7 +623,7 @@
+ *
+ * @since 1.0
+ */
+- protected void updateEngineIfSourcesLayersModified() {
++ protected final void updateEngineIfSourcesLayersModified() {
+
+ // check if lastChecked is 0 to make sure layers are set once if latency is infinite
+ // check both boundaries of the interval to exclude problems with leap seconds etc.
+--- a/src/main/java/ch/artecat/grengine/except/ClassNameConflictException.java
++++ b/src/main/java/ch/artecat/grengine/except/ClassNameConflictException.java
+@@ -19,6 +19,7 @@
+ import ch.artecat.grengine.code.Code;
+
+ import java.util.List;
++import java.util.HashMap;
+ import java.util.Map;
+
+
+@@ -35,8 +36,8 @@
+
+ private static final long serialVersionUID = -7064452473268097551L;
+
+- private final Map<String,List<Code>> sameClassNamesInMultipleCodeLayersMap;
+- private final Map<String,List<Code>> sameClassNamesInParentAndCodeLayersMap;
++ private final HashMap<String,List<Code>> sameClassNamesInMultipleCodeLayersMap;
++ private final HashMap<String,List<Code>> sameClassNamesInParentAndCodeLayersMap;
+
+ /**
+ * constructor from exception message and maps with class conflict information.
+@@ -56,8 +57,8 @@
+ toMessageString(sameClassNamesInMultipleCodeLayersMap) +
+ ", classes in code layers and parent: " +
+ toMessageString(sameClassNamesInParentAndCodeLayersMap));
+- this.sameClassNamesInMultipleCodeLayersMap = sameClassNamesInMultipleCodeLayersMap;
+- this.sameClassNamesInParentAndCodeLayersMap = sameClassNamesInParentAndCodeLayersMap;
++ this.sameClassNamesInMultipleCodeLayersMap = (sameClassNamesInMultipleCodeLayersMap == null) ? null : new HashMap<String, List<Code>>(sameClassNamesInMultipleCodeLayersMap);
++ this.sameClassNamesInParentAndCodeLayersMap = (sameClassNamesInParentAndCodeLayersMap == null) ? null : new HashMap<String, List<Code>>(sameClassNamesInParentAndCodeLayersMap);
+ }
+
+ /**
+--- a/src/main/java/ch/artecat/grengine/except/CompileException.java
++++ b/src/main/java/ch/artecat/grengine/except/CompileException.java
+@@ -31,7 +31,7 @@
+
+ private static final long serialVersionUID = -7064452473268097551L;
+
+- private final Sources sources;
++ private final transient Sources sources;
+
+ /**
+ * constructor from exception message and sources for which compilation failed.
+--- a/src/main/java/ch/artecat/grengine/engine/Loader.java
++++ b/src/main/java/ch/artecat/grengine/engine/Loader.java
+@@ -109,7 +109,7 @@
+ *
+ * @since 1.0
+ */
+- public void setSourceClassLoader(final EngineId engineId, final SourceClassLoader sourceClassLoader) {
++ public final void setSourceClassLoader(final EngineId engineId, final SourceClassLoader sourceClassLoader) {
+ if (engineId != this.engineId) {
+ throw new IllegalArgumentException("Engine ID does not match (loader created by a different engine).");
+ }
+--- a/src/main/java/ch/artecat/grengine/sources/CompositeSources.java
++++ b/src/main/java/ch/artecat/grengine/sources/CompositeSources.java
+@@ -41,7 +41,7 @@
+ * @author Alain Stalder
+ * @author Made in Switzerland.
+ */
+-public class CompositeSources extends BaseSources {
++public final class CompositeSources extends BaseSources {
+
+ private final Builder builder;
+
+--- a/src/main/java/ch/artecat/grengine/sources/DirBasedSources.java
++++ b/src/main/java/ch/artecat/grengine/sources/DirBasedSources.java
+@@ -47,7 +47,7 @@
+ * @author Alain Stalder
+ * @author Made in Switzerland.
+ */
+-public class DirBasedSources extends BaseSources {
++public final class DirBasedSources extends BaseSources {
+
+ private final Builder builder;
+
+--- a/src/main/java/ch/artecat/grengine/sources/FixedSetSources.java
++++ b/src/main/java/ch/artecat/grengine/sources/FixedSetSources.java
+@@ -34,7 +34,7 @@
+ * @author Alain Stalder
+ * @author Made in Switzerland.
+ */
+-public class FixedSetSources extends BaseSources {
++public final class FixedSetSources extends BaseSources {
+
+ private final Builder builder;
+
+--- a/src/test/java/ch/artecat/grengine/source/MockFile.java
++++ b/src/test/java/ch/artecat/grengine/source/MockFile.java
+@@ -27,7 +27,7 @@
+
+ // so far, mocks only last modified
+ @SuppressWarnings("serial")
+-public class MockFile extends File {
++public final class MockFile extends File {
+
+ private final File lastModifiedFile;
+
+--- a/src/test/java/ch/artecat/grengine/source/SourceUtilTest.java
++++ b/src/test/java/ch/artecat/grengine/source/SourceUtilTest.java
+@@ -20,6 +20,7 @@
+
+ import java.io.File;
+ import java.io.IOException;
++import java.net.URI;
+ import java.net.URL;
+ import java.util.Arrays;
+ import java.util.HashMap;
+@@ -255,8 +256,8 @@
+
+ // given
+
+- final URL url1 = new URL("http://foo.bar/Script1.groovy");
+- final URL url2 = new URL("http://foo.bar/Script2.groovy");
++ final URL url1 = new URI("http://foo.bar/Script1.groovy").toURL();
++ final URL url2 = new URI("http://foo.bar/Script2.groovy").toURL();
+ final List<URL> urls = Arrays.asList(url1, url2);
+
+ // when
+@@ -275,8 +276,8 @@
+
+ // given
+
+- final URL url1 = new URL("http://foo.bar/Script1.groovy");
+- final URL url2 = new URL("http://foo.bar/Script2.groovy");
++ final URL url1 = new URI("http://foo.bar/Script1.groovy").toURL();
++ final URL url2 = new URI("http://foo.bar/Script2.groovy").toURL();
+
+ // when
+
+@@ -294,8 +295,8 @@
+
+ // given
+
+- final URL url1 = new URL("http://foo.bar/Script1.groovy");
+- final URL url2 = new URL("http://foo.bar/Script2.groovy");
++ final URL url1 = new URI("http://foo.bar/Script1.groovy").toURL();
++ final URL url2 = new URI("http://foo.bar/Script2.groovy").toURL();
+ final List<URL> urls = Arrays.asList(url1, url2);
+
+ // when
+@@ -314,8 +315,8 @@
+
+ // given
+
+- final URL url1 = new URL("http://foo.bar/Script1.groovy");
+- final URL url2 = new URL("http://foo.bar/Script2.groovy");
++ final URL url1 = new URI("http://foo.bar/Script1.groovy").toURL();
++ final URL url2 = new URI("http://foo.bar/Script2.groovy").toURL();
+
+ // when
+
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
build.patch
omit_tests_touching_home.patch
+openjdk-21.patch
View it on GitLab: https://salsa.debian.org/java-team/grengine/-/compare/bdb59e66c2d960f6aa94f3b4846a655c6ed16fcf...4b77a7d4e6b100daf2df6268a72aaa2ddb19c7d1
--
View it on GitLab: https://salsa.debian.org/java-team/grengine/-/compare/bdb59e66c2d960f6aa94f3b4846a655c6ed16fcf...4b77a7d4e6b100daf2df6268a72aaa2ddb19c7d1
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/20231217/af430a8f/attachment.htm>
More information about the pkg-java-commits
mailing list