aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2019-09-02 10:47:56 +0200
committerMartin Stockhammer <martin_s@apache.org>2019-09-02 10:47:56 +0200
commit2617c860de776eeadbbb68bed731d908b89c6887 (patch)
tree5e9b9037599a7fc160da6ea7a299f8a9adbe9be5
parent91e228fa0728cbd55ad226dab6cc21f95011ac80 (diff)
downloadarchiva-2617c860de776eeadbbb68bed731d908b89c6887.tar.gz
archiva-2617c860de776eeadbbb68bed731d908b89c6887.zip
Cleanup of maven dependency (maven-compat)
-rw-r--r--archiva-modules/archiva-base/archiva-repository-layer/pom.xml1
-rw-r--r--archiva-modules/archiva-maven/archiva-maven-converter/pom.xml4
-rw-r--r--pom.xml21
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 15bd3854a..2fffe8639 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 edd0b9950..13309415b 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 dfb22dc5b..0d355d03c 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>