@@ -48,13 +48,6 @@ | |||
<dependency> | |||
<groupId>org.apache.maven</groupId> | |||
<artifactId>maven-compat</artifactId> | |||
<version>3.0</version> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>org.sonatype.sisu</groupId> | |||
<artifactId>sisu-guice</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> |
@@ -103,7 +103,6 @@ | |||
<dependency> | |||
<groupId>com.cronutils</groupId> | |||
<artifactId>cron-utils</artifactId> | |||
<version>6.0.2</version> | |||
</dependency> | |||
<dependency> |
@@ -108,7 +108,6 @@ | |||
<dependency> | |||
<groupId>org.jsoup</groupId> | |||
<artifactId>jsoup</artifactId> | |||
<version>1.7.1</version> | |||
</dependency> | |||
<dependency> |
@@ -44,7 +44,6 @@ | |||
<dependency> | |||
<groupId>rome</groupId> | |||
<artifactId>rome</artifactId> | |||
<version>0.9</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>xmlunit</groupId> |
@@ -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> | |||
@@ -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> |
@@ -106,6 +106,10 @@ | |||
<groupId>org.apache.jackrabbit</groupId> | |||
<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> |
@@ -102,24 +102,6 @@ | |||
<artifactId>maven-resolver-provider</artifactId> | |||
</dependency> | |||
<!-- | |||
<dependency> | |||
<groupId>org.sonatype.aether</groupId> | |||
<artifactId>aether-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.sonatype.aether</groupId> | |||
<artifactId>aether-impl</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.sonatype.aether</groupId> | |||
<artifactId>aether-util</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.sonatype.aether</groupId> | |||
<artifactId>aether-connector-file</artifactId> | |||
</dependency> | |||
--> | |||
<dependency> | |||
<groupId>org.eclipse.aether</groupId> | |||
<artifactId>aether-api</artifactId> | |||
@@ -130,12 +112,6 @@ | |||
<artifactId>aether-connector-file</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.maven.resolver</groupId> | |||
<artifactId>maven-resolver-impl</artifactId> | |||
<version>1.0.3</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-configuration</artifactId> |
@@ -89,7 +89,6 @@ | |||
<dependency> | |||
<groupId>org.apache.felix</groupId> | |||
<artifactId>org.apache.felix.scr.annotations</artifactId> | |||
<version>RELEASE</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.logging.log4j</groupId> | |||
@@ -177,7 +176,6 @@ | |||
<dependency> | |||
<groupId>io.dropwizard.metrics</groupId> | |||
<artifactId>metrics-core</artifactId> | |||
<version>3.1.0</version> | |||
</dependency> | |||
<dependency> |
@@ -72,7 +72,6 @@ | |||
<dependency> | |||
<groupId>org.apache.jackrabbit</groupId> | |||
<artifactId>jackrabbit-jcr-commons</artifactId> | |||
<version>2.15.2</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> |
@@ -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> | |||
@@ -330,6 +338,13 @@ | |||
<artifactId>jackrabbit-webdav</artifactId> | |||
<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> | |||
@@ -848,6 +863,18 @@ | |||
<version>${maven3x.version}</version> | |||
</dependency> | |||
<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> | |||
@@ -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> | |||
@@ -1146,6 +1165,34 @@ | |||
</exclusion> | |||
</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> | |||
@@ -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> | |||