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/01/08 11:06:58 UTC
svn commit: r1228815 - in /maven/skins/trunk: maven-application-skin/pom.xml
maven-classic-skin/pom.xml maven-default-skin/pom.xml
maven-fluido-skin/pom.xml maven-skins/ maven-skins/pom.xml
maven-stylus-skin/pom.xml pom.xml
Author: dennisl
Date: Sun Jan 8 10:06:58 2012
New Revision: 1228815
URL: http://svn.apache.org/viewvc?rev=1228815&view=rev
Log:
Split maven-skins into two separate POMs:
- one parent for all the skins called maven-skins, in a subfolder like we do for our plugins
- one aggregator called maven-skins-aggregator, in the root of the project, to be used in a CI-environment
Added:
maven/skins/trunk/maven-skins/ (with props)
maven/skins/trunk/maven-skins/pom.xml
- copied, changed from r1228814, maven/skins/trunk/pom.xml
Modified:
maven/skins/trunk/maven-application-skin/pom.xml
maven/skins/trunk/maven-classic-skin/pom.xml
maven/skins/trunk/maven-default-skin/pom.xml
maven/skins/trunk/maven-fluido-skin/pom.xml
maven/skins/trunk/maven-stylus-skin/pom.xml
maven/skins/trunk/pom.xml
Modified: maven/skins/trunk/maven-application-skin/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-application-skin/pom.xml?rev=1228815&r1=1228814&r2=1228815&view=diff
==============================================================================
--- maven/skins/trunk/maven-application-skin/pom.xml (original)
+++ maven/skins/trunk/maven-application-skin/pom.xml Sun Jan 8 10:06:58 2012
@@ -26,6 +26,7 @@ under the License.
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-skins</artifactId>
<version>7-SNAPSHOT</version>
+ <relativePath>../maven-skins/pom.xml</relativePath>
</parent>
<artifactId>maven-application-skin</artifactId>
Modified: maven/skins/trunk/maven-classic-skin/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-classic-skin/pom.xml?rev=1228815&r1=1228814&r2=1228815&view=diff
==============================================================================
--- maven/skins/trunk/maven-classic-skin/pom.xml (original)
+++ maven/skins/trunk/maven-classic-skin/pom.xml Sun Jan 8 10:06:58 2012
@@ -26,6 +26,7 @@ under the License.
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-skins</artifactId>
<version>7-SNAPSHOT</version>
+ <relativePath>../maven-skins/pom.xml</relativePath>
</parent>
<artifactId>maven-classic-skin</artifactId>
Modified: maven/skins/trunk/maven-default-skin/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-default-skin/pom.xml?rev=1228815&r1=1228814&r2=1228815&view=diff
==============================================================================
--- maven/skins/trunk/maven-default-skin/pom.xml (original)
+++ maven/skins/trunk/maven-default-skin/pom.xml Sun Jan 8 10:06:58 2012
@@ -26,6 +26,7 @@ under the License.
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-skins</artifactId>
<version>7-SNAPSHOT</version>
+ <relativePath>../maven-skins/pom.xml</relativePath>
</parent>
<artifactId>maven-default-skin</artifactId>
Modified: maven/skins/trunk/maven-fluido-skin/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1228815&r1=1228814&r2=1228815&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Sun Jan 8 10:06:58 2012
@@ -22,6 +22,7 @@
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-skins</artifactId>
<version>7-SNAPSHOT</version>
+ <relativePath>../maven-skins/pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.skins</groupId>
Propchange: maven/skins/trunk/maven-skins/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jan 8 10:06:58 2012
@@ -0,0 +1 @@
+target
Copied: maven/skins/trunk/maven-skins/pom.xml (from r1228814, maven/skins/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-skins/pom.xml?p2=maven/skins/trunk/maven-skins/pom.xml&p1=maven/skins/trunk/pom.xml&r1=1228814&r2=1228815&rev=1228815&view=diff
==============================================================================
--- maven/skins/trunk/pom.xml (original)
+++ maven/skins/trunk/maven-skins/pom.xml Sun Jan 8 10:06:58 2012
@@ -26,7 +26,7 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>21</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
+ <relativePath>../../pom/maven/pom.xml</relativePath>
</parent>
<groupId>org.apache.maven.skins</groupId>
@@ -38,18 +38,10 @@ under the License.
<description>Maven Skins</description>
<url>http://maven.apache.org/skins/</url>
- <modules>
- <module>maven-application-skin</module>
- <module>maven-default-skin</module>
- <module>maven-classic-skin</module>
- <module>maven-stylus-skin</module>
- <module>maven-fluido-skin</module>
- </modules>
-
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/skins/trunk/</url>
+ <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>
@@ -59,6 +51,7 @@ under the License.
<system>Jenkins</system>
<url>https://builds.apache.org/job/maven-skins/</url>
</ciManagement>
+
<distributionManagement>
<site>
<id>apache.website</id>
Modified: maven/skins/trunk/maven-stylus-skin/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-stylus-skin/pom.xml?rev=1228815&r1=1228814&r2=1228815&view=diff
==============================================================================
--- maven/skins/trunk/maven-stylus-skin/pom.xml (original)
+++ maven/skins/trunk/maven-stylus-skin/pom.xml Sun Jan 8 10:06:58 2012
@@ -26,6 +26,7 @@ under the License.
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-skins</artifactId>
<version>7-SNAPSHOT</version>
+ <relativePath>../maven-skins/pom.xml</relativePath>
</parent>
<artifactId>maven-stylus-skin</artifactId>
Modified: maven/skins/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/pom.xml?rev=1228815&r1=1228814&r2=1228815&view=diff
==============================================================================
--- maven/skins/trunk/pom.xml (original)
+++ maven/skins/trunk/pom.xml Sun Jan 8 10:06:58 2012
@@ -30,87 +30,19 @@ under the License.
</parent>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-skins</artifactId>
- <version>7-SNAPSHOT</version>
+ <artifactId>maven-skins-aggregator</artifactId>
+ <version>1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Maven Skins</name>
- <description>Maven Skins</description>
- <url>http://maven.apache.org/skins/</url>
+ <name>Maven Skins Aggregator</name>
+ <description>Maven Skins Aggregator</description>
<modules>
+ <module>maven-skins</module>
<module>maven-application-skin</module>
<module>maven-default-skin</module>
<module>maven-classic-skin</module>
<module>maven-stylus-skin</module>
<module>maven-fluido-skin</module>
</modules>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/skins/trunk/</url>
- </scm>
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/MSKINS</url>
- </issueManagement>
- <ciManagement>
- <system>Jenkins</system>
- <url>https://builds.apache.org/job/maven-skins/</url>
- </ciManagement>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <url>scp://people.apache.org/www/maven.apache.org/skins/</url>
- </site>
- </distributionManagement>
-
- <!-- Workaround for SUREFIRE-300 -->
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <site.destination>${project.artifactId}</site.destination>
- </properties>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/maven/skins/tags</tagBase>
- <arguments>-Prc,run-its,reporting</arguments>
- <goals>deploy site-deploy</goals>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>rc</id>
- <properties>
- <site.destination>${project.artifactId}-${project.version}</site.destination>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>