This is an automated email from the ASF dual-hosted git repository. veithen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push: new a4f46bae9 Start using JUnit 5 a4f46bae9 is described below commit a4f46bae927a2215868bdcf8b81a12a078c5a6f5 Author: Andreas Veithen <andreas.veit...@gmail.com> AuthorDate: Sun Oct 16 18:10:47 2022 +0000 Start using JUnit 5 --- axiom-weaver/pom.xml | 4 ++-- .../org/apache/axiom/weaver/clinit/StaticInitializerTest.java | 2 +- .../java/org/apache/axiom/weaver/ctor/ConstructorTest.java | 2 +- .../org/apache/axiom/weaver/innerclass/InnerClassTest.java | 2 +- .../apache/axiom/weaver/noabstract/NoAbstractMethodTest.java | 2 +- .../src/test/java/org/apache/axiom/weaver/tree/TreeTest.java | 2 +- pom.xml | 11 +++++++++++ 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/axiom-weaver/pom.xml b/axiom-weaver/pom.xml index fedb4f5f2..6ba064906 100644 --- a/axiom-weaver/pom.xml +++ b/axiom-weaver/pom.xml @@ -63,8 +63,8 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/axiom-weaver/src/test/java/org/apache/axiom/weaver/clinit/StaticInitializerTest.java b/axiom-weaver/src/test/java/org/apache/axiom/weaver/clinit/StaticInitializerTest.java index 88996b752..acf733696 100644 --- a/axiom-weaver/src/test/java/org/apache/axiom/weaver/clinit/StaticInitializerTest.java +++ b/axiom-weaver/src/test/java/org/apache/axiom/weaver/clinit/StaticInitializerTest.java @@ -22,7 +22,7 @@ import static com.google.common.truth.Truth.assertThat; import org.apache.axiom.weaver.SimpleImplementationClassNameMapper; import org.apache.axiom.weaver.Weaver; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class StaticInitializerTest { @Test diff --git a/axiom-weaver/src/test/java/org/apache/axiom/weaver/ctor/ConstructorTest.java b/axiom-weaver/src/test/java/org/apache/axiom/weaver/ctor/ConstructorTest.java index 420ffc7d4..ecf6c4aa3 100644 --- a/axiom-weaver/src/test/java/org/apache/axiom/weaver/ctor/ConstructorTest.java +++ b/axiom-weaver/src/test/java/org/apache/axiom/weaver/ctor/ConstructorTest.java @@ -22,7 +22,7 @@ import static com.google.common.truth.Truth.assertThat; import org.apache.axiom.weaver.SimpleImplementationClassNameMapper; import org.apache.axiom.weaver.Weaver; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ConstructorTest { @Test diff --git a/axiom-weaver/src/test/java/org/apache/axiom/weaver/innerclass/InnerClassTest.java b/axiom-weaver/src/test/java/org/apache/axiom/weaver/innerclass/InnerClassTest.java index 187165cbe..38757d0ce 100644 --- a/axiom-weaver/src/test/java/org/apache/axiom/weaver/innerclass/InnerClassTest.java +++ b/axiom-weaver/src/test/java/org/apache/axiom/weaver/innerclass/InnerClassTest.java @@ -20,7 +20,7 @@ package org.apache.axiom.weaver.innerclass; import org.apache.axiom.weaver.SimpleImplementationClassNameMapper; import org.apache.axiom.weaver.Weaver; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class InnerClassTest { @Test diff --git a/axiom-weaver/src/test/java/org/apache/axiom/weaver/noabstract/NoAbstractMethodTest.java b/axiom-weaver/src/test/java/org/apache/axiom/weaver/noabstract/NoAbstractMethodTest.java index 5bb1c48e5..9113886bb 100644 --- a/axiom-weaver/src/test/java/org/apache/axiom/weaver/noabstract/NoAbstractMethodTest.java +++ b/axiom-weaver/src/test/java/org/apache/axiom/weaver/noabstract/NoAbstractMethodTest.java @@ -24,7 +24,7 @@ import org.apache.axiom.weaver.SimpleImplementationClassNameMapper; import org.apache.axiom.weaver.Weaver; import org.apache.axiom.weaver.innerclass.InnerClassTest; import org.apache.axiom.weaver.mixin.clazz.MixinFactoryException; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class NoAbstractMethodTest { @Test diff --git a/axiom-weaver/src/test/java/org/apache/axiom/weaver/tree/TreeTest.java b/axiom-weaver/src/test/java/org/apache/axiom/weaver/tree/TreeTest.java index bd991e26a..823fc1b6c 100644 --- a/axiom-weaver/src/test/java/org/apache/axiom/weaver/tree/TreeTest.java +++ b/axiom-weaver/src/test/java/org/apache/axiom/weaver/tree/TreeTest.java @@ -22,7 +22,7 @@ import static com.google.common.truth.Truth.assertThat; import org.apache.axiom.weaver.SimpleImplementationClassNameMapper; import org.apache.axiom.weaver.Weaver; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TreeTest { @Test diff --git a/pom.xml b/pom.xml index 49b4500e2..3b4267ffb 100644 --- a/pom.xml +++ b/pom.xml @@ -265,6 +265,7 @@ <auto-service.version>1.0.1</auto-service.version> <asm.version>9.4</asm.version> <errorprone.version>2.16</errorprone.version> + <junit5.version>5.9.1</junit5.version> <skipDeploy>false</skipDeploy> @@ -313,6 +314,16 @@ <artifactId>junit</artifactId> <version>4.13.2</version> </dependency> + <dependency> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + <version>${junit5.version}</version> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter</artifactId> + <version>${junit5.version}</version> + </dependency> <dependency> <groupId>com.google.truth</groupId> <artifactId>truth</artifactId>