Merge pull request #372 from petrberan/junitUpdates

petrberan · web-flow · commit 68f791031e3c · 2024-12-12T14:19:26.000+01:00
chore: update jUnit version in tests
diff --git a/gradle/impl-gradle-embedded-archive/src/it/jar-sample/build.gradle b/gradle/impl-gradle-embedded-archive/src/it/jar-sample/build.gradle
@@ -11,7 +11,7 @@ repositories {
 
 dependencies {
     implementation 'commons-codec:commons-codec:1.7'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'
     implementation('org.jboss.spec:jboss-javaee-web-6.0:3.0.2.Final') {
         exclude(module: 'xalan')
     }
diff --git a/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/module-one/build.gradle b/gradle/impl-gradle-embedded-archive/src/it/multi-module-sample/module-one/build.gradle
@@ -6,7 +6,7 @@ repositories {
 
 dependencies {
     implementation 'commons-codec:commons-codec:1.7'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'
     implementation('org.jboss.spec:jboss-javaee-web-6.0:3.0.2.Final') {
         exclude(module: 'xalan')
     }
diff --git a/gradle/impl-gradle-embedded-archive/src/it/war-sample/build.gradle b/gradle/impl-gradle-embedded-archive/src/it/war-sample/build.gradle
@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     implementation group: 'commons-codec', name: 'commons-codec', version:'1.7'
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version:'5.10.3'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version:'5.11.3'
     providedCompile group: 'org.slf4j', name: 'slf4j-api', version:'1.6.1'
     providedCompile(group: 'org.jboss.spec', name: 'jboss-javaee-web-6.0', version:'3.0.2.Final') {
         exclude(module: 'xalan')
diff --git a/gradle/impl-gradle/src/test/resources/dependencymanager/build.gradle b/gradle/impl-gradle/src/test/resources/dependencymanager/build.gradle
@@ -16,7 +16,7 @@ dependencyManagement {
 
 dependencies {
     implementation 'org.slf4j:slf4j-simple:1.7.5'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'
     implementation 'org.apache.deltaspike.core:deltaspike-core-api'
     runtimeOnly 'org.apache.deltaspike.core:deltaspike-core-impl'
 }
diff --git a/gradle/impl-gradle/src/test/resources/simple/build.gradle b/gradle/impl-gradle/src/test/resources/simple/build.gradle
@@ -6,5 +6,5 @@ repositories {
 
 dependencies {
     implementation 'org.slf4j:slf4j-simple:1.7.5'
-    testCompileOnly 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testCompileOnly 'org.junit.jupiter:junit-jupiter:5.11.3'
 }
diff --git a/maven/impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/usecases/UseCasesTestCase.java b/maven/impl-maven-archive/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/archive/usecases/UseCasesTestCase.java
@@ -130,7 +130,7 @@ void multipleArtifacts() {
                 .as(File.class);
 
         @SuppressWarnings("unused")
-        final File[] analagous1 = Maven.resolver().resolve("org.jboss:jboss-something:1.0.0", "org.junit.jupiter:junit-jupiter:5.10.3")
+        final File[] analagous1 = Maven.resolver().resolve("org.jboss:jboss-something:1.0.0", "org.junit.jupiter:junit-jupiter:5.11.3")
                 .withoutTransitivity().as(File.class);
 
         // DependencyResolvers.use(MavenDependencyResolver.class).artifact("G:A:V").artifact("G:B:V")
diff --git a/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/build.gradle b/maven/impl-maven-embedded/src/it/cube-gradle-sample/gradle-sample/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-    testCompile 'org.junit.jupiter:junit-jupiter:5.10.3'
+    testCompile 'org.junit.jupiter:junit-jupiter:5.11.3'
     testCompile 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:3.0.0-SNAPSHOT'
 }
 
diff --git a/maven/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/AdditionalRemoteRepositoryTestCase.java b/maven/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/AdditionalRemoteRepositoryTestCase.java
@@ -53,7 +53,7 @@ void cleanup() throws Exception {
     @Test
     void control1() {
         // This should resolve from Maven Central
-        final File file = Maven.configureResolver().withClassPathResolution(false).resolve("org.junit.jupiter:junit-jupiter:5.10.3")
+        final File file = Maven.configureResolver().withClassPathResolution(false).resolve("org.junit.jupiter:junit-jupiter:5.11.3")
                 .withoutTransitivity().asSingle(File.class);
         // Ensure we get JUnit
         new ValidationUtil("junit-jupiter").validate(file);
@@ -69,7 +69,7 @@ void control1() {
     void control2() {
         Assertions.assertThrows(NoResolvedResultException.class, () -> {
             final File file = Maven.configureResolver().withClassPathResolution(false).withMavenCentralRepo(false)
-                    .resolve("org.junit.jupiter:junit-jupiter:5.10.3").withoutTransitivity().asSingle(File.class);
+                    .resolve("org.junit.jupiter:junit-jupiter:5.11.3").withoutTransitivity().asSingle(File.class);
             new ValidationUtil("junit-jupiter").validate(file);
             final File localRepo = new File(FAKE_REPO);
             Assertions.assertTrue(file.getAbsolutePath().contains(localRepo.getAbsolutePath()));
@@ -250,7 +250,7 @@ void shouldOverloadCentral() {
         Assertions.assertThrows(NoResolvedResultException.class, () -> {
             Maven.configureResolver()
                     .withRemoteRepo("central", "http://127.0.0.1", "default")
-                    .withClassPathResolution(false).resolve("org.junit.jupiter:junit-jupiter:5.10.3")
+                    .withClassPathResolution(false).resolve("org.junit.jupiter:junit-jupiter:5.11.3")
                     .withTransitivity().as(File.class);
         });
     }
diff --git a/maven/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/DisabledCentralRepositoryTestCase.java b/maven/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/DisabledCentralRepositoryTestCase.java
@@ -93,7 +93,7 @@ void shouldHaveCentralMavenRepositoryAndClassPathResolutionDisabled() {
         Assertions.assertThrows(NoResolvedResultException.class, () -> {
             // This should resolve neither from Maven Central nor from class path
             Maven.configureResolver().withClassPathResolution(false).withMavenCentralRepo(false)
-                    .resolve("org.junit.jupiter:junit-jupiter:5.10.3").withoutTransitivity().asSingle(File.class);
+                    .resolve("org.junit.jupiter:junit-jupiter:5.11.3").withoutTransitivity().asSingle(File.class);
         });
     }
 
diff --git a/maven/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/InvalidSettingsTestCase.java b/maven/impl-maven/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/InvalidSettingsTestCase.java
@@ -45,7 +45,7 @@ class InvalidSettingsTestCase {
     private static final String INVALID_SETTINGS = "target/settings/profiles/settings-invalid.xml";
     private static final String CENTRAL_SETTINGS = "target/settings/profiles/settings-central.xml";
     private static final String FROM_CLASSLOADER = "profiles/settings3-from-classpath.xml";
-    private static final String JUNIT_CANONICAL = "org.junit.jupiter:junit-jupiter:5.10.3";
+    private static final String JUNIT_CANONICAL = "org.junit.jupiter:junit-jupiter:5.11.3";
     private static final File TEST_BOM = new File("target/poms/test-bom.xml");
 
     @BeforeAll
@@ -101,7 +101,7 @@ void shouldNotLoadInvalidSettingsR() {
 
     /**
      * In this test the settings-invalid.xml should be loaded during the
-     * <code>resolve("org.junit.jupiter:junit-jupiter:5.10.3").withTransitivity()</code> phase,
+     * <code>resolve("org.junit.jupiter:junit-jupiter:5.11.3").withTransitivity()</code> phase,
      * for this reason the InvalidConfigurationFileException should be thrown
      * <br/>
      * Uses method Maven.configureResolver()
@@ -115,7 +115,7 @@ void shouldLoadInvalidSettingsDueResolvingCR() {
 
     /**
      * In this test the settings-invalid.xml should be loaded during the
-     * <code>resolve("org.junit.jupiter:junit-jupiter:5.10.3").withTransitivity()</code> phase,
+     * <code>resolve("org.junit.jupiter:junit-jupiter:5.11.3").withTransitivity()</code> phase,
      * for this reason the InvalidConfigurationFileException should be thrown
      * <br/>
      * Uses method Maven.resolver()
diff --git a/maven/impl-maven/src/test/resources/poms/test-junit.xml b/maven/impl-maven/src/test/resources/poms/test-junit.xml
@@ -14,7 +14,7 @@
       <dependency>
          <groupId>org.junit.jupiter</groupId>
          <artifactId>junit-jupiter</artifactId>
-         <version>5.10.3</version>
+         <version>5.11.3</version>
          <scope>test</scope>
       </dependency>
    </dependencies>
diff --git a/maven/maven-plugin/src/it/dependency-tree-scope/dependencyTree.expected b/maven/maven-plugin/src/it/dependency-tree-scope/dependencyTree.expected
@@ -1,20 +1,20 @@
 org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-maven-plugin-tests-dependency-tree-scoped:jar:1.0.0
-+- org.junit.jupiter:junit-jupiter:jar:5.10.3 [test]
-|  +- org.junit.jupiter:junit-jupiter-api:jar:5.10.3 [test]
++- org.junit.jupiter:junit-jupiter:jar:5.11.3 [test]
+|  +- org.junit.jupiter:junit-jupiter-api:jar:5.11.3 [test]
 |  |  +- org.opentest4j:opentest4j:jar:1.3.0 [test]
 |  |  +- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
 |  |  \- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
-|  +- org.junit.jupiter:junit-jupiter-params:jar:5.10.3 [test]
-|  \- org.junit.jupiter:junit-jupiter-engine:jar:5.10.3 [test]
+|  +- org.junit.jupiter:junit-jupiter-params:jar:5.11.3 [test]
+|  \- org.junit.jupiter:junit-jupiter-engine:jar:5.11.3 [test]
 |     \- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
-+- org.junit.jupiter:junit-jupiter-api:jar:5.10.3 [test]
++- org.junit.jupiter:junit-jupiter-api:jar:5.11.3 [test]
 |  +- org.opentest4j:opentest4j:jar:1.3.0 [test]
 |  +- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
 |  \- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
 +- org.opentest4j:opentest4j:jar:1.3.0 [test]
 +- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
 +- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
-+- org.junit.jupiter:junit-jupiter-params:jar:5.10.3 [test]
-+- org.junit.jupiter:junit-jupiter-engine:jar:5.10.3 [test]
++- org.junit.jupiter:junit-jupiter-params:jar:5.11.3 [test]
++- org.junit.jupiter:junit-jupiter-engine:jar:5.11.3 [test]
 |  \- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
 \- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
diff --git a/maven/maven-plugin/src/it/dependency-tree/dependencyTree.expected b/maven/maven-plugin/src/it/dependency-tree/dependencyTree.expected
@@ -1,21 +1,21 @@
 org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-maven-plugin-tests-dependency-tree:jar:1.0.0
 +- org.codehaus.groovy:groovy-all:jar:2.1.3 [compile]
-+- org.junit.jupiter:junit-jupiter:jar:5.10.3 [test]
-|  +- org.junit.jupiter:junit-jupiter-api:jar:5.10.3 [test]
++- org.junit.jupiter:junit-jupiter:jar:5.11.3 [test]
+|  +- org.junit.jupiter:junit-jupiter-api:jar:5.11.3 [test]
 |  |  +- org.opentest4j:opentest4j:jar:1.3.0 [test]
 |  |  +- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
 |  |  \- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
-|  +- org.junit.jupiter:junit-jupiter-params:jar:5.10.3 [test]
-|  \- org.junit.jupiter:junit-jupiter-engine:jar:5.10.3 [test]
+|  +- org.junit.jupiter:junit-jupiter-params:jar:5.11.3 [test]
+|  \- org.junit.jupiter:junit-jupiter-engine:jar:5.11.3 [test]
 |     \- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
-+- org.junit.jupiter:junit-jupiter-api:jar:5.10.3 [test]
++- org.junit.jupiter:junit-jupiter-api:jar:5.11.3 [test]
 |  +- org.opentest4j:opentest4j:jar:1.3.0 [test]
 |  +- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
 |  \- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
 +- org.opentest4j:opentest4j:jar:1.3.0 [test]
 +- org.junit.platform:junit-platform-commons:jar:1.10.3 [test]
 +- org.apiguardian:apiguardian-api:jar:1.1.2 [test]
-+- org.junit.jupiter:junit-jupiter-params:jar:5.10.3 [test]
-+- org.junit.jupiter:junit-jupiter-engine:jar:5.10.3 [test]
++- org.junit.jupiter:junit-jupiter-params:jar:5.11.3 [test]
++- org.junit.jupiter:junit-jupiter-engine:jar:5.11.3 [test]
 |  \- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]
 \- org.junit.platform:junit-platform-engine:jar:1.10.3 [test]

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ repositories {`
`11`	`11`
`12`	`12`	`dependencies {`
`13`	`13`	`implementation 'commons-codec:commons-codec:1.7'`
`14`		`- testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'`
	`14`	`+ testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'`
`15`	`15`	`implementation('org.jboss.spec:jboss-javaee-web-6.0:3.0.2.Final') {`
`16`	`16`	`exclude(module: 'xalan')`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ repositories {`
`6`	`6`
`7`	`7`	`dependencies {`
`8`	`8`	`implementation 'commons-codec:commons-codec:1.7'`
`9`		`- testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'`
	`9`	`+ testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'`
`10`	`10`	`implementation('org.jboss.spec:jboss-javaee-web-6.0:3.0.2.Final') {`
`11`	`11`	`exclude(module: 'xalan')`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ dependencyManagement {`
`16`	`16`
`17`	`17`	`dependencies {`
`18`	`18`	`implementation 'org.slf4j:slf4j-simple:1.7.5'`
`19`		`- testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'`
	`19`	`+ testImplementation 'org.junit.jupiter:junit-jupiter:5.11.3'`
`20`	`20`	`implementation 'org.apache.deltaspike.core:deltaspike-core-api'`
`21`	`21`	`runtimeOnly 'org.apache.deltaspike.core:deltaspike-core-impl'`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ repositories {`
`6`	`6`
`7`	`7`	`dependencies {`
`8`	`8`	`implementation 'org.slf4j:slf4j-simple:1.7.5'`
`9`		`- testCompileOnly 'org.junit.jupiter:junit-jupiter:5.10.3'`
	`9`	`+ testCompileOnly 'org.junit.jupiter:junit-jupiter:5.11.3'`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ repositories {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
`13`		`- testCompile 'org.junit.jupiter:junit-jupiter:5.10.3'`
	`13`	`+ testCompile 'org.junit.jupiter:junit-jupiter:5.11.3'`
`14`	`14`	`testCompile 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:3.0.0-SNAPSHOT'`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ void shouldHaveCentralMavenRepositoryAndClassPathResolutionDisabled() {`
`93`	`93`	`Assertions.assertThrows(NoResolvedResultException.class, () -> {`
`94`	`94`	`// This should resolve neither from Maven Central nor from class path`
`95`	`95`	`Maven.configureResolver().withClassPathResolution(false).withMavenCentralRepo(false)`
`96`		`- .resolve("org.junit.jupiter:junit-jupiter:5.10.3").withoutTransitivity().asSingle(File.class);`
	`96`	`+ .resolve("org.junit.jupiter:junit-jupiter:5.11.3").withoutTransitivity().asSingle(File.class);`
`97`	`97`	`});`
`98`	`98`	`}`
`99`	`99`