diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2018-10-28 15:48:01 +0100 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2018-10-28 15:48:01 +0100 |
| commit | df330893d73f43428c733a532236d98d57a5b90f (patch) | |
| tree | 438eaace3d79d25044200e7cd863d2a764622fb3 /archiva-modules/archiva-web | |
| parent | d39977c41348cde01f3f54bd22c06ae696aab7b9 (diff) | |
| download | archiva-df330893d73f43428c733a532236d98d57a5b90f.tar.gz archiva-df330893d73f43428c733a532236d98d57a5b90f.zip | |
Moving dependency versions to main project
Diffstat (limited to 'archiva-modules/archiva-web')
5 files changed, 5 insertions, 83 deletions
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 c02220987..20fb8b675 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 @@ -108,7 +108,6 @@ <dependency> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> - <version>1.7.1</version> </dependency> <dependency> diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index a7bcf7602..f1677129b 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -44,7 +44,6 @@ <dependency> <groupId>rome</groupId> <artifactId>rome</artifactId> - <version>0.9</version> </dependency> <dependency> <groupId>xmlunit</groupId> diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index 9b58ffd9f..913229f58 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml @@ -344,22 +344,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-slf4j-logging</artifactId> - <version>1.1</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index d68c36183..73033120c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -178,30 +178,7 @@ <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity-tools</artifactId> - <version>1.3</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - </exclusion> - <exclusion> - <groupId>velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> - <exclusion> - <groupId>struts</groupId> - <artifactId>struts</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -219,19 +196,6 @@ </exclusions> </dependency> - <!-- - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-slf4j-logging</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </exclusion> - </exclusions> - </dependency> - --> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> @@ -378,9 +342,6 @@ <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-configuration</artifactId> - <!-- TODO uncomment when repository admin will be finished - <scope>runtime</scope> - --> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -675,17 +636,7 @@ <groupId>org.apache.archiva.redback</groupId> <artifactId>redback-integrations-security</artifactId> </dependency> - <!-- - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-ext</artifactId> - </dependency> - --> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -796,21 +747,6 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-slf4j-logging</artifactId> - <version>1.1</version> - <exclusions> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 23e525402..b2d19b896 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -107,6 +107,10 @@ <artifactId>jackrabbit-webdav</artifactId> </dependency> <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-jcr-commons</artifactId> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> |