ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1797614 - in /webservices/axiom/trunk: apidocs/ aspects/ axiom-api/ axiom-compat/ buildutils/ buildutils/buildutils-maven-plugin/ buildutils/buildutils-maven-plugin/src/ buildutils/buildutils-maven-plugin/src/main/ buildutils/buildutils-ma...
Date Sun, 04 Jun 2017 22:15:56 GMT
Author: veithen
Date: Sun Jun  4 22:15:56 2017
New Revision: 1797614

URL: http://svn.apache.org/viewvc?rev=1797614&view=rev
Log:
Merge the two buildutils Maven plugins into a single one.

Added:
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/   (with props)
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/pom.xml
      - copied, changed from r1796521, webservices/axiom/trunk/buildutils/javadoc-postprocessor-maven-plugin/pom.xml
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/
      - copied from r1797613, webservices/axiom/trunk/buildutils/class-postprocessor-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/
      - copied from r1797613, webservices/axiom/trunk/buildutils/javadoc-postprocessor-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/
Removed:
    webservices/axiom/trunk/buildutils/class-postprocessor-maven-plugin/
    webservices/axiom/trunk/buildutils/javadoc-postprocessor-maven-plugin/
Modified:
    webservices/axiom/trunk/apidocs/pom.xml
    webservices/axiom/trunk/aspects/pom.xml
    webservices/axiom/trunk/axiom-api/pom.xml
    webservices/axiom/trunk/axiom-compat/pom.xml
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
    webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
    webservices/axiom/trunk/buildutils/pom.xml
    webservices/axiom/trunk/testing/xml-truth/pom.xml

Modified: webservices/axiom/trunk/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/apidocs/pom.xml?rev=1797614&r1=1797613&r2=1797614&view=diff
==============================================================================
--- webservices/axiom/trunk/apidocs/pom.xml (original)
+++ webservices/axiom/trunk/apidocs/pom.xml Sun Jun  4 22:15:56 2017
@@ -104,13 +104,13 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>javadoc-postprocessor-maven-plugin</artifactId>
+                <artifactId>buildutils-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
                         <phase>site</phase>
                         <goals>
-                            <goal>post-process</goal>
+                            <goal>post-process-javadoc</goal>
                         </goals>
                         <configuration>
                             <javadocDirectory>${project.reporting.outputDirectory}</javadocDirectory>

Modified: webservices/axiom/trunk/aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/pom.xml?rev=1797614&r1=1797613&r2=1797614&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/pom.xml Sun Jun  4 22:15:56 2017
@@ -74,12 +74,12 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>class-postprocessor-maven-plugin</artifactId>
+                <artifactId>buildutils-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>post-process</goal>
+                            <goal>post-process-classes</goal>
                         </goals>
                     </execution>
                 </executions>

Modified: webservices/axiom/trunk/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/pom.xml?rev=1797614&r1=1797613&r2=1797614&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/pom.xml (original)
+++ webservices/axiom/trunk/axiom-api/pom.xml Sun Jun  4 22:15:56 2017
@@ -129,12 +129,12 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>class-postprocessor-maven-plugin</artifactId>
+                <artifactId>buildutils-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
                         <goals>
-                            <goal>post-process</goal>
+                            <goal>post-process-classes</goal>
                         </goals>
                     </execution>
                 </executions>

Modified: webservices/axiom/trunk/axiom-compat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/pom.xml?rev=1797614&r1=1797613&r2=1797614&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/pom.xml (original)
+++ webservices/axiom/trunk/axiom-compat/pom.xml Sun Jun  4 22:15:56 2017
@@ -96,13 +96,13 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>javadoc-postprocessor-maven-plugin</artifactId>
+                <artifactId>buildutils-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
                         <phase>site</phase>
                         <goals>
-                            <goal>post-process</goal>
+                            <goal>post-process-javadoc</goal>
                         </goals>
                         <configuration>
                             <javadocDirectory>${project.reporting.outputDirectory}/apidocs</javadocDirectory>

Propchange: webservices/axiom/trunk/buildutils/buildutils-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jun  4 22:15:56 2017
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target

Copied: webservices/axiom/trunk/buildutils/buildutils-maven-plugin/pom.xml (from r1796521,
webservices/axiom/trunk/buildutils/javadoc-postprocessor-maven-plugin/pom.xml)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/buildutils-maven-plugin/pom.xml?p2=webservices/axiom/trunk/buildutils/buildutils-maven-plugin/pom.xml&p1=webservices/axiom/trunk/buildutils/javadoc-postprocessor-maven-plugin/pom.xml&r1=1796521&r2=1797614&rev=1797614&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/javadoc-postprocessor-maven-plugin/pom.xml (original)
+++ webservices/axiom/trunk/buildutils/buildutils-maven-plugin/pom.xml Sun Jun  4 22:15:56
2017
@@ -26,7 +26,7 @@
         <version>1.3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>javadoc-postprocessor-maven-plugin</artifactId>
+    <artifactId>buildutils-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
 
     <url>http://ws.apache.org/axiom/</url>
@@ -63,6 +63,11 @@
             <artifactId>doxia-integration-tools</artifactId>
             <version>${doxia.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>5.2</version>
+        </dependency>
     </dependencies>
 
     <build>

Modified: webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java?rev=1797614&r1=1797613&r2=1797614&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
(original)
+++ webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
Sun Jun  4 22:15:56 2017
@@ -36,7 +36,7 @@ import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
 
-@Mojo(name="post-process", defaultPhase=LifecyclePhase.PROCESS_CLASSES)
+@Mojo(name="post-process-classes", defaultPhase=LifecyclePhase.PROCESS_CLASSES)
 public class PostProcessMojo extends AbstractMojo {
     @Parameter(defaultValue="${project.build.outputDirectory}", required=true, readonly=true)
     private File classesDir;

Modified: webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java?rev=1797614&r1=1797613&r2=1797614&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
(original)
+++ webservices/axiom/trunk/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/javadoc/PostProcessMojo.java
Sun Jun  4 22:15:56 2017
@@ -41,7 +41,7 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.DirectoryScanner;
 
-@Mojo(name="post-process")
+@Mojo(name="post-process-javadoc")
 public class PostProcessMojo extends AbstractMojo {
     @Component
     private SiteTool siteTool;

Modified: webservices/axiom/trunk/buildutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/pom.xml?rev=1797614&r1=1797613&r2=1797614&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/pom.xml (original)
+++ webservices/axiom/trunk/buildutils/pom.xml Sun Jun  4 22:15:56 2017
@@ -33,10 +33,9 @@
     <url>http://ws.apache.org/axiom/</url>
 
     <modules>
-        <module>class-postprocessor-maven-plugin</module>
+        <module>buildutils-maven-plugin</module>
         <module>jar-resource-bundle</module>
         <module>shade-axiom-xml</module>
-        <module>javadoc-postprocessor-maven-plugin</module>
     </modules>
 
     <properties>

Modified: webservices/axiom/trunk/testing/xml-truth/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-truth/pom.xml?rev=1797614&r1=1797613&r2=1797614&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-truth/pom.xml (original)
+++ webservices/axiom/trunk/testing/xml-truth/pom.xml Sun Jun  4 22:15:56 2017
@@ -57,13 +57,13 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>javadoc-postprocessor-maven-plugin</artifactId>
+                <artifactId>buildutils-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
                         <phase>site</phase>
                         <goals>
-                            <goal>post-process</goal>
+                            <goal>post-process-javadoc</goal>
                         </goals>
                         <configuration>
                             <javadocDirectory>${project.reporting.outputDirectory}/apidocs</javadocDirectory>



Mime
View raw message