ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1856678 - in /webservices/axiom/branches/1.2.x: ./ apidocs/ aspects/ axiom-compat/ buildutils/ buildutils/buildutils-maven-plugin/ buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/ buildutils/javadoc-pos...
Date Sun, 31 Mar 2019 18:32:30 GMT
Author: veithen
Date: Sun Mar 31 18:32:30 2019
New Revision: 1856678

URL: http://svn.apache.org/viewvc?rev=1856678&view=rev
Log:
Merge r1797614 (with changes) to the 1.2 branch.

Added:
    webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/
      - copied from r1797614, webservices/axiom/trunk/buildutils/buildutils-maven-plugin/
Removed:
    webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/GetDataHandlerBridgeMethodInjector.java
    webservices/axiom/branches/1.2.x/buildutils/javadoc-postprocessor-plugin/
Modified:
    webservices/axiom/branches/1.2.x/   (props changed)
    webservices/axiom/branches/1.2.x/apidocs/pom.xml
    webservices/axiom/branches/1.2.x/aspects/pom.xml
    webservices/axiom/branches/1.2.x/axiom-compat/pom.xml
    webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/pom.xml
    webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
    webservices/axiom/branches/1.2.x/buildutils/pom.xml
    webservices/axiom/branches/1.2.x/testing/   (props changed)
    webservices/axiom/branches/1.2.x/testing/xml-truth/   (props changed)
    webservices/axiom/branches/1.2.x/testing/xml-truth/pom.xml

Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 31 18:32:30 2019
@@ -14,4 +14,4 @@
 /webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
 /webservices/axiom/branches/namespaceURIInterning:1293148-1293587
 /webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1747866,1758113,1762239,1762241,1762243,1762287,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1796489,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1821701,1821707,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810,1853727
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1747866,1758113,1762239,1762241,1762243,1762287,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1796489,1796558,1797614,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1821701,1821707,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810,1853727

Modified: webservices/axiom/branches/1.2.x/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/apidocs/pom.xml?rev=1856678&r1=1856677&r2=1856678&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/apidocs/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/apidocs/pom.xml Sun Mar 31 18:32:30 2019
@@ -115,13 +115,13 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>javadoc-postprocessor-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/branches/1.2.x/aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/aspects/pom.xml?rev=1856678&r1=1856677&r2=1856678&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/aspects/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/aspects/pom.xml Sun Mar 31 18:32:30 2019
@@ -107,6 +107,18 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>buildutils-maven-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>post-process-classes</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

Modified: webservices/axiom/branches/1.2.x/axiom-compat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-compat/pom.xml?rev=1856678&r1=1856677&r2=1856678&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/axiom-compat/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/axiom-compat/pom.xml Sun Mar 31 18:32:30 2019
@@ -103,13 +103,13 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>javadoc-postprocessor-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>

Modified: webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/pom.xml?rev=1856678&r1=1797614&r2=1856678&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/pom.xml Sun Mar 31
18:32:30 2019
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.ws.commons.axiom</groupId>
         <artifactId>buildutils</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.23-SNAPSHOT</version>
     </parent>
 
     <artifactId>buildutils-maven-plugin</artifactId>

Modified: webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java?rev=1856678&r1=1797614&r2=1856678&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
(original)
+++ webservices/axiom/branches/1.2.x/buildutils/buildutils-maven-plugin/src/main/java/org/apache/axiom/buildutils/classes/PostProcessMojo.java
Sun Mar 31 18:32:30 2019
@@ -59,9 +59,6 @@ public class PostProcessMojo extends Abs
                     ClassReader classReader = new ClassReader(in);
                     classWriter = new ClassWriter(classReader, ClassWriter.COMPUTE_FRAMES
| ClassWriter.COMPUTE_MAXS);
                     ClassVisitor classVisitor = classWriter;
-                    if (relativePath.equals("org/apache/axiom/om/OMText.class")) {
-                        classVisitor = new GetDataHandlerBridgeMethodInjector(classVisitor);
-                    }
                     classVisitor = new AspectJCodeRemover(classVisitor);
                     classReader.accept(classVisitor, 0);
                 } finally {

Modified: webservices/axiom/branches/1.2.x/buildutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/buildutils/pom.xml?rev=1856678&r1=1856677&r2=1856678&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/buildutils/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/buildutils/pom.xml Sun Mar 31 18:32:30 2019
@@ -33,14 +33,46 @@
     <url>http://ws.apache.org/axiom/</url>
 
     <modules>
+        <module>buildutils-maven-plugin</module>
         <module>jar-resource-bundle</module>
         <module>shade-axiom-xml</module>
         <module>shade-osgi</module>
-        <module>javadoc-postprocessor-plugin</module>
         <module>no-package-cycles-enforcer-rule</module>
     </modules>
 
+    <properties>
+        <maven.version>3.0</maven.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-plugin-api</artifactId>
+                <version>${maven.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-core</artifactId>
+                <version>${maven.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugin-tools</groupId>
+                <artifactId>maven-plugin-annotations</artifactId>
+                <version>3.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <version>3.3</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <!-- The build requires Java 1.6; therefore we can use that version for the
build utils as well -->
             <plugin>

Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 31 18:32:30 2019
@@ -12,4 +12,4 @@
 /webservices/axiom/branches/attrs-aspects/testing:1685218-1686663
 /webservices/axiom/branches/namespaceURIInterning/testing:1293148-1293587
 /webservices/axiom/branches/osgi-redesign/testing:1180368-1180596
-/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1762287,1795067,1798352,1817725,1817727,1817735,1819411,1843073,1844631,1845039,1846362,1846368,1848490,1850517,1850810
+/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1762287,1795067,1797614,1798352,1817725,1817727,1817735,1819411,1843073,1844631,1845039,1846362,1846368,1848490,1850517,1850810

Propchange: webservices/axiom/branches/1.2.x/testing/xml-truth/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 31 18:32:30 2019
@@ -12,4 +12,4 @@
 /webservices/axiom/branches/attrs-aspects/testing/xml-truth:1685218-1686663
 /webservices/axiom/branches/namespaceURIInterning/testing/xml-truth:1293148-1293587
 /webservices/axiom/branches/osgi-redesign/testing/xml-truth:1180368-1180596
-/webservices/axiom/trunk/testing/xml-truth:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732654,1732710,1733743,1739812,1848490,1850517,1850810
+/webservices/axiom/trunk/testing/xml-truth:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732654,1732710,1733743,1739812,1797614,1848490,1850517,1850810

Modified: webservices/axiom/branches/1.2.x/testing/xml-truth/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/xml-truth/pom.xml?rev=1856678&r1=1856677&r2=1856678&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/xml-truth/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/testing/xml-truth/pom.xml Sun Mar 31 18:32:30 2019
@@ -57,13 +57,13 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>javadoc-postprocessor-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