svn commit: r1594048 - in /aries/trunk/versioning/versioning-plugin: pom.xml src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java

[dk...@apache.org]

Author: dkulp
Date: Mon May 12 18:42:43 2014
New Revision: 1594048

URL: http://svn.apache.org/r1594048
Log:
Update the version plugin to support Maven 3.1 (but this drops support for Mavne 3.0/2.x)

Modified:
    aries/trunk/versioning/versioning-plugin/pom.xml
    aries/trunk/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java

Modified: aries/trunk/versioning/versioning-plugin/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/versioning/versioning-plugin/pom.xml?rev=1594048&r1=1594047&r2=1594048&view=diff
==============================================================================
--- aries/trunk/versioning/versioning-plugin/pom.xml (original)
+++ aries/trunk/versioning/versioning-plugin/pom.xml Mon May 12 18:42:43 2014
@@ -51,29 +51,29 @@
             <version>3.0.3</version>
         </dependency>
         <dependency>
-           <groupId>org.sonatype.aether</groupId>
+           <groupId>org.eclipse.aether</groupId>
            <artifactId>aether-api</artifactId>
-           <version>1.11</version>
+           <version>0.9.1.v20140329</version>
          </dependency>
          <dependency>
-           <groupId>org.sonatype.aether</groupId>
+           <groupId>org.eclipse.aether</groupId>
            <artifactId>aether-util</artifactId>
-           <version>1.11</version>
+           <version>0.9.1.v20140329</version>
          </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
-            <version>3.0.3</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.0.3</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-compat</artifactId>
-            <version>3.0.3</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

Modified: aries/trunk/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java
URL: http://svn.apache.org/viewvc/aries/trunk/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java?rev=1594048&r1=1594047&r2=1594048&view=diff
==============================================================================
--- aries/trunk/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java (original)
+++ aries/trunk/versioning/versioning-plugin/src/main/java/org/apache/aries/versioning/mojo/VersionCheckerMojo.java Mon May 12 18:42:43 2014
@@ -31,13 +31,13 @@ import org.apache.aries.versioning.check
 import org.apache.aries.versioning.check.VersionChange;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.resolution.ArtifactRequest;
-import org.sonatype.aether.resolution.ArtifactResult;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.resolution.ArtifactRequest;
+import org.eclipse.aether.resolution.ArtifactResult;
 
 /**
  * Check semantic version changes between an explicitly named old artifact and the project output artifact.
@@ -199,7 +199,7 @@ extends AbstractMojo
     ArtifactResult result;
     try {
       result = repoSystem.resolveArtifact(repoSession, request);
-    } catch (org.sonatype.aether.resolution.ArtifactResolutionException e) {
+    } catch (org.eclipse.aether.resolution.ArtifactResolutionException e) {
       getLog().warn("could not resolve " + artifact, e);
       return null;
     }