You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/11/21 15:14:07 UTC
svn commit: r1715529 - in /maven/pom/trunk/maven: doxia-tools/pom.xml
maven-plugins/pom.xml pom.xml site-pom.xml
Author: hboutemy
Date: Sat Nov 21 14:14:06 2015
New Revision: 1715529
URL: http://svn.apache.org/viewvc?rev=1715529&view=rev
Log:
[MPOM-95] updated pom after move
Modified:
maven/pom/trunk/maven/doxia-tools/pom.xml
maven/pom/trunk/maven/maven-plugins/pom.xml
maven/pom/trunk/maven/pom.xml
maven/pom/trunk/maven/site-pom.xml
Modified: maven/pom/trunk/maven/doxia-tools/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/doxia-tools/pom.xml?rev=1715529&r1=1715528&r2=1715529&view=diff
==============================================================================
--- maven/pom/trunk/maven/doxia-tools/pom.xml (original)
+++ maven/pom/trunk/maven/doxia-tools/pom.xml Sat Nov 21 14:14:06 2015
@@ -25,13 +25,12 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>27</version>
- <relativePath>../../../pom/maven/pom.xml</relativePath>
+ <version>30-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-tools</artifactId>
- <version>4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Doxia :: Tools</name>
@@ -39,117 +38,6 @@ under the License.
<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>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-tools</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/trunk/doxia-tools</developerConnection>
@@ -160,7 +48,6 @@ under the License.
<system>jira</system>
<url>https://issues.apache.org/jira/browse/DOXIATOOLS</url>
</issueManagement>
-
<ciManagement>
<system>Jenkins</system>
<url>https://builds.apache.org/job/doxia-tools/</url>
@@ -169,7 +56,7 @@ under the License.
<distributionManagement>
<site>
<id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven-doxia/content/${maven.site.path}</url>
+ <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven-doxia/content/doxia-tools-archives/</url>
</site>
</distributionManagement>
@@ -189,7 +76,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.15</version>
+ <version>3.0.22</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: maven/pom/trunk/maven/maven-plugins/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/maven-plugins/pom.xml?rev=1715529&r1=1715528&r2=1715529&view=diff
==============================================================================
--- maven/pom/trunk/maven/maven-plugins/pom.xml (original)
+++ maven/pom/trunk/maven/maven-plugins/pom.xml Sat Nov 21 14:14:06 2015
@@ -17,6 +17,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
Modified: maven/pom/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1715529&r1=1715528&r2=1715529&view=diff
==============================================================================
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Sat Nov 21 14:14:06 2015
@@ -793,6 +793,7 @@ under the License.
<module>maven-plugins</module>
<module>maven-shared-components</module>
<module>maven-skins</module>
+ <module>doxia-tools</module>
</modules>
<scm>
Modified: maven/pom/trunk/maven/site-pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/site-pom.xml?rev=1715529&r1=1715528&r2=1715529&view=diff
==============================================================================
--- maven/pom/trunk/maven/site-pom.xml (original)
+++ maven/pom/trunk/maven/site-pom.xml Sat Nov 21 14:14:06 2015
@@ -37,10 +37,11 @@ under the License.
<url>http://maven.apache.org/pom/maven/</url>
<modules>
- <!--module>maven-archetype-bundles</module-->
+ <!--module>maven-archetype-bundles/site-pom.xml</module-->
<module>maven-plugins/site-pom.xml</module>
<module>maven-shared-components/site-pom.xml</module>
<module>maven-skins/site-pom.xml</module>
+ <!--module>doxia-tools/site-pom.xml</module-->
</modules>
<scm>