Upgrade to org.junit.jupiter:junit-jupiter-engine 5.12.0

codehaus-cargo · Feb 21, 2025 · 83dbaef · 83dbaef
1 parent 863cff8
commit 83dbaef
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/core/documentation/pom.xml b/core/documentation/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>${cargo.junit-jupiter.version}</version>
+      <version>${junit-jupiter.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/extensions/maven3/archetypes/daemon/src/main/resources/archetype-resources/pom.xml b/extensions/maven3/archetypes/daemon/src/main/resources/archetype-resources/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>${cargo.junit-jupiter.version}</version>
+      <version>${junit-jupiter.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...ions/maven3/archetypes/multiple-containers/src/main/resources/archetype-resources/pom.xml b/...ions/maven3/archetypes/multiple-containers/src/main/resources/archetype-resources/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>${cargo.junit-jupiter.version}</version>
+      <version>${junit-jupiter.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...nsions/maven3/archetypes/remote-deployment/src/main/resources/archetype-resources/pom.xml b/...nsions/maven3/archetypes/remote-deployment/src/main/resources/archetype-resources/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>${cargo.junit-jupiter.version}</version>
+      <version>${junit-jupiter.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...module/src/main/resources/archetype-resources/__rootArtifactId__-functional-tests/pom.xml b/...module/src/main/resources/archetype-resources/__rootArtifactId__-functional-tests/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>${cargo.junit-jupiter.version}</version>
+      <version>${junit-jupiter.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...nal-tests-module/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml b/...nal-tests-module/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>${cargo.junit-jupiter.version}</version>
+      <version>${junit-jupiter.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...ons/maven3/archetypes/webapp-single-module/src/main/resources/archetype-resources/pom.xml b/...ons/maven3/archetypes/webapp-single-module/src/main/resources/archetype-resources/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>${cargo.junit-jupiter.version}</version>
+      <version>${junit-jupiter.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...s/maven3/archetypes/webapp-with-datasource/src/main/resources/archetype-resources/pom.xml b/...s/maven3/archetypes/webapp-with-datasource/src/main/resources/archetype-resources/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>${cargo.junit-jupiter.version}</version>
+      <version>${junit-jupiter.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -327,12 +327,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <!--
-      Use Derby 10.12.* as that is the latest branch compatible with Java 6.
-      We use Java 6 for certain containers' tests on our CI.
-      -->
-    <cargo.derby.version>10.12.1.1</cargo.derby.version>
-    <cargo.junit-jupiter.version>5.11.4</cargo.junit-jupiter.version>
     <!--
       The multiple-containers archetype relies on multiple profile activation conditions, which
       only works starting from Maven 3.2.2: https://issues.apache.org/jira/browse/MNG-4565
@@ -353,6 +347,13 @@
     <maven.failsafe-plugin.version>3.5.2</maven.failsafe-plugin.version>
     <maven.surefire-plugin.version>3.5.2</maven.surefire-plugin.version>
     <maven.war-plugin.version>3.3.2</maven.war-plugin.version>
+
+    <!--
+      Use Derby 10.12.* as that is the latest branch compatible with Java 6.
+      We use Java 6 for certain containers' tests on our CI.
+      -->
+    <cargo.derby.version>10.12.1.1</cargo.derby.version>
+    <junit-jupiter.version>5.12.0</junit-jupiter.version>
     <wildfly-swarm.version>2018.5.0</wildfly-swarm.version>
   </properties>
 
@@ -1119,7 +1120,7 @@
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter-engine</artifactId>
-        <version>${cargo.junit-jupiter.version}</version>
+        <version>${junit-jupiter.version}</version>
     </dependency>
       <dependency>
         <groupId>org.mockito</groupId>