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/27 20:58:54 UTC
svn commit: r1682098 - in /webservices/axiom/trunk: axiom-all/
axiom-all/pom.xml axiom-api/ axiom-api/pom.xml axiom-c14n/
axiom-c14n/pom.xml axiom-compat/ axiom-compat/pom.xml axiom-jaxb/
axiom-jaxb/pom.xml modules/ pom.xml
Author: veithen
Date: Wed May 27 18:58:53 2015
New Revision: 1682098
URL: http://svn.apache.org/r1682098
Log:
- Move the remaining Maven modules out of the "modules" directory so that the entire structure of the entire tree becomes canonical, with artifact ID = directory name.
- With that structure, the SCM info for submodules is calculated correctly by Maven. No need to override it.
- Also correct the SCM info in the root POM.
Added:
webservices/axiom/trunk/axiom-all/
- copied from r1682092, webservices/axiom/trunk/modules/axiom-all/
webservices/axiom/trunk/axiom-api/
- copied from r1682092, webservices/axiom/trunk/modules/axiom-api/
webservices/axiom/trunk/axiom-c14n/
- copied from r1682092, webservices/axiom/trunk/modules/axiom-c14n/
webservices/axiom/trunk/axiom-compat/
- copied from r1682092, webservices/axiom/trunk/modules/axiom-compat/
webservices/axiom/trunk/axiom-jaxb/
- copied from r1682092, webservices/axiom/trunk/modules/axiom-jaxb/
Removed:
webservices/axiom/trunk/modules/
Modified:
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/pom.xml
Modified: webservices/axiom/trunk/axiom-all/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-all/pom.xml?rev=1682098&r1=1682092&r2=1682098&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-all/pom.xml (original)
+++ webservices/axiom/trunk/axiom-all/pom.xml Wed May 27 18:58:53 2015
@@ -24,7 +24,6 @@
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-all</artifactId>
@@ -32,16 +31,9 @@
<name>Axiom Uber-JAR</name>
<description>Combines all Axiom artifacts into a single one.</description>
- <!-- This also needs to be set explicitly because the Maven calculated URL would point to nowhere -->
+ <!-- This needs to be set explicitly because the Maven calculated URL would point to nowhere -->
<url>http://ws.apache.org/axiom/</url>
- <!-- This needs to be set explicitly because the project structure implies that the Maven calculated defaults are wrong -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-all</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-all</developerConnection>
- <url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-all</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: webservices/axiom/trunk/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/pom.xml?rev=1682098&r1=1682092&r2=1682098&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/pom.xml (original)
+++ webservices/axiom/trunk/axiom-api/pom.xml Wed May 27 18:58:53 2015
@@ -24,7 +24,6 @@
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-api</artifactId>
@@ -32,16 +31,9 @@
<name>Axiom API</name>
<description>The Axiom API</description>
- <!-- This also needs to be set explicitly because the Maven calculated URL would point to nowhere -->
+ <!-- This needs to be set explicitly because the Maven calculated URL would point to nowhere -->
<url>http://ws.apache.org/axiom/</url>
- <!-- This needs to be set explicitly because the project structure implies that the Maven calculated defaults are wrong -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-api</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-api</developerConnection>
- <url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: webservices/axiom/trunk/axiom-c14n/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-c14n/pom.xml?rev=1682098&r1=1682092&r2=1682098&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-c14n/pom.xml (original)
+++ webservices/axiom/trunk/axiom-c14n/pom.xml Wed May 27 18:58:53 2015
@@ -25,7 +25,6 @@
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-c14n</artifactId>
@@ -33,16 +32,9 @@
<name>Axiom C14N</name>
<description />
- <!-- This also needs to be set explicitly because the Maven calculated URL would point to nowhere -->
+ <!-- This needs to be set explicitly because the Maven calculated URL would point to nowhere -->
<url>http://ws.apache.org/axiom/</url>
- <!-- This needs to be set explicitly because the project structure implies that the Maven calculated defaults are wrong -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-c14n</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-c14n</developerConnection>
- <url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-c14n</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: webservices/axiom/trunk/axiom-compat/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/pom.xml?rev=1682098&r1=1682092&r2=1682098&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/pom.xml (original)
+++ webservices/axiom/trunk/axiom-compat/pom.xml Wed May 27 18:58:53 2015
@@ -24,7 +24,6 @@
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-compat</artifactId>
@@ -32,16 +31,9 @@
<name>Axiom Compatibility Classes</name>
<description>Contains deprecated classes that will disappear in the next major release.</description>
- <!-- This also needs to be set explicitly because the Maven calculated URL would point to nowhere -->
+ <!-- This needs to be set explicitly because the Maven calculated URL would point to nowhere -->
<url>http://ws.apache.org/axiom/</url>
- <!-- This needs to be set explicitly because the project structure implies that the Maven calculated defaults are wrong -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-compat</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-compat</developerConnection>
- <url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-compat</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: webservices/axiom/trunk/axiom-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-jaxb/pom.xml?rev=1682098&r1=1682092&r2=1682098&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-jaxb/pom.xml (original)
+++ webservices/axiom/trunk/axiom-jaxb/pom.xml Wed May 27 18:58:53 2015
@@ -24,7 +24,6 @@
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-jaxb</artifactId>
@@ -32,16 +31,9 @@
<name>Axiom JAXB Integration</name>
<description>Provides an OMDataSource implementation for JAXB 2.x.</description>
- <!-- This also needs to be set explicitly because the Maven calculated URL would point to nowhere -->
+ <!-- This needs to be set explicitly because the Maven calculated URL would point to nowhere -->
<url>http://ws.apache.org/axiom/</url>
- <!-- This needs to be set explicitly because the project structure implies that the Maven calculated defaults are wrong -->
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-jaxb</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-jaxb</developerConnection>
- <url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-jaxb</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1682098&r1=1682097&r2=1682098&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Wed May 27 18:58:53 2015
@@ -208,11 +208,11 @@
<modules>
<module>buildutils</module>
- <module>modules/axiom-api</module>
- <module>modules/axiom-compat</module>
- <module>modules/axiom-jaxb</module>
- <module>modules/axiom-c14n</module>
- <module>modules/axiom-all</module>
+ <module>axiom-api</module>
+ <module>axiom-compat</module>
+ <module>axiom-jaxb</module>
+ <module>axiom-c14n</module>
+ <module>axiom-all</module>
<module>samples</module>
<module>systests</module>
<module>apicheck</module>
@@ -227,9 +227,9 @@
</modules>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom</developerConnection>
- <url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/axiom/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/axiom/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/axiom/trunk</url>
</scm>
<issueManagement>
<system>JIRA</system>