Skip to content

Commit 022c808

Browse files
Add Java 25 support
1 parent 5547817 commit 022c808

4 files changed

Lines changed: 11 additions & 4 deletions

File tree

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
jdk: ['8', '11', '17', '21']
19+
jdk: ['8', '11', '17', '21', '25']
2020
os: [ubuntu-latest, windows-latest]
2121

2222
steps:

batik-test-old/src/test/java/org/apache/batik/svg/ValidateDTDTestCase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
3030
public class ValidateDTDTestCase {
3131
@Test
3232
public void testValidateDTD() throws Exception {
33+
System.setProperty("jdk.xml.maxParameterEntitySizeLimit", "100000");
3334
String svgContent = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" +
3435
"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n" +
3536
"<svg width=\"100\" height=\"100\" xmlns=\"http://www.w3.org/2000/svg\">\n" +

batik-test-old/src/test/java/org/apache/batik/util/ApplicationSecurityEnforcerTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ public boolean runImplBasic() {
9494
} catch (UnsupportedOperationException e) {
9595
return true;
9696
} finally {
97-
System.setSecurityManager(null);
97+
try {
98+
System.setSecurityManager(null);
99+
} catch (UnsupportedOperationException e) {
100+
}
98101
}
99102

100103
return false;
@@ -117,7 +120,10 @@ public boolean runImplBasic() {
117120
return true;
118121
}
119122
} finally {
120-
System.setSecurityManager(null);
123+
try {
124+
System.setSecurityManager(null);
125+
} catch (UnsupportedOperationException e) {
126+
}
121127
}
122128

123129
return false;

batik-test/src/main/java/org/apache/batik/test/PerformanceTestValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public TestReport runImpl() throws Exception {
7272
return result;
7373
}
7474

75-
p.setReferenceScore(score*4);
75+
p.setReferenceScore(score*5);
7676
r = p.run();
7777
assertTrue(!r.hasPassed());
7878
if (!r.getErrorCode().equals("unexpected.performance.improvement")) {

0 commit comments

Comments
 (0)