Skip to content

Commit 39a3daa

Browse files
arar
committed
upgrade to Java 26 and Gradle 9.4.1
1 parent 3e4ed70 commit 39a3daa

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎.github/workflows/jpos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
java: [ 25 ]
10+
java: [ 26 ]
1111
os: [ubuntu-latest]
1212
runs-on: ${{ matrix.os }}
1313
steps:

‎.sdkmanrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
java=25.0.1-amzn
2-
gradle=9.2.1
1+
java=26-amzn
2+
gradle=9.4.1
33

‎gradle/wrapper/gradle-wrapper.jar‎

3.25 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎jpos/src/test/java/org/jpos/iso/packager/GenericPackagerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public void testGenericContentHandlerStartElementThrowsSAXException() throws Thr
301301
if (isJavaVersionAtMost(JAVA_10)) {
302302
assertNull(ex.getMessage(), "ex.getMessage()");
303303
} else if (isJavaVersionAtMost(JAVA_14)) {
304-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
304+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
305305
} else {
306306
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
307307
}
@@ -325,9 +325,9 @@ public void testGenericContentHandlerStartElementThrowsSAXException1() throws Th
325325
if (isJavaVersionAtMost(JAVA_10)) {
326326
assertNull(ex.getMessage(), "ex.getMessage()");
327327
} else {
328-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
328+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
329329
}
330-
assertNull(ex.getException().getMessage(), "ex.getException().getMessage()");
330+
assertTrue(ex.getException() instanceof NullPointerException, "ex.getException()");
331331
assertEquals(0, atts.getLength(), "(AttributesImpl) atts.getLength()");
332332
}
333333
}
@@ -344,7 +344,7 @@ public void testGenericContentHandlerStartElementThrowsSAXException2() throws Th
344344
if (isJavaVersionAtMost(JAVA_10)) {
345345
assertNull(ex.getMessage(), "ex.getMessage()");
346346
} else if (isJavaVersionAtMost(JAVA_14)) {
347-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
347+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
348348
} else {
349349
assertEquals("java.lang.NullPointerException: Cannot invoke \"String.equals(Object)\" because \"localName\" is null", ex.getMessage(), "ex.getMessage()");
350350
}
@@ -368,7 +368,7 @@ public void testGenericContentHandlerStartElementThrowsSAXException3() throws Th
368368
if (isJavaVersionAtMost(JAVA_10)) {
369369
assertNull(ex.getMessage(), "ex.getMessage()");
370370
} else if (isJavaVersionAtMost(JAVA_14)) {
371-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
371+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
372372
} else {
373373
assertEquals("java.lang.NullPointerException: Cannot invoke \"java.util.Stack.push(Object)\" because \"this.fieldStack\" is null", ex.getMessage(), "ex.getMessage()");
374374
}

‎jpos/src/test/java/org/jpos/iso/packager/GenericValidatingPackagerTest.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,9 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException1()
411411
if (isJavaVersionAtMost(JAVA_10)) {
412412
assertNull(ex.getMessage(), "ex.getMessage()");
413413
} else {
414-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
414+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
415415
}
416-
assertNull(ex.getException().getMessage(), "ex.getException().getMessage()");
416+
assertTrue(ex.getException() instanceof NullPointerException, "ex.getException()");
417417
assertEquals(0, atts.getLength(), "(AttributesImpl) atts.getLength()");
418418
}
419419
}
@@ -430,7 +430,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException10()
430430
if (isJavaVersionAtMost(JAVA_10)) {
431431
assertNull(ex.getMessage(), "ex.getMessage()");
432432
} else if (isJavaVersionAtMost(JAVA_14)) {
433-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
433+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
434434
} else {
435435
assertEquals("java.lang.NullPointerException: Cannot invoke \"java.util.Stack.push(Object)\" because \"this.fieldStack\" is null", ex.getMessage(), "ex.getMessage()");
436436
}
@@ -453,7 +453,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException11()
453453
if (isJavaVersionAtMost(JAVA_10)) {
454454
assertNull(ex.getMessage(), "ex.getMessage()");
455455
} else if (isJavaVersionAtMost(JAVA_14)) {
456-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
456+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
457457
} else {
458458
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
459459
}
@@ -477,7 +477,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException2()
477477
if (isJavaVersionAtMost(JAVA_10)) {
478478
assertNull(ex.getMessage(), "ex.getMessage()");
479479
} else if (isJavaVersionAtMost(JAVA_14)) {
480-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
480+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
481481
} else {
482482
assertEquals("java.lang.NullPointerException: Cannot invoke \"String.equals(Object)\" because \"localName\" is null", ex.getMessage(), "ex.getMessage()");
483483
}
@@ -500,7 +500,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException3()
500500
if (isJavaVersionAtMost(JAVA_10)) {
501501
assertNull(ex.getMessage(), "ex.getMessage()");
502502
} else if (isJavaVersionAtMost(JAVA_14)) {
503-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
503+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
504504
} else {
505505
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
506506
}
@@ -523,7 +523,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException4()
523523
if (isJavaVersionAtMost(JAVA_10)) {
524524
assertNull(ex.getMessage(), "ex.getMessage()");
525525
} else if (isJavaVersionAtMost(JAVA_14)) {
526-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
526+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
527527
} else {
528528
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
529529
}
@@ -547,9 +547,9 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException5()
547547
if (isJavaVersionAtMost(JAVA_10)) {
548548
assertNull(ex.getMessage(), "ex.getMessage()");
549549
} else {
550-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
550+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
551551
}
552-
assertNull(ex.getException().getMessage(), "ex.getException().getMessage()");
552+
assertTrue(ex.getException() instanceof NullPointerException, "ex.getException()");
553553
assertEquals(0, atts.getLength(), "(AttributesImpl) atts.getLength()");
554554
}
555555
}
@@ -565,7 +565,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException6()
565565
if (isJavaVersionAtMost(JAVA_10)) {
566566
assertNull(ex.getMessage(), "ex.getMessage()");
567567
} else if (isJavaVersionAtMost(JAVA_14)) {
568-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
568+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
569569
} else {
570570
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
571571
}
@@ -589,9 +589,9 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException7()
589589
if (isJavaVersionAtMost(JAVA_10)) {
590590
assertNull(ex.getMessage(), "ex.getMessage()");
591591
} else {
592-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
592+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
593593
}
594-
assertNull(ex.getException().getMessage(), "ex.getException().getMessage()");
594+
assertTrue(ex.getException() instanceof NullPointerException, "ex.getException()");
595595
assertEquals(0, atts.getLength(), "(AttributesImpl) atts.getLength()");
596596
}
597597
}
@@ -608,7 +608,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException8()
608608
if (isJavaVersionAtMost(JAVA_10)) {
609609
assertNull(ex.getMessage(), "ex.getMessage()");
610610
} else if (isJavaVersionAtMost(JAVA_14)) {
611-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
611+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
612612
} else {
613613
assertEquals("java.lang.NullPointerException: Cannot invoke \"org.xml.sax.Attributes.getValue(String)\" because \"atts\" is null", ex.getMessage(), "ex.getMessage()");
614614
}
@@ -632,7 +632,7 @@ public void testGenericValidatorContentHandlerStartElementThrowsSAXException9()
632632
if (isJavaVersionAtMost(JAVA_10)) {
633633
assertNull(ex.getMessage(), "ex.getMessage()");
634634
} else if (isJavaVersionAtMost(JAVA_14)) {
635-
assertEquals("java.lang.NullPointerException", ex.getMessage(), "ex.getMessage()");
635+
assertTrue(ex.getMessage().startsWith("java.lang.NullPointerException"), "ex.getMessage()");
636636
} else {
637637
assertEquals("java.lang.NullPointerException: Cannot invoke \"java.util.Stack.peek()\" because \"this.validatorStack\" is null", ex.getMessage(), "ex.getMessage()");
638638
}

0 commit comments

Comments
 (0)