You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/06/01 11:49:44 UTC
[maven-shared-jar] branch master updated: Squashed commit of the
following:
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shared-jar.git
The following commit(s) were added to refs/heads/master by this push:
new 9735ab3 Squashed commit of the following:
9735ab3 is described below
commit 9735ab3e65bcb73525857276380ee5d6e2b745ae
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Mon Jun 1 07:48:29 2020 -0400
Squashed commit of the following:
commit f706d546740e3587e429a397d3b6f411bc55b4ea
Merge: a9fb96c e4d916b
Author: Elliotte Rusty Harold <el...@ibiblio.org>
Date: Sun May 31 09:38:30 2020 -0400
Merge branch 'master' into core
commit a9fb96ca4fecda3b9a693346484d64c2c3a3050a
Author: Elliotte Rusty Harold <el...@ibiblio.org>
Date: Sun May 31 09:00:36 2020 -0400
set Maven 3.1.0 as minimum and cleanup dependencies
---
pom.xml | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1e5e7ba..4c50df4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
</distributionManagement>
<properties>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.1.0</mavenVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-04-04T09:03:59Z</project.build.outputTimestamp>
</properties>
@@ -72,13 +72,13 @@
</dependency>
</dependencies>
</dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
</dependency>
-
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
@@ -92,6 +92,11 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId>
<version>1.1</version>
<exclusions>
@@ -101,18 +106,6 @@
</exclusion>
</exclusions>
</dependency>
-
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
- <version>1.4.2</version><!-- 1.4.2 for Maven 3.0 -->
- </dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.eclipse.sisu</groupId>-->
-<!-- <artifactId>org.eclipse.sisu.plexus</artifactId>-->
-<!-- <version>0.0.0.M2a</version><!– 0.0.0.M2a for Maven 3.1.0, 0.0.0.M5 for 3.1.1 –>-->
-<!-- </dependency>-->
-
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>