You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/11/15 15:58:38 UTC

svn commit: r1714461 - /maven/plugins/trunk/maven-jar-plugin/pom.xml

Author: khmarbaise
Date: Sun Nov 15 14:58:37 2015
New Revision: 1714461

URL: http://svn.apache.org/viewvc?rev=1714461&view=rev
Log:
[MJAR-201] Upgrade Maven 3.X Only JDK 1.6
Upgraded maven-archiver from 2.6 to 3.0.0
Upgraded Maven minimum version from 2.2.1 to 3.0
Upgraded plexus-archiver from 2.10 to 3.0.1
Added JUnit dependency explicitly.
Changed dependencies accordingly to Maven 3.0 minimum.
Added maven-compat in test scope
Upgraded maven-plugin-testing-harness from 1.3 to 2.1

Modified:
    maven/plugins/trunk/maven-jar-plugin/pom.xml

Modified: maven/plugins/trunk/maven-jar-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/pom.xml?rev=1714461&r1=1714460&r2=1714461&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jar-plugin/pom.xml Sun Nov 15 14:58:37 2015
@@ -70,8 +70,8 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <mavenArchiverVersion>2.6</mavenArchiverVersion>
-    <mavenVersion>2.2.1</mavenVersion>
+    <mavenArchiverVersion>3.0.0</mavenArchiverVersion>
+    <mavenVersion>3.0</mavenVersion>
   </properties>
 
   <dependencies>
@@ -87,11 +87,6 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>${mavenVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>${mavenVersion}</version>
     </dependency>
@@ -100,12 +95,6 @@ under the License.
       <artifactId>maven-archiver</artifactId>
       <version>${mavenArchiverVersion}</version>
     </dependency>
-    <dependency><!-- MJAR-173: dependency required to avoid bug in Maven 2.x -->
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>3.0.20</version>
-      <scope>runtime</scope>
-    </dependency>
     <!-- dependencies to annotations -->
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -115,12 +104,24 @@ under the License.
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>2.10</version>
+      <version>3.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-testing</groupId>
       <artifactId>maven-plugin-testing-harness</artifactId>
-      <version>1.3</version>
+      <version>2.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>