From 11fa0a513a6b22dc6e472a35120023806ff48c9a Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Sat, 5 Oct 2019 18:38:32 +0200
Subject: [PATCH] Removing velocity dependency

---
 .../archiva-repository-admin-default/pom.xml             | 4 ----
 .../archiva-rest/archiva-rest-services/pom.xml           | 5 -----
 archiva-modules/archiva-web/archiva-webapp/pom.xml       | 9 ---------
 pom.xml                                                  | 7 +------
 4 files changed, 1 insertion(+), 24 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 0ab00cde8..eaaeb1ddc 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
@@ -165,10 +165,6 @@
       <groupId>commons-validator</groupId>
       <artifactId>commons-validator</artifactId>
     </dependency>
-    <dependency>
-      <groupId>oro</groupId>
-      <artifactId>oro</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>spring-quartz</artifactId>
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 3ccb8df1b..5f5f2fb44 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
@@ -193,11 +193,6 @@
       <artifactId>commons-validator</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>oro</groupId>
-      <artifactId>oro</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>javax.ws.rs</groupId>
       <artifactId>javax.ws.rs-api</artifactId>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index e82b08feb..45ee0cac2 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -172,15 +172,6 @@
       <artifactId>commons-io</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.velocity</groupId>
-      <artifactId>velocity-tools</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.archiva.maven</groupId>
       <!--  FIXME: temporary coupling to plugin, should be runtime -->
diff --git a/pom.xml b/pom.xml
index 16ddf5f9a..7a6c332d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1478,7 +1478,7 @@
       <dependency>
         <groupId>commons-validator</groupId>
         <artifactId>commons-validator</artifactId>
-        <version>1.3.1</version>
+        <version>1.6</version>
         <exclusions>
           <exclusion>
             <groupId>commons-logging</groupId>
@@ -1486,11 +1486,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>oro</groupId>
-        <artifactId>oro</artifactId>
-        <version>2.0.8</version>
-      </dependency>
 
 
       <!-- JCR -->
-- 
2.39.5