Removing velocity dependency

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 0ab00cde8a189ade23a5ea26854b7f723f03653a..eaaeb1ddc01040bf5c4f4ac6ed7089572d394387 100644 (file)
--- 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 3ccb8df1b9617066b8f5f31e16e3064d9c6d3dbc..5f5f2fb441936208bc0c6b940fd58bc44d662ba2 100644 (file)
--- 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 e82b08febab200a2c0a68470ea406b49f0f21b56..45ee0cac28a448af864f1eeff5b281c2a63a603a 100644 (file)
--- 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 16ddf5f9a00cce8fabb8e515bfb7a454a5479ae1..7a6c332d5bf62ec9f84a15bcb13c3e08def8aafa 100644 (file)
--- 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 -->