diff --git a/.classpath b/.classpath new file mode 100644 index 000000000..d39b8532d --- /dev/null +++ b/.classpath @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bee09b5a6..d319de7cd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,6 +15,9 @@ updates: bouncycastle: patterns: - "org.bouncycastle:bc*" + jarjar: + patterns: + - "com.eed3si9n.jarjar:*" jnr: patterns: - "com.github.jnr:*" diff --git a/.gitignore b/.gitignore index c40c07317..15ebe3074 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ .idea/ # Eclipse files -.classpath .externalToolBuilders/* .project .pydevproject diff --git a/b/.idea/libraries/extlibs.xml b/b/.idea/libraries/extlibs.xml index 7747a50e5..dd114468a 100644 --- a/b/.idea/libraries/extlibs.xml +++ b/b/.idea/libraries/extlibs.xml @@ -2,6 +2,7 @@ + @@ -12,7 +13,7 @@ - + diff --git a/build.gradle b/build.gradle index 52bfdbee2..61004306e 100644 --- a/build.gradle +++ b/build.gradle @@ -167,6 +167,9 @@ dependencies { testImplementation(libs.junit.jupiter) testImplementation(libs.junit.platform.launcher) testImplementation(libs.antlr.complete) + // to trigger dependabot on jarjar + testImplementation(libs.ant.jarjar) + testImplementation(libs.jarjar) } diff --git a/build.xml b/build.xml index af06e014b..43c5787d3 100644 --- a/build.xml +++ b/build.xml @@ -824,15 +824,15 @@ The text for an official release would continue like ... - + - + + - - + @@ -903,7 +903,8 @@ The text for an official release would continue like ... - + + @@ -922,17 +923,19 @@ The text for an official release would continue like ... - + + --> + diff --git a/extlibs/ant-jarjar-1.18.1.jar b/extlibs/ant-jarjar-1.18.1.jar new file mode 100644 index 000000000..463e1eef1 Binary files /dev/null and b/extlibs/ant-jarjar-1.18.1.jar differ diff --git a/extlibs/jarjar-1.18.1.jar b/extlibs/jarjar-1.18.1.jar new file mode 100644 index 000000000..eec0517e0 Binary files /dev/null and b/extlibs/jarjar-1.18.1.jar differ diff --git a/extlibs/jarjar-1.7.2.jar b/extlibs/jarjar-1.7.2.jar deleted file mode 100644 index 305260ea8..000000000 Binary files a/extlibs/jarjar-1.7.2.jar and /dev/null differ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3c712be70..817eee61b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,6 +9,7 @@ rev_guava = "33.8.0-jre" rev_icu4j = "79.1" rev_informix = "15.0.1.4" rev_jakarta_servlet_api = "6.1.0" +rev_jarjar = "1.18.1" rev_java_sizeof = "0.0.5" rev_jffi = "1.4.7" rev_jline = "4.5.0" @@ -22,6 +23,7 @@ rev_oracle = "23.26.4.0.0" [libraries] ant = { module = "org.apache.ant:ant", version.ref = "rev_ant" } +ant_jarjar = { module = "com.eed3si9n.jarjar:ant-jarjar", version.ref = "rev_jarjar" } antlr = { module = "org.antlr:antlr", version.ref = "rev_antlr" } antlr-complete = { module = "org.antlr:antlr-complete", version.ref = "rev_antlr" } asm = { module = "org.ow2.asm:asm", version.ref = "rev_asm" } @@ -35,6 +37,7 @@ guava = { module = "com.google.guava:guava", icu4j = { module = "com.ibm.icu:icu4j", version.ref = "rev_icu4j"} informix = { module = "com.ibm.informix:jdbc", version.ref = "rev_informix" } jakarta_servlet_api = { module = "jakarta.servlet:jakarta.servlet-api", version.ref = "rev_jakarta_servlet_api" } +jarjar = { module = "com.eed3si9n.jarjar:jarjar", version.ref = "rev_jarjar" } java_sizeof = { module = "com.carrotsearch:java-sizeof", version.ref = "rev_java_sizeof" } jffi = { module = "com.github.jnr:jffi", version.ref = "rev_jffi" } jline = { module = "org.jline:jline", version.ref = "rev_jline" } diff --git a/src/org/python/util/VersionMatchingAntTask.java b/src/org/python/util/VersionMatchingAntTask.java index b5f24a906..9286bdbd7 100644 --- a/src/org/python/util/VersionMatchingAntTask.java +++ b/src/org/python/util/VersionMatchingAntTask.java @@ -29,6 +29,7 @@ public class VersionMatchingAntTask extends Task { ARTEFACT_NAME_FORMATS.put("rev_icu4j", "icu4j-%s.jar"); ARTEFACT_NAME_FORMATS.put("rev_informix", "jdbc-%s.jar"); ARTEFACT_NAME_FORMATS.put("rev_jakarta_servlet_api", "jakarta.servlet-api-%s.jar"); + ARTEFACT_NAME_FORMATS.put("rev_jarjar", "ant-jarjar-%s.jar"); ARTEFACT_NAME_FORMATS.put("rev_java_sizeof", "java-sizeof-%s.jar"); ARTEFACT_NAME_FORMATS.put("rev_jffi", "jffi-%s.jar"); ARTEFACT_NAME_FORMATS.put("rev_jline", "jline-%s.jar"); @@ -115,9 +116,18 @@ private static void addGradleArtefact(String line, Set artefacts) { private static void addAntArtefact(String line, Set artefacts) { line = line.trim(); - if (line.startsWith(" antArtefacts = new HashSet<>(); + private VersionMatchingAntTask task; @BeforeEach void setUp() throws Exception { task = new VersionMatchingAntTask(); setLocationToBuildXml(); + // add all ant artefacts to a static collection (for parameterized tests + antArtefacts.addAll(task.parseAntArtefacts()); } + + @Test void testGetLocation() { Location location = task.getLocation(); @@ -42,14 +52,12 @@ void testGetLocation() { void testParseGradleAretfacts() throws IOException { Set gradleArtefacts = task.parseGradleArtefacts(); assertNotNull(gradleArtefacts); - assertEquals(20, gradleArtefacts.size()); + assertEquals(21, gradleArtefacts.size()); } @Test void testParseAntArtefacts() throws IOException { - Set antArtefacts = task.parseAntArtefacts(); - assertNotNull(antArtefacts); - assertEquals(39, antArtefacts.size()); + assertEquals(41, antArtefacts.size()); } @Test @@ -84,6 +92,7 @@ void testCalculateGradleArtefact() { assertEquals("icu4j-78.7.jar", calculateGradleArtefact("rev_icu4j", "78.7")); assertEquals("jdbc-15.3.2.1.jar", calculateGradleArtefact("rev_informix", "15.3.2.1")); assertEquals("jakarta.servlet-api-6.1.0.jar", calculateGradleArtefact("rev_jakarta_servlet_api", "6.1.0")); + assertEquals("ant-jarjar-1.18.1.jar", calculateGradleArtefact("rev_jarjar", "1.18.1")); assertEquals("java-sizeof-0.1.2.jar", calculateGradleArtefact("rev_java_sizeof", "0.1.2")); assertEquals("jffi-1.3.15.jar", calculateGradleArtefact("rev_jffi", "1.3.15")); assertEquals("jline-3.30.4.jar", calculateGradleArtefact("rev_jline", "3.30.4")); @@ -96,23 +105,32 @@ void testCalculateGradleArtefact() { assertEquals("ojdbc8-23.26.1.2.3.jar", calculateGradleArtefact("rev_oracle", "23.26.1.2.3")); } - @Test - void testCheckAntArtefact() { - Set antArtefacts = new HashSet<>(); - antArtefacts.add("junit-jupiter-6.1.3.jar"); - antArtefacts.add("additiona.jar"); - antArtefacts.add("asm-9.8.7.jar"); - - checkAntArtefact("junit-jupiter-6.1.3.jar", antArtefacts); - checkAntArtefact("asm-9.8.7.jar", antArtefacts); + @ParameterizedTest + @MethodSource("provideAntArtefacts") + void testCheckAntArtefact(String antArtefact) throws IOException { + checkAntArtefact(antArtefact, antArtefacts); + } + + @ParameterizedTest + @MethodSource("provideMissingAntArtefacts") + void testCheckAntArtefactMissingVersion(String missingAntArtefact) throws IOException { try { - checkAntArtefact("icu4j-78.1.jar", antArtefacts); + checkAntArtefact(missingAntArtefact, antArtefacts); } catch (BuildException be) { - assertEquals("Gradle artefact 'icu4j-78.1.jar' is missing from build.xml. Please synchronize extlibs and build.xml with libs.versions.toml.", + assertEquals(String.format("Gradle artefact '%s' is missing from build.xml. " + // + "Please synchronize extlibs and build.xml with libs.versions.toml.", missingAntArtefact), be.getMessage()); } } + private static Stream provideAntArtefacts() throws IOException { + return antArtefacts.stream().sorted().map(a -> Arguments.of(a)); + } + + private static Stream provideMissingAntArtefacts() throws IOException { + return antArtefacts.stream().sorted().map(a -> Arguments.of(a.substring(0, a.length() - 4) + ".999.jar")); + } + private void setLocationToBuildXml() throws URISyntaxException { // in test mode, we need to set the location to the build.xml file URL actualURL = VersionMatchingAntTask.class.getResource("VersionMatchingAntTask.class"); diff --git a/tests/modjy/build.xml b/tests/modjy/build.xml index 23e5911d4..1ad191707 100644 --- a/tests/modjy/build.xml +++ b/tests/modjy/build.xml @@ -53,9 +53,10 @@ - + - + +