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 /pom.xml | |
| parent | d39977c41348cde01f3f54bd22c06ae696aab7b9 (diff) | |
| download | archiva-df330893d73f43428c733a532236d98d57a5b90f.tar.gz archiva-df330893d73f43428c733a532236d98d57a5b90f.zip | |
Moving dependency versions to main project
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 103 |
1 files changed, 88 insertions, 15 deletions
@@ -56,6 +56,7 @@ <maven3x.version>3.5.4</maven3x.version> <maven.artifact-manager.version>2.2.1</maven.artifact-manager.version> + <maven.compat.version>3.0</maven.compat.version> <sonatype.aether.version>1.13.1</sonatype.aether.version> <eclipse.aether.version>0.9.0.M2</eclipse.aether.version> @@ -71,6 +72,10 @@ <slf4j.version>1.7.25</slf4j.version> <log4j.version>2.8.2</log4j.version> + <jsoup.version>1.7.1</jsoup.version> + <rome.version>0.9</rome.version> + <cronutils.version>6.0.2</cronutils.version> + <spring.version>4.3.10.RELEASE</spring.version> <javax.jcr.version>2.0</javax.jcr.version> @@ -80,6 +85,8 @@ <jcr-oak.version>1.7.11</jcr-oak.version> <jackrabbit.version>2.15.4</jackrabbit.version> + <felix.scr.version>1.12.0</felix.scr.version> + <metrics-core.version>3.1.0</metrics-core.version> <cxf.version>3.0.3</cxf.version> <derbyVersion>10.13.1.1</derbyVersion> @@ -100,6 +107,7 @@ <plexus-digest.version>1.1</plexus-digest.version> <plexus-expression-evaluator.version>2.1</plexus-expression-evaluator.version> <plexus-utils.version>3.1.0</plexus-utils.version> + <plexus-slf4j-version>1.1</plexus-slf4j-version> <htmlUnitVersion>2.27</htmlUnitVersion> <release.preparationGoals>clean install</release.preparationGoals> @@ -331,6 +339,13 @@ <version>${jackrabbit.version}</version> </dependency> <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-jcr-commons</artifactId> + <version>${jackrabbit.version}</version> + </dependency> + + + <dependency> <groupId>org.apache.maven.indexer</groupId> <artifactId>indexer-reader</artifactId> <version>${maven.indexer.version}</version> @@ -850,6 +865,18 @@ <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>${maven.compat.version}</version> + <exclusions> + <exclusion> + <groupId>org.sonatype.sisu</groupId> + <artifactId>sisu-guice</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> <version>${maven3x.version}</version> </dependency> @@ -931,34 +958,26 @@ </exclusion> </exclusions> </dependency> - <!-- <dependency> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-i18n</artifactId> - <version>1.0-beta-6</version> + <artifactId>plexus-slf4j-logging</artifactId> + <version>${plexus-slf4j-version}</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-container-default</artifactId> </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-slf4j-logging</artifactId> - <version>1.1-alpha-1</version> - <exclusions> <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> </exclusion> <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </exclusion> </exclusions> </dependency> - --> + <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-taskqueue</artifactId> @@ -1147,6 +1166,34 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity-tools</artifactId> + <version>1.3</version> + <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.redback</groupId> <artifactId>redback-rbac-cached</artifactId> <version>${redback.version}</version> @@ -1435,6 +1482,12 @@ <version>${javax.jcr.version}</version> </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr.annotations</artifactId> + <version>${felix.scr.version}</version> + </dependency> + <!-- Transitive versions to manage --> <dependency> @@ -1596,9 +1649,29 @@ <version>${asm.version}</version> </dependency> + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + <version>${jsoup.version}</version> + </dependency> + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>${rome.version}</version> + </dependency> + <dependency> + <groupId>com.cronutils</groupId> + <artifactId>cron-utils</artifactId> + <version>${cronutils.version}</version> + </dependency> + <dependency> + <groupId>io.dropwizard.metrics</groupId> + <artifactId>metrics-core</artifactId> + <version>${metrics-core.version}</version> + </dependency> </dependencies> </dependencyManagement> |