You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2012/09/20 22:49:05 UTC
svn commit: r1388210 - in /maven/doxia/doxia-tools/trunk: ./
doxia-book-maven-plugin/ doxia-book-renderer/ doxia-converter/
doxia-integration-tools/ doxia-linkcheck/ doxia-tools/ doxia-tools/src/ src/
Author: dennisl
Date: Thu Sep 20 20:49:05 2012
New Revision: 1388210
URL: http://svn.apache.org/viewvc?rev=1388210&view=rev
Log:
Change the POM hierarchy to match those used for maven-plugins and maven-shared. Such a layout is suitable when the modules have different release cycles, like they do here. The parent for doxia-tools is now at the same level as the modules, instead of one level above. At the top level is now an aggregator POM that can be used for CI servers.
Added:
maven/doxia/doxia-tools/trunk/doxia-tools/
maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml (contents, props changed)
- copied, changed from r1388189, maven/doxia/doxia-tools/trunk/pom.xml
maven/doxia/doxia-tools/trunk/doxia-tools/src/
- copied from r1388189, maven/doxia/doxia-tools/trunk/src/
Removed:
maven/doxia/doxia-tools/trunk/src/
Modified:
maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/pom.xml
maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml
maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml
maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml
maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml
maven/doxia/doxia-tools/trunk/pom.xml
Modified: maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/pom.xml?rev=1388210&r1=1388209&r2=1388210&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-maven-plugin/pom.xml Thu Sep 20 20:49:05 2012
@@ -25,8 +25,8 @@ under the License.
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-tools</artifactId>
- <version>1.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../doxia-tools/pom.xml</relativePath>
</parent>
<artifactId>doxia-book-maven-plugin</artifactId>
Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml?rev=1388210&r1=1388209&r2=1388210&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml Thu Sep 20 20:49:05 2012
@@ -25,8 +25,8 @@ under the License.
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-tools</artifactId>
- <version>1.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../doxia-tools/pom.xml</relativePath>
</parent>
<artifactId>doxia-book-renderer</artifactId>
Modified: maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml?rev=1388210&r1=1388209&r2=1388210&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-converter/pom.xml Thu Sep 20 20:49:05 2012
@@ -25,8 +25,8 @@ under the License.
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-tools</artifactId>
- <version>1.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../doxia-tools/pom.xml</relativePath>
</parent>
<artifactId>doxia-converter</artifactId>
Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml?rev=1388210&r1=1388209&r2=1388210&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml Thu Sep 20 20:49:05 2012
@@ -25,8 +25,8 @@
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-tools</artifactId>
- <version>1.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../doxia-tools/pom.xml</relativePath>
</parent>
<artifactId>doxia-integration-tools</artifactId>
Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml?rev=1388210&r1=1388209&r2=1388210&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml Thu Sep 20 20:49:05 2012
@@ -25,8 +25,8 @@ under the License.
<parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-tools</artifactId>
- <version>1.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../doxia-tools/pom.xml</relativePath>
</parent>
<artifactId>doxia-linkcheck</artifactId>
Copied: maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml (from r1388189, maven/doxia/doxia-tools/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml?p2=maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml&p1=maven/doxia/doxia-tools/trunk/pom.xml&r1=1388189&r2=1388210&rev=1388210&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml Thu Sep 20 20:49:05 2012
@@ -26,12 +26,12 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>22</version>
- <relativePath>../../pom/maven/pom.xml</relativePath>
+ <relativePath>../../../pom/maven/pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-tools</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Doxia Tools</name>
Propchange: maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/doxia/doxia-tools/trunk/doxia-tools/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/doxia/doxia-tools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/pom.xml?rev=1388210&r1=1388209&r2=1388210&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/pom.xml Thu Sep 20 20:49:05 2012
@@ -30,125 +30,11 @@ under the License.
</parent>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-tools</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <artifactId>doxia-tools-aggregator</artifactId>
+ <version>1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Doxia Tools</name>
- <description>A set of tools for working with Doxia documents.</description>
- <url>http://maven.apache.org/doxia/doxia-tools/</url>
- <inceptionYear>2005</inceptionYear>
-
- <mailingLists>
- <mailingList>
- <name>Maven User List</name>
- <subscribe>users-subscribe@maven.apache.org</subscribe>
- <unsubscribe>users-unsubscribe@maven.apache.org</unsubscribe>
- <post>users@maven.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-users</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/users@maven.apache.org/</otherArchive>
- <otherArchive>http://oldnabble.com/Maven---Users-f178.html</otherArchive>
- <otherArchive>http://markmail.org/list/org.apache.maven.users</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Maven Developer List</name>
- <subscribe>dev-subscribe@maven.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@maven.apache.org</unsubscribe>
- <post>dev@maven.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-dev</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/dev@maven.apache.org/</otherArchive>
- <otherArchive>http://old.nabble.com/Maven-Developers-f179.html</otherArchive>
- <otherArchive>http://markmail.org/list/org.apache.maven.dev</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Maven Commits List</name>
- <subscribe>commits-subscribe@maven.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@maven.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-commits</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/commits@maven.apache.org</otherArchive>
- <otherArchive>http://old.nabble.com/Maven---Commits-f15575.html</otherArchive>
- <otherArchive>http://markmail.org/list/org.apache.maven.commits</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Maven Issues List</name>
- <subscribe>issues-subscribe@maven.apache.org</subscribe>
- <unsubscribe>issues-unsubscribe@maven.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/issues@maven.apache.org</otherArchive>
- <otherArchive>http://old.nabble.com/Maven---Issues-f15573.html</otherArchive>
- <otherArchive>http://markmail.org/list/org.apache.maven.issues</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Old Doxia Developer List (closed)</name>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-doxia-dev/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/doxia-dev@maven.apache.org</otherArchive>
- <otherArchive>http://www.nabble.com/Doxia---dev-f11816.html</otherArchive>
- <otherArchive>http://markmail.org/list/org.apache.maven.doxia-dev</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Old Doxia User List (closed)</name>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-doxia-users/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/doxia-users@maven.apache.org</otherArchive>
- <otherArchive>http://www.nabble.com/Doxia---Users-f14483.html</otherArchive>
- <otherArchive>http://markmail.org/list/org.apache.maven.doxia-users</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Old Doxia Commits List (closed)</name>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-doxia-commits/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/doxia-commits@maven.apache.org</otherArchive>
- <otherArchive>http://markmail.org/list/org.apache.maven.doxia-commits</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Maven Issues List</name>
- <subscribe>issues-subscribe@maven.apache.org</subscribe>
- <unsubscribe>issues-unsubscribe@maven.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/issues@maven.apache.org</otherArchive>
- <otherArchive>http://www.nabble.com/Maven---Issues-f15573.html</otherArchive>
- <otherArchive>http://markmail.org/list/org.apache.maven.issues</otherArchive>
- </otherArchives>
- </mailingList>
-
- <!-- duplication from parent pom - temporary until they inherit properly -->
- <mailingList>
- <name>Maven Announcements List</name>
- <post>announce@maven.apache.org</post>
- <subscribe>announce-subscribe@maven.apache.org</subscribe>
- <unsubscribe>announce-unsubscribe@maven.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/announce@maven.apache.org</otherArchive>
- <otherArchive>http://www.nabble.com/Maven-Announcements-f15617.html</otherArchive>
- <otherArchive>http://markmail.org/list/org.apache.maven.announces</otherArchive>
- </otherArchives>
- </mailingList>
- <mailingList>
- <name>Maven Notifications List</name>
- <subscribe>notifications-subscribe@maven.apache.org</subscribe>
- <unsubscribe>notifications-unsubscribe@maven.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
- <otherArchives>
- <otherArchive>http://www.mail-archive.com/notifications@maven.apache.org</otherArchive>
- <otherArchive>http://www.nabble.com/Maven---Notifications-f15574.html</otherArchive>
- <otherArchive>http://markmail.org/list/org.apache.maven.notifications</otherArchive>
- </otherArchives>
- </mailingList>
- </mailingLists>
+ <name>Doxia Tools Aggregator</name>
<modules>
<module>doxia-book-renderer</module>
@@ -157,147 +43,4 @@ under the License.
<module>doxia-integration-tools</module>
<module>doxia-linkcheck</module>
</modules>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk</url>
- </scm>
-
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/DOXIATOOLS</url>
- </issueManagement>
-
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/doxia-tools/</url>
- </ciManagement>
-
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/doxia/doxia-tools</url>
- </site>
- </distributionManagement>
-
- <properties>
- <projectVersion>${project.version}</projectVersion>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- Plexus -->
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-30</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>2.0.5</version>
- </dependency>
- <dependency><!-- remove when upgrading parent to version 22 -->
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- <version>1.5.5</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags</tagBase>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/doxia/doxia-tools-${project.version}</stagingSiteURL>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>generate-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>reporting</id>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.3</version>
- <reportSets>
- <reportSet>
- <id>non-aggregate</id>
- <reports>
- <report>jxr</report>
- </reports>
- </reportSet>
- <reportSet>
- <id>aggregate</id>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
- <reportSets>
- <reportSet>
- <id>non-aggregate</id>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- <reportSet>
- <id>aggregate</id>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- </profiles>
-
</project>