issue55 plugin for maven release 3.0.5

bsorrentino · Sep 15, 2013 · 0a24007 · 0a24007
1 parent 6106c78
commit 0a24007
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 69 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>org.bsc.maven</groupId>
   <artifactId>maven-processor-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.0.5-SNAPSHOT</version>
   <name>maven-processor-plugin - ${project.version}</name>
   <description>A maven plugin to process annotation for jdk6 at compile time
 
@@ -13,7 +13,7 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
   <url>http://code.google.com/p/maven-annotation-plugin/</url>
 
 <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.0.5</maven>
   </prerequisites>
 
   <!--
@@ -48,6 +48,7 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
   </distributionManagement>
 
 <properties>
+    <maven.release>3.0.5</maven.release>
 <!-- SONATYPE REPO -->
     <snapshot.repo.id>sonatype-repo</snapshot.repo.id>
     <snapshot.repo.url>https://oss.sonatype.org/content/repositories/snapshots</snapshot.repo.url>
@@ -110,16 +111,14 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
   <dependency>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-plugin-api</artifactId>
-    <version>3.1.0</version>
+    <version>${maven.release}</version>
   </dependency>
   <dependency>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-core</artifactId>
-    <version>3.1.0</version>
+    <version>${maven.release}</version>
   </dependency>
 
-
-
     <!-- dependencies to annotations -->
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -140,37 +139,6 @@ This plugin could be considered the 'alter ego' of maven apt plugin http://mojo.
     <version>4.11</version>
     <scope>test</scope>
   </dependency>
-
-<!--
-===========================================================
-AETHER
-===========================================================
-  
-    <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-aether-provider</artifactId>
-      <version>3.0.5</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.sonatype.aether</groupId>
-        <artifactId>aether-connector-wagon</artifactId>
-      <version>1.11</version>
-      <type>jar</type>
-    </dependency>   
-    <dependency>
-        <groupId>org.sonatype.aether</groupId>
-        <artifactId>aether-connector-file</artifactId>
-        <version>1.3</version>
-      </dependency>   
-      
-  <dependency>
-      <groupId>org.sonatype.aether</groupId>
-      <artifactId>aether-util</artifactId>
-      <version>1.13.1</version>
-      <scope>compile</scope>
-  </dependency>
---> 
 
 </dependencies>
 
@@ -297,35 +265,6 @@ MAVEN3 SITE GENERATION
             </build>
         </profile>
 
-        <profile>
-            <id>twitter</id>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.vineetmanohar</groupId>
-                        <artifactId>maven-twitter-plugin</artifactId>
-                        <version>0.1</version>
-
-                        <executions>	
-			<!-- phase: deploy -->
-                            <execution>
-                                <configuration>
-				<!-- Tell your users that the project is deployed -->
-                                    <twitterStatus>New release ${project.version} of maven-annotation-plugin is available -	http://code.google.com/p/maven-annotation-plugin</twitterStatus>
-                                </configuration>
-                                <id>deploy</id>
-                                <phase>deploy</phase>
-                                <goals>
-                                    <goal>tweet</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>	
-
         <profile>
             <id>confluence</id>
 
@@ -343,7 +282,7 @@ MAVEN3 SITE GENERATION
                                 <plugin>
                                     <groupId>org.bsc.maven</groupId>
                                     <artifactId>maven-confluence-reporting-plugin</artifactId>
-                                    <version>3.1.4-SNAPSHOT</version>
+                                    <version>3.4.2</version>
                                     <reportSets>
                                         <reportSet>
                                             <id>confluence</id>

diff --git a/src/main/java/org/bsc/maven/plugin/processor/AbstractAnnotationProcessorMojo.java b/src/main/java/org/bsc/maven/plugin/processor/AbstractAnnotationProcessorMojo.java
@@ -26,7 +26,6 @@
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -47,6 +46,18 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
+
+// 3.0.5
+import org.sonatype.aether.RepositorySystem;
+import org.sonatype.aether.RepositorySystemSession;
+import org.sonatype.aether.artifact.ArtifactTypeRegistry;
+import org.sonatype.aether.repository.RemoteRepository;
+import org.sonatype.aether.resolution.ArtifactRequest;
+import org.sonatype.aether.resolution.ArtifactResolutionException;
+import org.sonatype.aether.resolution.ArtifactResult;
+import org.sonatype.aether.util.artifact.DefaultArtifact;
+/*
+// 3.1.0
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.ArtifactType;
@@ -56,7 +67,7 @@
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.ArtifactResult;
-
+*/
 
 /**
  *