ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1858614 - in /webservices/axiom/branches/1.2.x: ./ buildutils/jar-resource-bundle/ buildutils/pom.xml distribution/pom.xml pom.xml
Date Sat, 04 May 2019 20:38:02 GMT
Author: veithen
Date: Sat May  4 20:38:02 2019
New Revision: 1858614

URL: http://svn.apache.org/viewvc?rev=1858614&view=rev
Log:
Merge r1843945 to the 1.2 branch.

Removed:
    webservices/axiom/branches/1.2.x/buildutils/jar-resource-bundle/
Modified:
    webservices/axiom/branches/1.2.x/   (props changed)
    webservices/axiom/branches/1.2.x/buildutils/pom.xml
    webservices/axiom/branches/1.2.x/distribution/pom.xml
    webservices/axiom/branches/1.2.x/pom.xml

Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May  4 20:38:02 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,1795105,1795801,1796489-1796490,1796558,1797614,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1820347,1821701,1821707,1826041,1831211,1843069,1843073,1843075,1843350,1843517,1843942,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810,1853727,1858598
+/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,1795105,1795801,1796489-1796490,1796558,1797614,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1820347,1821701,1821707,1826041,1831211,1843069,1843073,1843075,1843350,1843517,1843942,1843945,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810,1853727,1858598

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=1858614&r1=1858613&r2=1858614&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/buildutils/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/buildutils/pom.xml Sat May  4 20:38:02 2019
@@ -34,7 +34,6 @@
 
     <modules>
         <module>buildutils-maven-plugin</module>
-        <module>jar-resource-bundle</module>
         <module>shade-axiom-xml</module>
         <module>no-package-cycles-enforcer-rule</module>
     </modules>

Modified: webservices/axiom/branches/1.2.x/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/distribution/pom.xml?rev=1858614&r1=1858613&r2=1858614&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/distribution/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/distribution/pom.xml Sat May  4 20:38:02 2019
@@ -149,21 +149,6 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <configuration>
-                            <!-- The root POM skips the execution if the packaging is
"pom", but we need the files
-                                 for inclusion into the distributions. -->
-                            <skip>false</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>

Modified: webservices/axiom/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1858614&r1=1858613&r2=1858614&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Sat May  4 20:38:02 2019
@@ -893,11 +893,6 @@
                                 <script><![CDATA[
                                     import java.io.File
                                     
-                                    // Avoid chicken and egg problem with jar-resource-bundle
-                                    if (project.packaging == 'pom') {
-                                        project.properties['skipRemoteResources'] = 'true'
-                                    }
-                                    
                                     // Since we don't generate Maven sites for submodules
the project URLs computed by Maven
                                     // (parent project URL + artifact ID) are wrong. Make
sure that the URL is explicitly set
                                     // to the right location, at least for modules that deploy
artifacts.
@@ -973,19 +968,11 @@
             </plugin>
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skipRemoteResources}</skip>
-                            <resourceBundles>
-                                <resourceBundle>org.apache.ws.commons.axiom:jar-resource-bundle:${project.version}</resourceBundle>
-                            </resourceBundles>
-                        </configuration>
-                    </execution>
-                </executions>
+                <configuration>
+                    <properties>
+                        <projectName>Apache Axiom</projectName>
+                    </properties>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>



Mime
View raw message