diff --git a/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml b/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
index 20455fa77d9..d8d6d7685f2 100644
--- a/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
+++ b/lang/java/archetypes/avro-service-archetype/src/main/pom/pom.xml
@@ -35,7 +35,7 @@
${project.version}
${jackson-bom.version}
- ${junit.version}
+ ${junit5.version}
1.2.3
${slf4j.version}
@@ -79,9 +79,9 @@
\${logback.version}
- junit
- junit
- \${junit.version}
+ org.junit.jupiter
+ junit-jupiter
+ \${junit5.version}
test
diff --git a/lang/java/archetypes/avro-service-archetype/src/main/resources/archetype-resources/src/test/java/integration/SimpleOrderServiceIntegrationTest.java b/lang/java/archetypes/avro-service-archetype/src/main/resources/archetype-resources/src/test/java/integration/SimpleOrderServiceIntegrationTest.java
index e5d6ad7e509..0796826e0a9 100644
--- a/lang/java/archetypes/avro-service-archetype/src/main/resources/archetype-resources/src/test/java/integration/SimpleOrderServiceIntegrationTest.java
+++ b/lang/java/archetypes/avro-service-archetype/src/main/resources/archetype-resources/src/test/java/integration/SimpleOrderServiceIntegrationTest.java
@@ -21,8 +21,8 @@
package ${package}.integration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.net.InetSocketAddress;
import java.util.ArrayList;
@@ -30,9 +30,9 @@
import ${package}.transport.SimpleOrderServiceEndpoint;
import ${package}.transport.SimpleOrderServiceClient;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import ${package}.service.Confirmation;
import ${package}.service.Item;
@@ -42,13 +42,13 @@
* SimpleOrderServiceIntegrationTest runs as part of the Integration phase of the build and is
* meant for end to end service testing.
*/
-public class SimpleOrderServiceIntegrationTest {
+class SimpleOrderServiceIntegrationTest {
private static SimpleOrderServiceEndpoint service;
private static SimpleOrderServiceClient client;
@Test
- public void simpleRoundTripTest() throws Exception {
+ void simpleRoundTripTest() throws Exception {
Order simpleOrder = createOrder();
Confirmation c = client.submitOrder(simpleOrder);
@@ -57,7 +57,7 @@ public void simpleRoundTripTest() throws Exception {
assertTrue(c.getEstimatedCompletion() > 0);
}
- @BeforeClass
+ @BeforeAll
public static void setupTransport() throws Exception {
InetSocketAddress endpointAddress = new InetSocketAddress("0.0.0.0", 12345);
service = new SimpleOrderServiceEndpoint(endpointAddress);
@@ -67,7 +67,7 @@ public static void setupTransport() throws Exception {
client.start();
}
- @AfterClass
+ @AfterAll
public static void shutdownTransport() throws Exception {
client.stop();
service.stop();
diff --git a/lang/java/maven-plugin/pom.xml b/lang/java/maven-plugin/pom.xml
index 78b65ff784d..64f9e1f396d 100644
--- a/lang/java/maven-plugin/pom.xml
+++ b/lang/java/maven-plugin/pom.xml
@@ -24,7 +24,7 @@
avro-parent
org.apache.avro
1.12.0-SNAPSHOT
- ../
+ ../pom.xml
avro-maven-plugin
@@ -60,6 +60,7 @@
org.apache.maven
maven-core
${maven-core.version}
+ provided
com.google.code.findbugs
diff --git a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-injecting-velocity-tools.xml b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-injecting-velocity-tools.xml
index fe7d7ab7e64..297dd6a1c21 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/idl/pom-injecting-velocity-tools.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/idl/pom-injecting-velocity-tools.xml
@@ -22,7 +22,7 @@
avro-parent
org.apache.avro
- 1.11.0-SNAPSHOT
+ 1.12.0-SNAPSHOT
../../../../../../../../../
diff --git a/lang/java/maven-plugin/src/test/resources/unit/idl/pom.xml b/lang/java/maven-plugin/src/test/resources/unit/idl/pom.xml
index a2d3348d3d0..725a6480e43 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/idl/pom.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/idl/pom.xml
@@ -22,7 +22,7 @@
avro-parent
org.apache.avro
- 1.11.0-SNAPSHOT
+ 1.12.0-SNAPSHOT
../../../../../../../../../pom.xml
diff --git a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-injecting-velocity-tools.xml b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-injecting-velocity-tools.xml
index 6efefa9ee87..eb1e6a87bbd 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-injecting-velocity-tools.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom-injecting-velocity-tools.xml
@@ -22,7 +22,7 @@
avro-parent
org.apache.avro
- 1.11.0-SNAPSHOT
+ 1.12.0-SNAPSHOT
../../../../../../../../../
diff --git a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom.xml b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom.xml
index d3a90ba33cb..8391e33e0e4 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/protocol/pom.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/protocol/pom.xml
@@ -22,7 +22,7 @@
avro-parent
org.apache.avro
- 1.11.0-SNAPSHOT
+ 1.12.0-SNAPSHOT
../../../../../../../../../pom.xml
diff --git a/lang/java/maven-plugin/src/test/resources/unit/schema/pom.xml b/lang/java/maven-plugin/src/test/resources/unit/schema/pom.xml
index 9d942494e2d..dc93f578baf 100644
--- a/lang/java/maven-plugin/src/test/resources/unit/schema/pom.xml
+++ b/lang/java/maven-plugin/src/test/resources/unit/schema/pom.xml
@@ -22,7 +22,7 @@
avro-parent
org.apache.avro
- 1.11.0-SNAPSHOT
+ 1.12.0-SNAPSHOT
../../../../../../../../../pom.xml
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 798a177ee84..16e7e4855a9 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -42,7 +42,6 @@
4.0.1
9.4.48.v20220622
5.0.4
- 4.13.2
5.9.0
4.1.81.Final
3.21.5
@@ -157,13 +156,14 @@
org.apache.maven.plugins
maven-surefire-plugin
+ 3.0.0-M7
**/Test**
-
+
**/*$*
@@ -592,9 +592,9 @@
will inherit these dependencies directly, and can opt out if necessary with -->
- junit
- junit
- ${junit.version}
+ org.junit.vintage
+ junit-vintage-engine
+ ${junit5.version}
test