You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/05/28 21:28:44 UTC

svn commit: r1682314 - in /webservices/axiom/trunk: ./ apicheck/ apicheck/apicheck-maven-plugin/ apicheck/forbiddenapis-core/ apidocs/ aspects/ aspects/core-aspects/ aspects/dom-aspects/ aspects/om-aspects/ axiom-all/ axiom-api/ axiom-c14n/ axiom-compa...

Author: veithen
Date: Thu May 28 19:28:43 2015
New Revision: 1682314

URL: http://svn.apache.org/r1682314
Log:
Ensure that the project URL is set correctly for all modules that deploy artifacts.

Modified:
    webservices/axiom/trunk/apicheck/apicheck-maven-plugin/pom.xml
    webservices/axiom/trunk/apicheck/forbiddenapis-core/pom.xml
    webservices/axiom/trunk/apicheck/pom.xml
    webservices/axiom/trunk/apidocs/pom.xml
    webservices/axiom/trunk/aspects/core-aspects/pom.xml
    webservices/axiom/trunk/aspects/dom-aspects/pom.xml
    webservices/axiom/trunk/aspects/om-aspects/pom.xml
    webservices/axiom/trunk/aspects/pom.xml
    webservices/axiom/trunk/axiom-all/pom.xml
    webservices/axiom/trunk/axiom-api/pom.xml
    webservices/axiom/trunk/axiom-c14n/pom.xml
    webservices/axiom/trunk/axiom-compat/pom.xml
    webservices/axiom/trunk/axiom-jaxb/pom.xml
    webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml
    webservices/axiom/trunk/buildutils/paxexam-maven-plugin/pom.xml
    webservices/axiom/trunk/buildutils/pom.xml
    webservices/axiom/trunk/buildutils/shade-axiom-xml/pom.xml
    webservices/axiom/trunk/buildutils/shade-osgi/pom.xml
    webservices/axiom/trunk/code-coverage/pom.xml
    webservices/axiom/trunk/devguide/pom.xml
    webservices/axiom/trunk/distribution/pom.xml
    webservices/axiom/trunk/implementations/axiom-dom/pom.xml
    webservices/axiom/trunk/implementations/axiom-impl/pom.xml
    webservices/axiom/trunk/implementations/pom.xml
    webservices/axiom/trunk/pom.xml
    webservices/axiom/trunk/samples/pom.xml
    webservices/axiom/trunk/systests/pom.xml
    webservices/axiom/trunk/testing/axiom-testsuite/pom.xml
    webservices/axiom/trunk/testing/axiom-truth/pom.xml
    webservices/axiom/trunk/testing/dom-testsuite/pom.xml
    webservices/axiom/trunk/testing/jaxen-testsuite/pom.xml
    webservices/axiom/trunk/testing/multiton/pom.xml
    webservices/axiom/trunk/testing/pom.xml
    webservices/axiom/trunk/testing/saaj-testsuite/pom.xml
    webservices/axiom/trunk/testing/soap-testsuite/pom.xml
    webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
    webservices/axiom/trunk/testing/testutils/pom.xml
    webservices/axiom/trunk/testing/xml-testsuite/pom.xml
    webservices/axiom/trunk/userguide/pom.xml

Modified: webservices/axiom/trunk/apicheck/apicheck-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/apicheck/apicheck-maven-plugin/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/apicheck/apicheck-maven-plugin/pom.xml (original)
+++ webservices/axiom/trunk/apicheck/apicheck-maven-plugin/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>maven-plugin</packaging>
 
     <name>Axiom API Check Maven Plugin</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/apicheck/forbiddenapis-core/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/apicheck/forbiddenapis-core/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/apicheck/forbiddenapis-core/pom.xml (original)
+++ webservices/axiom/trunk/apicheck/forbiddenapis-core/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>jar</packaging>
 
     <name>Forbidden API Core (Shaded JAR)</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/apicheck/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/apicheck/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/apicheck/pom.xml (original)
+++ webservices/axiom/trunk/apicheck/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>pom</packaging>
 
     <name>API Check</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <modules>
         <module>apicheck-maven-plugin</module>

Modified: webservices/axiom/trunk/apidocs/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/apidocs/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/apidocs/pom.xml (original)
+++ webservices/axiom/trunk/apidocs/pom.xml Thu May 28 19:28:43 2015
@@ -31,6 +31,10 @@
 
     <name>Javadoc</name>
 
+    <properties>
+        <skipDeploy>true</skipDeploy>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -131,12 +135,6 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <executions>
                     <execution>

Modified: webservices/axiom/trunk/aspects/core-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/core-aspects/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/core-aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/core-aspects/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>bundle</packaging>
 
     <name>Core Aspects</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/aspects/dom-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/dom-aspects/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>bundle</packaging>
 
     <name>DOM Aspects</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/aspects/om-aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/om-aspects/pom.xml Thu May 28 19:28:43 2015
@@ -34,6 +34,7 @@
 
     <name>OM Aspects</name>
     <description>Contains aspects and implementation classes shared by LLOM and DOOM.</description>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/aspects/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/pom.xml (original)
+++ webservices/axiom/trunk/aspects/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>pom</packaging>
 
     <name>Aspects</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <modules>
         <module>core-aspects</module>

Modified: webservices/axiom/trunk/axiom-all/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-all/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-all/pom.xml (original)
+++ webservices/axiom/trunk/axiom-all/pom.xml Thu May 28 19:28:43 2015
@@ -31,8 +31,14 @@
 
     <name>Axiom Uber-JAR</name>
     <description>Combines all Axiom artifacts into a single one.</description>
-    <!-- This needs to be set explicitly because the Maven calculated URL would point to nowhere -->
-    <url>http://ws.apache.org/axiom/</url>
+
+    <properties>
+        <!-- If we deploy the uber-JAR to the Maven repositories, then we will end up with
+             some projects depending on the uber-JAR while others depend on the
+             individual artifacts. To avoid a dependency hell, we must not allow this.
+             All Maven projects should depend on individual artifacts, not the uber-JAR. -->
+        <skipDeploy>true</skipDeploy>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -106,16 +112,6 @@
                 </dependencies>
             </plugin>
             <plugin>
-                <!-- If we deploy the uber-JAR to the Maven repositories, then we will end up with
-                     some projects depending on the uber-JAR while others depend on the
-                     individual artifacts. To avoid a dependency hell, we must not allow this.
-                     All Maven projects should depend on individual artifacts, not the uber-JAR. -->
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>

Modified: webservices/axiom/trunk/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/pom.xml (original)
+++ webservices/axiom/trunk/axiom-api/pom.xml Thu May 28 19:28:43 2015
@@ -31,7 +31,6 @@
 
     <name>Axiom API</name>
     <description>The Axiom API</description>
-    <!-- This needs to be set explicitly because the Maven calculated URL would point to nowhere -->
     <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>

Modified: webservices/axiom/trunk/axiom-c14n/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-c14n/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-c14n/pom.xml (original)
+++ webservices/axiom/trunk/axiom-c14n/pom.xml Thu May 28 19:28:43 2015
@@ -32,7 +32,6 @@
 
     <name>Axiom C14N</name>
     <description />
-    <!-- This needs to be set explicitly because the Maven calculated URL would point to nowhere -->
     <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>

Modified: webservices/axiom/trunk/axiom-compat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/pom.xml (original)
+++ webservices/axiom/trunk/axiom-compat/pom.xml Thu May 28 19:28:43 2015
@@ -31,7 +31,6 @@
 
     <name>Axiom Compatibility Classes</name>
     <description>Contains deprecated classes that will disappear in the next major release.</description>
-    <!-- This needs to be set explicitly because the Maven calculated URL would point to nowhere -->
     <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>

Modified: webservices/axiom/trunk/axiom-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-jaxb/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-jaxb/pom.xml (original)
+++ webservices/axiom/trunk/axiom-jaxb/pom.xml Thu May 28 19:28:43 2015
@@ -31,7 +31,6 @@
 
     <name>Axiom JAXB Integration</name>
     <description>Provides an OMDataSource implementation for JAXB 2.x.</description>
-    <!-- This needs to be set explicitly because the Maven calculated URL would point to nowhere -->
     <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>

Modified: webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml (original)
+++ webservices/axiom/trunk/buildutils/jar-resource-bundle/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>jar</packaging>
 
     <name>JAR Resource Bundle</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <build>
         <plugins>

Modified: webservices/axiom/trunk/buildutils/paxexam-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/paxexam-maven-plugin/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/paxexam-maven-plugin/pom.xml (original)
+++ webservices/axiom/trunk/buildutils/paxexam-maven-plugin/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>maven-plugin</packaging>
 
     <name>Pax Exam Maven plugin</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <properties>
         <maven.version>2.0.11</maven.version>

Modified: webservices/axiom/trunk/buildutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/pom.xml (original)
+++ webservices/axiom/trunk/buildutils/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>pom</packaging>
 
     <name>Build utilities</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <modules>
         <module>jar-resource-bundle</module>

Modified: webservices/axiom/trunk/buildutils/shade-axiom-xml/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/shade-axiom-xml/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/shade-axiom-xml/pom.xml (original)
+++ webservices/axiom/trunk/buildutils/shade-axiom-xml/pom.xml Thu May 28 19:28:43 2015
@@ -29,6 +29,7 @@
     <artifactId>shade-axiom-xml</artifactId>
 
     <name>Resource Transformer for META-INF/axiom.xml files</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/buildutils/shade-osgi/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/shade-osgi/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/shade-osgi/pom.xml (original)
+++ webservices/axiom/trunk/buildutils/shade-osgi/pom.xml Thu May 28 19:28:43 2015
@@ -29,6 +29,7 @@
     <artifactId>shade-osgi</artifactId>
 
     <name>Resource Transformer for OSGi Manifests</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/code-coverage/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/code-coverage/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/code-coverage/pom.xml (original)
+++ webservices/axiom/trunk/code-coverage/pom.xml Thu May 28 19:28:43 2015
@@ -31,6 +31,10 @@
 
     <name>Code Coverage Report</name>
 
+    <properties>
+        <skipDeploy>true</skipDeploy>
+    </properties>
+
     <dependencies>
         <!--
           For each project that should appear in the coverage report, add the following dependencies:

Modified: webservices/axiom/trunk/devguide/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/devguide/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/devguide/pom.xml (original)
+++ webservices/axiom/trunk/devguide/pom.xml Thu May 28 19:28:43 2015
@@ -31,6 +31,10 @@
 
     <name>Developer Guide</name>
 
+    <properties>
+        <skipDeploy>true</skipDeploy>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -110,12 +114,6 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <executions>
                     <execution>

Modified: webservices/axiom/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/distribution/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/distribution/pom.xml (original)
+++ webservices/axiom/trunk/distribution/pom.xml Thu May 28 19:28:43 2015
@@ -31,6 +31,10 @@
 
     <name>Distribution</name>
 
+    <properties>
+        <skipDeploy>true</skipDeploy>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -142,12 +146,6 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>

Modified: webservices/axiom/trunk/implementations/axiom-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-dom/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-dom/pom.xml (original)
+++ webservices/axiom/trunk/implementations/axiom-dom/pom.xml Thu May 28 19:28:43 2015
@@ -31,6 +31,7 @@
 
     <name>Axiom DOM</name>
     <description>The Axiom DOM implementation.</description>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/implementations/axiom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/axiom-impl/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/axiom-impl/pom.xml (original)
+++ webservices/axiom/trunk/implementations/axiom-impl/pom.xml Thu May 28 19:28:43 2015
@@ -31,6 +31,7 @@
 
     <name>Axiom Impl</name>
     <description>The Axiom default implementation.</description>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/implementations/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/pom.xml (original)
+++ webservices/axiom/trunk/implementations/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>pom</packaging>
 
     <name>Implementations</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <modules>
         <module>axiom-impl</module>

Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Thu May 28 19:28:43 2015
@@ -262,6 +262,8 @@
         <jacoco.version>0.6.3.201306030806</jacoco.version>
         <spring.version>4.0.5.RELEASE</spring.version>
         <springws.version>2.2.0.RELEASE</springws.version>
+        
+        <skipDeploy>false</skipDeploy>
     </properties>
 
     <repositories>
@@ -730,6 +732,13 @@
                                     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. -->
+                                if (project.properties['skipDeploy'] == 'false' &amp;&amp; project.url != 'http://ws.apache.org/axiom/') {
+                                    throw new Error('Invalid project URL')
+                                }
+                                
                                 <!-- Create the temporary directory specified in the surefire configuration -->
                                 new File(project.build.directory, 'tmp').mkdirs()
                                 
@@ -878,6 +887,12 @@
                 </executions>
             </plugin>
             <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>${skipDeploy}</skip>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>tidy-maven-plugin</artifactId>
                 <version>1.0-beta-1</version>

Modified: webservices/axiom/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/samples/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/samples/pom.xml (original)
+++ webservices/axiom/trunk/samples/pom.xml Thu May 28 19:28:43 2015
@@ -34,6 +34,10 @@
         is to validate that every published sample executes correctly.
     </description>
 
+    <properties>
+        <skipDeploy>true</skipDeploy>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -91,12 +95,6 @@
                 </configuration>
             </plugin>
             <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>

Modified: webservices/axiom/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/pom.xml (original)
+++ webservices/axiom/trunk/systests/pom.xml Thu May 28 19:28:43 2015
@@ -42,15 +42,13 @@
         <module>wss4j-tests</module>
     </modules>
 
+    <properties>
+        <skipDeploy>true</skipDeploy>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>

Modified: webservices/axiom/trunk/testing/axiom-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/pom.xml Thu May 28 19:28:43 2015
@@ -33,6 +33,7 @@
         The Axiom implementation test suite. This test suite can be used to check conformance of a
         particular Axiom implementation.
     </description>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/testing/axiom-truth/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-truth/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-truth/pom.xml (original)
+++ webservices/axiom/trunk/testing/axiom-truth/pom.xml Thu May 28 19:28:43 2015
@@ -32,6 +32,7 @@
     <description>
         Extension for Google Truth to make assertions about Axiom trees.
     </description>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/testing/dom-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/dom-testsuite/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/dom-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/dom-testsuite/pom.xml Thu May 28 19:28:43 2015
@@ -32,6 +32,7 @@
     <description>
         DOM test suite. This test suite can be applied to any DOM implementation. It is validated against Apache Xerces.
     </description>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/testing/jaxen-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/jaxen-testsuite/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/jaxen-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/jaxen-testsuite/pom.xml Thu May 28 19:28:43 2015
@@ -32,6 +32,7 @@
     <description>
         Contains unit test code from Jaxen.
     </description>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/testing/multiton/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/multiton/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/multiton/pom.xml (original)
+++ webservices/axiom/trunk/testing/multiton/pom.xml Thu May 28 19:28:43 2015
@@ -32,4 +32,5 @@
     <description>
         Implementation of the multiton pattern used in the test suites.
     </description>
+    <url>http://ws.apache.org/axiom/</url>
 </project>

Modified: webservices/axiom/trunk/testing/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/pom.xml (original)
+++ webservices/axiom/trunk/testing/pom.xml Thu May 28 19:28:43 2015
@@ -30,6 +30,7 @@
     <packaging>pom</packaging>
 
     <name>Testing</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <modules>
         <module>axiom-testsuite</module>

Modified: webservices/axiom/trunk/testing/saaj-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/saaj-testsuite/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/saaj-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/saaj-testsuite/pom.xml Thu May 28 19:28:43 2015
@@ -29,6 +29,7 @@
     <artifactId>saaj-testsuite</artifactId>
 
     <name>SAAJ Test Suite</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/testing/soap-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/soap-testsuite/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/soap-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/soap-testsuite/pom.xml Thu May 28 19:28:43 2015
@@ -32,6 +32,7 @@
     <description>
         Contains sample messages, metadata and utilities to build tests for SOAP 1.1 and 1.2.
     </description>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml Thu May 28 19:28:43 2015
@@ -29,6 +29,7 @@
     <artifactId>spring-ws-testsuite</artifactId>
 
     <name>Spring-WS Test Suite</name>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/testing/testutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/testutils/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/testutils/pom.xml (original)
+++ webservices/axiom/trunk/testing/testutils/pom.xml Thu May 28 19:28:43 2015
@@ -32,6 +32,7 @@
     <description>
         Contains utility classes used by the test suites in Axiom.
     </description>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/testing/xml-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/xml-testsuite/pom.xml Thu May 28 19:28:43 2015
@@ -32,6 +32,7 @@
     <description>
         Contains XML sample messages.
     </description>
+    <url>http://ws.apache.org/axiom/</url>
 
     <dependencies>
         <dependency>

Modified: webservices/axiom/trunk/userguide/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/userguide/pom.xml?rev=1682314&r1=1682313&r2=1682314&view=diff
==============================================================================
--- webservices/axiom/trunk/userguide/pom.xml (original)
+++ webservices/axiom/trunk/userguide/pom.xml Thu May 28 19:28:43 2015
@@ -31,6 +31,10 @@
 
     <name>User Guide</name>
 
+    <properties>
+        <skipDeploy>true</skipDeploy>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -110,12 +114,6 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <executions>
                     <execution>