Author: tv
Date: Tue May 21 10:56:17 2013
New Revision: 1484751
URL: http://svn.apache.org/r1484751
Log:
- Add SCM-publish-plugin for site deployment
- Update Apache parent POM from 11 to 13
- Update plugins
- maven-compiler-plugin from 2.5.1 to 3.0
- maven-resources-plugin from 2.5 to 2.6
- maven-sources-plugin from 2.1.2 to 2.2.1
- cobertura-maven-plugin from 2.5.1 to 2.5.2
- rat-maven-plugin 1.0-alpha-3 to apache-rat-plugin 0.8
- maven-surefire-plugin from 2.12.4 to 2.13
- maven-javadoc-plugin from 2.8.1 to 2.9
- maven-changes-plugin from 2.6 to 2.8
- maven-project-info-plugin from 2.5 to 2.6
- maven-site-plugin from 3.0 to 3.2
- Add support profile for Maven 3
Modified:
turbine/maven/turbine-parent/trunk/pom.xml
turbine/maven/turbine-parent/trunk/src/changes/changes.xml
Modified: turbine/maven/turbine-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/turbine-parent/trunk/pom.xml?rev=1484751&r1=1484750&r2=1484751&view=diff
==============================================================================
--- turbine/maven/turbine-parent/trunk/pom.xml (original)
+++ turbine/maven/turbine-parent/trunk/pom.xml Tue May 21 10:56:17 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>11</version>
+ <version>13</version>
</parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
@@ -80,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
+ <version>3.0</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
@@ -99,6 +99,7 @@
<quiet>true</quiet>
<encoding>${turbine.encoding}</encoding>
<docEncoding>${turbine.docEncoding}</docEncoding>
+ <notimestamp>true</notimestamp>
<links>
<link>${turbine.javadoc.java.link}</link>
<link>${turbine.javadoc.javaee.link}</link>
@@ -114,15 +115,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<configuration>
<encoding>${turbine.resourceEncoding}</encoding>
</configuration>
</plugin>
+ <!-- Apache parent: scm -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>${turbine.site-plugin.version}</version>
+ <configuration>
+ <!-- don't deploy site with maven-site-plugin -->
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2.1</version>
<configuration>
<archive>
<manifest>
@@ -195,6 +206,27 @@
<jvm>${turbine.surefire.java}</jvm>
</configuration>
</plugin>
+
+ <plugin> <!-- Thanks to Apache Commons -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>1.0-beta-2</version>
+ <configuration>
+ <content>${project.reporting.outputDirectory}</content>
+ <pubScmUrl>scm:svn:${turbine.scmPubUrl}</pubScmUrl>
+
<checkoutDirectory>${turbine.scmPubCheckoutDirectory}</checkoutDirectory>
+ <tryUpdate>true</tryUpdate>
+ </configuration>
+ <executions>
+ <execution>
+ <id>scm-publish</id>
+ <phase>site-deploy</phase><!-- deploy site with
maven-scm-publish-plugin -->
+ <goals>
+ <goal>publish-scm</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -207,7 +239,7 @@
<!-- generate the changes report from changes.xml -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.4</version>
+ <version>${turbine.changes.version}</version>
<reportSets>
<reportSet>
<reports>
@@ -234,6 +266,7 @@
<source>${maven.compile.source}</source>
<encoding>${turbine.encoding}</encoding>
<docEncoding>${turbine.docEncoding}</docEncoding>
+ <notimestamp>true</notimestamp>
<linksource>true</linksource>
<links>
<link>${turbine.javadoc.java.link}</link>
@@ -274,7 +307,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.1</version>
+ <version>${turbine.site.version}</version>
<configuration>
<!-- Exclude the navigation file for Maven 1 sites
and the changes file used by the changes-plugin,
@@ -293,7 +326,7 @@
<!-- get test coverage for regression tests -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -302,9 +335,9 @@
</plugin>
<plugin>
<!-- check the Apache Licence in all source files -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>${turbine.rat.version}</version>
</plugin>
<plugin>
<!-- generate the tag list report -->
@@ -316,23 +349,6 @@
</reporting>
<profiles>
-
- <profile>
- <id>ci</id>
- <distributionManagement>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
-
<url>${turbine.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
-
<url>${turbine.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
- </profile>
-
<!-- Allow overriding the target repository (Thanks to Apache Commons) -->
<profile>
<id>test-deploy</id>
@@ -377,6 +393,43 @@
</build>
</profile>
+ <!--
+ Configure site plugin to support both Maven2 and Maven3, see:
+
http://maven.apache.org/plugins/maven-site-plugin/maven-3.html#Using_the_same_version_of_maven-site-plugin_for_both_Maven_2_and_Maven_3
+ Thanks to Apache Commons
+ -->
+ <profile>
+ <id>maven-3</id>
+ <activation>
+ <file>
+ <!-- The basedir expression is only recognized by Maven 3.x (see
MNG-2363) -->
+ <exists>${basedir}</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <!-- add support for ssh/scp -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>${turbine.wagon-ssh.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<properties>
@@ -392,18 +445,15 @@
<turbine.surefire.java>${JAVA_HOME}/bin/java</turbine.surefire.java>
<!-- Plugin versions (allows same value in reporting and build sections)
-->
- <turbine.surefire.version>2.12.4</turbine.surefire.version>
- <turbine.surefire-report.version>2.12.4</turbine.surefire-report.version>
- <turbine.javadoc.version>2.8.1</turbine.javadoc.version>
- <turbine.changes.version>2.6</turbine.changes.version>
+ <turbine.surefire.version>2.13</turbine.surefire.version>
+ <turbine.surefire-report.version>2.13</turbine.surefire-report.version>
+ <turbine.javadoc.version>2.9</turbine.javadoc.version>
+ <turbine.rat.version>0.8</turbine.rat.version>
+ <turbine.changes.version>2.8</turbine.changes.version>
<turbine.jxr.version>2.3</turbine.jxr.version>
- <turbine.project-info.version>2.5</turbine.project-info.version>
-
- <!--
- Make the deployment protocol pluggable. This allows to switch to
- other protocols like scpexe, turbine.ch some users prefer over scp.
- -->
- <turbine.deployment.protocol>scp</turbine.deployment.protocol>
+ <turbine.project-info.version>2.6</turbine.project-info.version>
+ <turbine.wagon-ssh.version>2.3</turbine.wagon-ssh.version>
+ <turbine.site-plugin.version>3.2</turbine.site-plugin.version>
<!--
Encoding of Java source files: Make sure, that the compiler and
@@ -426,6 +476,14 @@
<maven.build.timestamp.format>yyyy-MM-dd
HH:mm:ssZ</maven.build.timestamp.format>
<implementation.build>${scmBranch}@r${buildNumber};${maven.build.timestamp}</implementation.build>
+ <!-- scm publish plugin configuration -->
+ <turbine.site.cache>${user.home}/commons-sites</turbine.site.cache>
+ <!-- value modules can override it -->
+ <turbine.site.path>${project.artifactId}</turbine.site.path>
+
+
<turbine.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/turbine/content/${turbine.site.path}</turbine.scmPubUrl>
+
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/${turbine.site.path}</turbine.scmPubCheckoutDirectory>
+
<!-- maven-surefire-plugin -->
<test>**/*Test</test>
Modified: turbine/maven/turbine-parent/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/turbine-parent/trunk/src/changes/changes.xml?rev=1484751&r1=1484750&r2=1484751&view=diff
==============================================================================
--- turbine/maven/turbine-parent/trunk/src/changes/changes.xml (original)
+++ turbine/maven/turbine-parent/trunk/src/changes/changes.xml Tue May 21
10:56:17 2013
@@ -24,6 +24,30 @@
</properties>
<body>
+ <release version="3" date="in SVN">
+ <action dev="tv" type="add" date="2013-05-19">
+ Add SCM-publish-plugin for site deployment
+ </action>
+ <action dev="tv" type="update" date="2013-05-19">
+ Update Apache parent POM from 11 to 13
+ </action>
+ <action dev="tv" type="update" date="2013-05-19">
+ Update plugins
+ - maven-compiler-plugin from 2.5.1 to 3.0
+ - maven-resources-plugin from 2.5 to 2.6
+ - maven-sources-plugin from 2.1.2 to 2.2.1
+ - cobertura-maven-plugin from 2.5.1 to 2.5.2
+ - rat-maven-plugin 1.0-alpha-3 to apache-rat-plugin 0.8
+ - maven-surefire-plugin from 2.12.4 to 2.13
+ - maven-javadoc-plugin from 2.8.1 to 2.9
+ - maven-changes-plugin from 2.6 to 2.8
+ - maven-project-info-plugin from 2.5 to 2.6
+ - maven-site-plugin from 3.0 to 3.2
+ </action>
+ <action dev="tv" type="update" date="2013-05-19">
+ Add support profile for Maven 3
+ </action>
+ </release>
<release version="2" date="2012-11-05">
<action dev="tv" type="update" date="2012-12-27">
Add more Apache links to site descriptor
