From e945bfe3cd9edc785150a4cf666349cbfb80d5ea Mon Sep 17 00:00:00 2001 From: Ville Oikarinen Date: Fri, 9 Aug 2024 14:15:56 +0300 Subject: [PATCH] upgraded some libs --- .../fluentjava/iwant/wsdef/IwantModules.java | 10 ++++----- .../api/javamodules/ScalaClassesTest.java | 6 ++--- .../iwant/core/ant/AntGeneratedTest.java | 2 +- .../download/TestedIwantDependencies.java | 2 +- .../download/TestedIwantDependenciesTest.java | 7 +++--- .../org/fluentjava/iwant/entry2/Iwant2.java | 2 +- .../iwant/entry3/WishEvaluatorTest.java | 4 ++-- .../WorkspaceDefinitionContextImplTest.java | 22 +++++++++---------- 8 files changed, 28 insertions(+), 27 deletions(-) diff --git a/as-iwant-developer/i-have/wsdef/src/main/java/org/fluentjava/iwant/wsdef/IwantModules.java b/as-iwant-developer/i-have/wsdef/src/main/java/org/fluentjava/iwant/wsdef/IwantModules.java index f2ca3efd..c357afa0 100644 --- a/as-iwant-developer/i-have/wsdef/src/main/java/org/fluentjava/iwant/wsdef/IwantModules.java +++ b/as-iwant-developer/i-have/wsdef/src/main/java/org/fluentjava/iwant/wsdef/IwantModules.java @@ -67,7 +67,7 @@ private IwantSrcModuleSpex module(String fullName) { * @return */ private JavaModule antLauncher = binModule("org.apache.ant", "ant-launcher", - "1.10.7"); + "1.10.14"); private JavaModule asm = JavaBinModule.providing(FromRepository .repo1MavenOrg().group("asm").name("asm").version("3.2").jar()) @@ -98,10 +98,10 @@ private IwantSrcModuleSpex module(String fullName) { .name("jaxen").version("1.1.4").jar()) .end(); - private JavaModule junit = JavaBinModule - .providing(FromRepository.repo1MavenOrg().group("junit") - .name("junit").version("4.8.2").jar()) - .end(); + private final JavaBinModule hamcrestCore = binModule("org/hamcrest", + "hamcrest-core", "1.3"); + private final JavaModule junit = binModule("junit", "junit", "4.13.2", + hamcrestCore); // TODO document dependency to asm, jaxen private JavaModule pmd = JavaBinModule.providing(FromRepository diff --git a/essential/iwant-api-javamodules/src/test/java/org/fluentjava/iwant/api/javamodules/ScalaClassesTest.java b/essential/iwant-api-javamodules/src/test/java/org/fluentjava/iwant/api/javamodules/ScalaClassesTest.java index c7b5fce6..b81818dd 100644 --- a/essential/iwant-api-javamodules/src/test/java/org/fluentjava/iwant/api/javamodules/ScalaClassesTest.java +++ b/essential/iwant-api-javamodules/src/test/java/org/fluentjava/iwant/api/javamodules/ScalaClassesTest.java @@ -112,14 +112,14 @@ public void testContentDescriptorAndIngredients() { + " scala-compiler-2.12.13.jar\n" + "i:scala-library:\n" + " scala-library-2.12.13.jar\n" + "i:scala-reflect:\n" + " scala-reflect-2.12.13.jar\n" + "i:antJar:\n" - + " ant-1.10.13.jar\n" + "i:antLauncherJar:\n" - + " ant-launcher-1.10.13.jar\n" + "", + + " ant-1.10.14.jar\n" + "i:antLauncherJar:\n" + + " ant-launcher-1.10.14.jar\n" + "", scalaClasses.contentDescriptor()); assertEquals( "[src/main/java, src/main/scala, dep, scala-compiler-2.12.13.jar," + " scala-library-2.12.13.jar, scala-reflect-2.12.13.jar," - + " ant-1.10.13.jar, ant-launcher-1.10.13.jar]", + + " ant-1.10.14.jar, ant-launcher-1.10.14.jar]", scalaClasses.ingredients().toString()); } diff --git a/essential/iwant-core-ant/src/test/java/org/fluentjava/iwant/core/ant/AntGeneratedTest.java b/essential/iwant-core-ant/src/test/java/org/fluentjava/iwant/core/ant/AntGeneratedTest.java index ff980cf7..f05908c6 100644 --- a/essential/iwant-core-ant/src/test/java/org/fluentjava/iwant/core/ant/AntGeneratedTest.java +++ b/essential/iwant-core-ant/src/test/java/org/fluentjava/iwant/core/ant/AntGeneratedTest.java @@ -44,7 +44,7 @@ private Path antLauncherJar() { public void testContentDescriptor() { assertEquals("org.fluentjava.iwant.core.ant.AntGenerated\n" + "i:ant-jars:\n " + Iwant.IWANT_USER_DIR - + "/cached/UnmodifiableUrl/https%3A/%2Frepo1.maven.org/maven2/org/apache/ant/ant/1.10.13/ant-1.10.13.jar\n" + + "/cached/UnmodifiableUrl/https%3A/%2Frepo1.maven.org/maven2/org/apache/ant/ant/1.10.14/ant-1.10.14.jar\n" + "i:script:\n script\n", AntGenerated.with().name("minimal").antJars(antJar()) .script(Source.underWsroot("script")).end() diff --git a/essential/iwant-core-download/src/main/java/org/fluentjava/iwant/core/download/TestedIwantDependencies.java b/essential/iwant-core-download/src/main/java/org/fluentjava/iwant/core/download/TestedIwantDependencies.java index 28e9a4c5..4ab7b301 100644 --- a/essential/iwant-core-download/src/main/java/org/fluentjava/iwant/core/download/TestedIwantDependencies.java +++ b/essential/iwant-core-download/src/main/java/org/fluentjava/iwant/core/download/TestedIwantDependencies.java @@ -21,7 +21,7 @@ public static GnvArtifact jcommander() { public static GnvArtifact junit() { return FromRepository.repo1MavenOrg().group("junit").name("junit") - .version("4.8.2").jar(); + .version("4.13.2").jar(); } public static GnvArtifact testng() { diff --git a/essential/iwant-core-download/src/test/java/org/fluentjava/iwant/core/download/TestedIwantDependenciesTest.java b/essential/iwant-core-download/src/test/java/org/fluentjava/iwant/core/download/TestedIwantDependenciesTest.java index a191bdc9..263177a5 100644 --- a/essential/iwant-core-download/src/test/java/org/fluentjava/iwant/core/download/TestedIwantDependenciesTest.java +++ b/essential/iwant-core-download/src/test/java/org/fluentjava/iwant/core/download/TestedIwantDependenciesTest.java @@ -6,13 +6,14 @@ public class TestedIwantDependenciesTest extends TestCase { public void testNamesOfDownloadedTargets() { // this documents the names, change when upgrading: - assertEquals("ant-1.10.13.jar", + assertEquals("ant-1.10.14.jar", TestedIwantDependencies.antJar().name()); - assertEquals("ant-launcher-1.10.13.jar", + assertEquals("ant-launcher-1.10.14.jar", TestedIwantDependencies.antLauncherJar().name()); assertEquals("jcommander-1.48.jar", TestedIwantDependencies.jcommander().name()); - assertEquals("junit-4.8.2.jar", TestedIwantDependencies.junit().name()); + assertEquals("junit-4.13.2.jar", + TestedIwantDependencies.junit().name()); assertEquals("testng-6.9.4.jar", TestedIwantDependencies.testng().name()); } diff --git a/essential/iwant-entry2/src/main/java/org/fluentjava/iwant/entry2/Iwant2.java b/essential/iwant-entry2/src/main/java/org/fluentjava/iwant/entry2/Iwant2.java index 3d189d83..a201db2c 100644 --- a/essential/iwant-entry2/src/main/java/org/fluentjava/iwant/entry2/Iwant2.java +++ b/essential/iwant-entry2/src/main/java/org/fluentjava/iwant/entry2/Iwant2.java @@ -24,7 +24,7 @@ public class Iwant2 { public static final String REPO_MAVEN_ORG = "https://repo1.maven.org/maven2/"; - public static final String ANT_VER = "1.10.13"; + public static final String ANT_VER = "1.10.14"; private final IwantNetwork network; private final Iwant iwant; diff --git a/essential/iwant-entry3/src/test/java/org/fluentjava/iwant/entry3/WishEvaluatorTest.java b/essential/iwant-entry3/src/test/java/org/fluentjava/iwant/entry3/WishEvaluatorTest.java index a72a0aa3..8b0f5277 100644 --- a/essential/iwant-entry3/src/test/java/org/fluentjava/iwant/entry3/WishEvaluatorTest.java +++ b/essential/iwant-entry3/src/test/java/org/fluentjava/iwant/entry3/WishEvaluatorTest.java @@ -886,8 +886,8 @@ public void testSideEffectThatReferencesIwantPlugin() { assertEquals("ant-plugin-print mutating.\n" + "ant-plugin modules: [iwant-plugin-ant," - + " mock-iwant-classes, ant-1.10.13.jar," - + " ant-launcher-1.10.13.jar]", err.toString()); + + " mock-iwant-classes, ant-1.10.14.jar," + + " ant-launcher-1.10.14.jar]", err.toString()); } private static class WorkspaceWithTarget implements Workspace { diff --git a/essential/iwant-entry3/src/test/java/org/fluentjava/iwant/entry3/WorkspaceDefinitionContextImplTest.java b/essential/iwant-entry3/src/test/java/org/fluentjava/iwant/entry3/WorkspaceDefinitionContextImplTest.java index 0161999b..91799386 100644 --- a/essential/iwant-entry3/src/test/java/org/fluentjava/iwant/entry3/WorkspaceDefinitionContextImplTest.java +++ b/essential/iwant-entry3/src/test/java/org/fluentjava/iwant/entry3/WorkspaceDefinitionContextImplTest.java @@ -62,8 +62,8 @@ public void testIwantPluginAntWithDependenciesContainsCorrectModules() { assertEquals("iwant-plugin-ant", iterator.next().name()); assertSame(iwantApiModule1, iterator.next()); assertSame(iwantApiModule2, iterator.next()); - assertEquals("ant-1.10.13.jar", iterator.next().name()); - assertEquals("ant-launcher-1.10.13.jar", iterator.next().name()); + assertEquals("ant-1.10.14.jar", iterator.next().name()); + assertEquals("ant-launcher-1.10.14.jar", iterator.next().name()); } public void testIwantPluginAntMainClassesHasCorrectCompilationClasspath() { @@ -75,7 +75,7 @@ public void testIwantPluginAntMainClassesHasCorrectCompilationClasspath() { assertSame(iwantApiModule1.mainArtifact(), iterator.next()); assertSame(iwantApiModule2.mainArtifact(), iterator.next()); - assertEquals("ant-1.10.13.jar", iterator.next().name()); + assertEquals("ant-1.10.14.jar", iterator.next().name()); } public void testIwantPluginAntMainJavaIsASubdirectoryUnderIwantSources() { @@ -96,7 +96,7 @@ public void testIwantPluginPmdWithDependenciesContainsCorrectModules() { Set mods = ctx.iwantPlugin().pmd().withDependencies(); assertEquals("[iwant-plugin-pmd, iwant-api-1, iwant-api-2," - + " ant-1.10.13.jar, asm-3.2.jar, commons-io-1.3.2.jar," + + " ant-1.10.14.jar, asm-3.2.jar, commons-io-1.3.2.jar," + " jaxen-1.1.4.jar, pmd-4.3.jar]", mods.toString()); } @@ -104,23 +104,23 @@ public void testIwantPluginFindbugsWithDependenciesContainsCorrectModules() { Set mods = ctx.iwantPlugin().findbugs().withDependencies(); assertEquals("[iwant-plugin-findbugs, iwant-api-1, iwant-api-2," - + " commons-io-1.3.2.jar, iwant-plugin-ant, ant-1.10.13.jar," - + " ant-launcher-1.10.13.jar]", mods.toString()); + + " commons-io-1.3.2.jar, iwant-plugin-ant, ant-1.10.14.jar," + + " ant-launcher-1.10.14.jar]", mods.toString()); } public void testIwantPluginGithubWithDependenciesContainsCorrectModules() { Set mods = ctx.iwantPlugin().github().withDependencies(); assertEquals("[iwant-plugin-github, iwant-api-1, iwant-api-2," - + " iwant-plugin-ant, ant-1.10.13.jar," - + " ant-launcher-1.10.13.jar]", mods.toString()); + + " iwant-plugin-ant, ant-1.10.14.jar," + + " ant-launcher-1.10.14.jar]", mods.toString()); } public void testIwantPluginWarWithDependenciesContainsCorrectModules() { Set mods = ctx.iwantPlugin().war().withDependencies(); assertEquals( - "[iwant-plugin-war, iwant-api-1, iwant-api-2, ant-1.10.13.jar]", + "[iwant-plugin-war, iwant-api-1, iwant-api-2, ant-1.10.14.jar]", mods.toString()); } @@ -129,8 +129,8 @@ public void testIwantPluginJacocoWithDependenciesContainsCorrectModules() { assertEquals( "[iwant-plugin-jacoco, iwant-api-1, iwant-api-2," - + " iwant-plugin-ant, ant-1.10.13.jar," - + " ant-launcher-1.10.13.jar, commons-io-1.3.2.jar]", + + " iwant-plugin-ant, ant-1.10.14.jar," + + " ant-launcher-1.10.14.jar, commons-io-1.3.2.jar]", mods.toString()); }