Skip to content

upgrade to Java 26 and Gradle 9.4.1 #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ar merged 2 commits into from
Mar 20, 2026
Merged

upgrade to Java 26 and Gradle 9.4.1 #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39a3daa
upgrade to Java 26 and Gradle 9.4.1
ar Mar 20, 2026
ce3ef10
fix timing flake in LSpaceTest
ar Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/jpos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 25 ]
java: [ 26 ]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .sdkmanrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
java=25.0.1-amzn
gradle=9.2.1
java=26-amzn
gradle=9.4.1

Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions jpos/src/test/java/org/jpos/iso/packager/GenericPackagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ public void testGenericContentHandlerStartElementThrowsSAXException() throws Thr
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand All @@ -325,9 +325,9 @@ public void testGenericContentHandlerStartElementThrowsSAXException1() throws Th
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
}
assertNull(ex.getException().getMessage(), "ex.getException().getMessage()");
assertTrue(ex.getException() instanceof NullPointerException, "ex.getException()");
assertEquals(0, atts.getLength(), "(AttributesImpl) atts.getLength()");
}
}
Expand All @@ -344,7 +344,7 @@ public void testGenericContentHandlerStartElementThrowsSAXException2() throws Th
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"String.equals(Object)\" because \"localName\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand All @@ -368,7 +368,7 @@ public void testGenericContentHandlerStartElementThrowsSAXException3() throws Th
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"java.util.Stack.push(Object)\" because \"this.fieldStack\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand Down
28 changes: 14 additions & 14 deletions jpos/src/test/java/org/jpos/iso/packager/GenericValidatingPackagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,9 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException1()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
}
assertNull(ex.getException().getMessage(), "ex.getException().getMessage()");
assertTrue(ex.getException() instanceof NullPointerException, "ex.getException()");
assertEquals(0, atts.getLength(), "(AttributesImpl) atts.getLength()");
}
}
Expand All @@ -430,7 +430,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException10()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"java.util.Stack.push(Object)\" because \"this.fieldStack\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand All @@ -453,7 +453,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException11()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand All @@ -477,7 +477,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException2()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"String.equals(Object)\" because \"localName\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand All @@ -500,7 +500,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException3()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand All @@ -523,7 +523,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException4()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand All @@ -547,9 +547,9 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException5()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
}
assertNull(ex.getException().getMessage(), "ex.getException().getMessage()");
assertTrue(ex.getException() instanceof NullPointerException, "ex.getException()");
assertEquals(0, atts.getLength(), "(AttributesImpl) atts.getLength()");
}
}
Expand All @@ -565,7 +565,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException6()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand All @@ -589,9 +589,9 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException7()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
}
assertNull(ex.getException().getMessage(), "ex.getException().getMessage()");
assertTrue(ex.getException() instanceof NullPointerException, "ex.getException()");
assertEquals(0, atts.getLength(), "(AttributesImpl) atts.getLength()");
}
}
Expand All @@ -608,7 +608,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException8()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand All @@ -632,7 +632,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException9()
if (isJavaVersionAtMost(JAVA_10)) {
assertNull(ex.getMessage(), "ex.getMessage()");
} else if (isJavaVersionAtMost(JAVA_14)) {
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
} else {
assertEquals("java.lang.NullPointerException: Cannot invoke \"java.util.Stack.peek()\" because \"this.validatorStack\" is null", ex.getMessage(), "ex.getMessage()");
}
Expand Down
4 changes: 3 additions & 1 deletion jpos/src/test/java/org/jpos/space/LSpaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,14 +709,15 @@ public void testEntryEventuallyRemovedAfterWaitersDrain() throws Exception {
final int waiters = 10;
final CountDownLatch started = new CountDownLatch(waiters);
final CountDownLatch waiterReadyToIn = new CountDownLatch(waiters);
final CountDownLatch inpDone = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(waiters);

for (int i = 0; i < waiters; i++) {
Thread.ofVirtual().name("Waiter "+i).start(() -> {
started.countDown();
assertEquals("warmup", lsp.rd(key));
waiterReadyToIn.countDown();
LockSupport.parkNanos(1_000_000L);
try { inpDone.await(2, TimeUnit.SECONDS); } catch (InterruptedException ignored) {}
String v = lsp.in(key);
assertNotNull(v, "Waiter should eventually get a value");
assertTrue(v.startsWith("v"), "Waiter should get 'vN' where N=[0.."+(waiters-1)+"] but got '"+v+"'");
Expand All @@ -729,6 +730,7 @@ public void testEntryEventuallyRemovedAfterWaitersDrain() throws Exception {
lsp.out(key, "warmup");
assertTrue(waiterReadyToIn.await(2, TimeUnit.SECONDS));
assertEquals("warmup", lsp.inp(key));
inpDone.countDown();

// Feed values.
for (int i = 0; i < waiters; i++) {
Expand Down
Loading