You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/10/07 20:20:31 UTC
[archiva] 04/05: Removing velocity dependency
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 11fa0a513a6b22dc6e472a35120023806ff48c9a
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Oct 5 18:38:32 2019 +0200
Removing velocity dependency
---
.../archiva-repository-admin-default/pom.xml | 4 ----
.../archiva-web/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 0ab00cd..eaaeb1d 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
@@ -166,10 +166,6 @@
<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>
</dependency>
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 3ccb8df..5f5f2fb 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
@@ -194,11 +194,6 @@
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </dependency>
-
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index e82b08f..45ee0ca 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -173,15 +173,6 @@
</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 -->
<artifactId>archiva-maven-repository</artifactId>
diff --git a/pom.xml b/pom.xml
index 16ddf5f..7a6c332 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 -->