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 df330893d73f43428c733a532236d98d57a5b90f Author: Martin Stockhammer <[email protected]> AuthorDate: Sun Oct 28 15:48:01 2018 +0100 Moving dependency versions to main project --- .../archiva-base/archiva-converter/pom.xml | 7 -- .../archiva-base/archiva-repository-layer/pom.xml | 1 - .../archiva-rest/archiva-rest-services/pom.xml | 1 - archiva-modules/archiva-web/archiva-rss/pom.xml | 1 - .../archiva-web/archiva-webapp-test/pom.xml | 16 ---- archiva-modules/archiva-web/archiva-webapp/pom.xml | 66 +------------ archiva-modules/archiva-web/archiva-webdav/pom.xml | 4 + archiva-modules/plugins/maven2-repository/pom.xml | 24 ----- archiva-modules/plugins/metadata-store-jcr/pom.xml | 2 - .../plugins/repository-statistics/pom.xml | 1 - pom.xml | 103 ++++++++++++++++++--- 11 files changed, 93 insertions(+), 133 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index a9a90a5..e952313 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -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> diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 196ae45..e9d60bd 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -103,7 +103,6 @@ <dependency> <groupId>com.cronutils</groupId> <artifactId>cron-utils</artifactId> - <version>6.0.2</version> </dependency> <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 c022209..20fb8b6 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 a7bcf76..f167712 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 9b58ffd..913229f 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 d68c361..7303312 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 23e5254..b2d19b8 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> diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index 07cfd18..5a8ef5f 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -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> @@ -131,12 +113,6 @@ </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> </dependency> diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index c53149a..a7df77f 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -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> diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml index 2a1926d..38f83fd 100644 --- a/archiva-modules/plugins/repository-statistics/pom.xml +++ b/archiva-modules/plugins/repository-statistics/pom.xml @@ -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> diff --git a/pom.xml b/pom.xml index 2ab77a1..e6991e5 100644 --- a/pom.xml +++ b/pom.xml @@ -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>
