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 2617c860de776eeadbbb68bed731d908b89c6887 Author: Martin Stockhammer <[email protected]> AuthorDate: Mon Sep 2 10:47:56 2019 +0200 Cleanup of maven dependency (maven-compat) --- .../archiva-base/archiva-repository-layer/pom.xml | 1 + .../archiva-maven/archiva-maven-converter/pom.xml | 4 ---- pom.xml | 21 +-------------------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 15bd385..2fffe86 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -103,6 +103,7 @@ <artifactId>cron-utils</artifactId> </dependency> + <!-- Test scope --> <dependency> <groupId>org.apache.logging.log4j</groupId> diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml index edd0b99..1330941 100644 --- a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml @@ -49,10 +49,6 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - </dependency> <dependency> <groupId>org.sonatype.aether</groupId> diff --git a/pom.xml b/pom.xml index dfb22dc..0d355d0 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ <jsoup.version>1.7.2</jsoup.version> <rome.version>0.9</rome.version> - <cronutils.version>6.0.2</cronutils.version> + <cronutils.version>9.0.1</cronutils.version> <spring.version>4.3.10.RELEASE</spring.version> @@ -868,13 +868,6 @@ <artifactId>maven-model-builder</artifactId> <version>${maven3x.version}</version> </dependency> - <!-- - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - <version>${maven3x.version}</version> - </dependency> - --> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> @@ -883,18 +876,6 @@ <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>
