This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git

commit 8a94fa6bdd1a708faa69f617006504ceb1fb9c47
Author: Martin Stockhammer <[email protected]>
AuthorDate: Thu Oct 3 19:18:36 2019 +0200

    Removing junit 4 dependencies
---
 .../archiva-repository-admin-default/pom.xml                      | 5 -----
 archiva-modules/archiva-base/archiva-storage-fs/pom.xml           | 6 ------
 archiva-modules/archiva-base/archiva-test-utils/pom.xml           | 8 ++++----
 archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml      | 5 -----
 .../archiva-web/archiva-rest/archiva-rest-services/pom.xml        | 5 -----
 archiva-modules/archiva-web/archiva-web-common/pom.xml            | 5 -----
 archiva-modules/plugins/generic-metadata-support/pom.xml          | 5 -----
 archiva-modules/plugins/stage-repository-merge/pom.xml            | 5 -----
 pom.xml                                                           | 6 ------
 9 files changed, 4 insertions(+), 46 deletions(-)

diff --git 
a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
 
b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 206e90f..0ab00cd 100644
--- 
a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ 
b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -194,11 +194,6 @@
         </exclusions>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-1.2-api</artifactId>
       <scope>test</scope>
diff --git a/archiva-modules/archiva-base/archiva-storage-fs/pom.xml 
b/archiva-modules/archiva-base/archiva-storage-fs/pom.xml
index 02ae324..f47d9d7 100644
--- a/archiva-modules/archiva-base/archiva-storage-fs/pom.xml
+++ b/archiva-modules/archiva-base/archiva-storage-fs/pom.xml
@@ -65,12 +65,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/archiva-modules/archiva-base/archiva-test-utils/pom.xml 
b/archiva-modules/archiva-base/archiva-test-utils/pom.xml
index 0c81176..48625be 100644
--- a/archiva-modules/archiva-base/archiva-test-utils/pom.xml
+++ b/archiva-modules/archiva-base/archiva-test-utils/pom.xml
@@ -38,13 +38,13 @@
       <artifactId>spring-test</artifactId>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-console-standalone</artifactId>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml 
b/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml
index fdb87b2..0817913 100644
--- a/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-metadata/pom.xml
@@ -59,11 +59,6 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git 
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml 
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 0a92dd7..3ccb8df 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -263,11 +263,6 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml 
b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 03ad2cb..fe694d2 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -253,11 +253,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-1.2-api</artifactId>
       <scope>test</scope>
diff --git a/archiva-modules/plugins/generic-metadata-support/pom.xml 
b/archiva-modules/plugins/generic-metadata-support/pom.xml
index 4f2cb19..016f35e 100644
--- a/archiva-modules/plugins/generic-metadata-support/pom.xml
+++ b/archiva-modules/plugins/generic-metadata-support/pom.xml
@@ -40,11 +40,6 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml 
b/archiva-modules/plugins/stage-repository-merge/pom.xml
index 0890241..ee60bcd 100644
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -34,11 +34,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>metadata-repository-api</artifactId>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 8765323..8159e3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,12 +121,6 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.12</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
         <version>1.7.1</version>

Reply via email to