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/14 23:09:11 UTC
svn commit: r1714393 - in /maven/pom/trunk/maven:
maven-archetype-bundles/pom.xml maven-skins/pom.xml
maven-skins/site-pom.xml pom.xml site-pom.xml
Author: hboutemy
Date: Sat Nov 14 22:09:11 2015
New Revision: 1714393
URL: http://svn.apache.org/viewvc?rev=1714393&view=rev
Log:
[MPOM-95] updated configuration after move
Modified:
maven/pom/trunk/maven/maven-archetype-bundles/pom.xml
maven/pom/trunk/maven/maven-skins/pom.xml
maven/pom/trunk/maven/maven-skins/site-pom.xml
maven/pom/trunk/maven/pom.xml
maven/pom/trunk/maven/site-pom.xml
Modified: maven/pom/trunk/maven/maven-archetype-bundles/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/maven-archetype-bundles/pom.xml?rev=1714393&r1=1714392&r2=1714393&view=diff
==============================================================================
--- maven/pom/trunk/maven/maven-archetype-bundles/pom.xml (original)
+++ maven/pom/trunk/maven/maven-archetype-bundles/pom.xml Sat Nov 14 22:09:11 2015
@@ -23,24 +23,24 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>maven-archetype</artifactId>
- <version>2.2</version>
- <relativePath />
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-parent</artifactId>
+ <version>30-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.archetypes</groupId>
<artifactId>maven-archetype-bundles</artifactId>
- <version>6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven Archetypes</name>
<description>Archetypes provided by Maven.</description>
+ <url>http://maven.apache.org/archetypes/</url>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/archetypes/trunk/maven-archetype-bundles</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archetypes/trunk/maven-archetype-bundles</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-bundles</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/archetypes/trunk/maven-archetype-bundles/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archetypes/trunk/maven-archetype-bundles/</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-bundles/</url>
</scm>
<issueManagement>
<system>jira</system>
@@ -106,18 +106,4 @@ under the License.
</plugins>
</build>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
</project>
Modified: maven/pom/trunk/maven/maven-skins/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/maven-skins/pom.xml?rev=1714393&r1=1714392&r2=1714393&view=diff
==============================================================================
--- maven/pom/trunk/maven/maven-skins/pom.xml (original)
+++ maven/pom/trunk/maven/maven-skins/pom.xml Sat Nov 14 22:09:11 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.skins</groupId>
<artifactId>maven-skins</artifactId>
- <version>11-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven Skins</name>
Modified: maven/pom/trunk/maven/maven-skins/site-pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/maven-skins/site-pom.xml?rev=1714393&r1=1714392&r2=1714393&view=diff
==============================================================================
--- maven/pom/trunk/maven/maven-skins/site-pom.xml (original)
+++ maven/pom/trunk/maven/maven-skins/site-pom.xml Sat Nov 14 22:09:11 2015
@@ -23,42 +23,23 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-skins</artifactId>
- <version>10</version>
- <relativePath>./pom.xml</relativePath>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-parent.</artifactId>
+ <version>30-SNAPSHOT</version>
+ <relativePath>../site-pom.xml</relativePath>
</parent>
- <artifactId>maven-skins.</artifactId>
+ <artifactId>maven-skins</artifactId>
<packaging>pom</packaging>
<name>Apache Maven Skins Parent POM</name>
<description>This project consists of a POM that contains settings that are likely to be useful to any Maven Skin that is building and releasing code with Maven 2/3.</description>
<url>http://maven.apache.org/pom/skins/</url>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/maven-skins/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-skins/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/skins/trunk/maven-skins/</url>
- </scm>
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/MPOM/component/12317104</url>
</issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/maven-skins/</url>
- </ciManagement>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
- </site>
- </distributionManagement>
-
- <properties>
- <maven.site.path>pom-archives/skins-LATEST</maven.site.path>
- </properties>
<build>
<plugins>
Modified: maven/pom/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1714393&r1=1714392&r2=1714393&view=diff
==============================================================================
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Sat Nov 14 22:09:11 2015
@@ -32,7 +32,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>28-SNAPSHOT</version>
+ <version>30-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Maven</name>
@@ -788,6 +788,11 @@ under the License.
</mailingList>
</mailingLists>
+ <modules>
+ <module>maven-archetype-bundles</module>
+ <module>maven-skins</module>
+ </modules>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven</developerConnection>
Modified: maven/pom/trunk/maven/site-pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/site-pom.xml?rev=1714393&r1=1714392&r2=1714393&view=diff
==============================================================================
--- maven/pom/trunk/maven/site-pom.xml (original)
+++ maven/pom/trunk/maven/site-pom.xml Sat Nov 14 22:09:11 2015
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>27</version>
+ <version>30-SNAPSHOT</version>
<relativePath>./pom.xml</relativePath>
</parent>
@@ -36,6 +36,11 @@ under the License.
<description>This project consists of a POM that contains settings that are likely to be useful to any Maven project that is building and releasing code with Maven 2/3.</description>
<url>http://maven.apache.org/pom/maven/</url>
+ <modules>
+ <!--module>maven-archetype-bundles</module-->
+ <module>maven-skins/site-pom.xml</module>
+ </modules>
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven</developerConnection>
@@ -58,6 +63,8 @@ under the License.
<properties>
<maven.site.path>pom-archives/maven-LATEST</maven.site.path>
+ <rat.skip>true</rat.skip>
+ <maven.test.skip>true</maven.test.skip>
</properties>
<build>