You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2014/02/20 20:15:04 UTC
svn commit: r1570313 - /commons/proper/commons-parent/trunk/pom.xml
Author: mbenson
Date: Thu Feb 20 19:15:04 2014
New Revision: 1570313
URL: http://svn.apache.org/r1570313
Log:
require Maven 3 to permit upgrade to scm-publish 1.0; define scm-publish serverId to use property commons.scmPubServer whose default value is commons.site
Modified:
commons/proper/commons-parent/trunk/pom.xml
Modified: commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1570313&r1=1570312&r2=1570313&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Thu Feb 20 19:15:04 2014
@@ -71,9 +71,9 @@ http://svn.apache.org/repos/asf/commons/
<distributionManagement>
<site>
- <id>apache.website</id>
- <name>Apache Commons Site</name>
- <url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/${commons.componentid}</url>
+ <id>commons.site</id>
+ <name>Apache Commons Site SVN</name>
+ <url>scm:svn:${commons.scmPubUrl}</url>
</site>
</distributionManagement>
@@ -244,7 +244,7 @@ http://svn.apache.org/repos/asf/commons/
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.1</version>
</plugin>
- <!-- Apache parent includes docck and enforcer -->
+ <!-- Apache parent includes docck -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
@@ -416,6 +416,28 @@ http://svn.apache.org/repos/asf/commons/
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <id>enforce-maven-3</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.0.0</version>
+ </requireMavenVersion>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -516,6 +538,7 @@ http://svn.apache.org/repos/asf/commons/
<content>${project.reporting.outputDirectory}</content>
<pubScmUrl>scm:svn:${commons.scmPubUrl}</pubScmUrl>
<checkoutDirectory>${commons.scmPubCheckoutDirectory}</checkoutDirectory>
+ <serverId>${commons.scmPubServer}</serverId>
<tryUpdate>true</tryUpdate>
</configuration>
<executions>
@@ -1261,9 +1284,7 @@ http://svn.apache.org/repos/asf/commons/
<commons.cobertura.version>2.6</commons.cobertura.version>
<commons.jdepend.version>2.0-beta-2</commons.jdepend.version>
<commons.compiler.version>3.1</commons.compiler.version>
- <!-- Version 1.0 requires Maven 3.0 or later -->
- <commons.scm-publish.version>1.0-beta-2</commons.scm-publish.version>
-
+ <commons.scm-publish.version>1.0</commons.scm-publish.version>
<!-- Default values for the download-page generation by commons-build-plugin -->
<commons.release.name>${project.artifactId}-${commons.release.version}</commons.release.name>
@@ -1336,6 +1357,7 @@ http://svn.apache.org/repos/asf/commons/
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${project.artifactId}</commons.scmPubUrl>
<commons.scmPubCheckoutDirectory>${commons.site.cache}/${commons.site.path}</commons.scmPubCheckoutDirectory>
+ <commons.scmPubServer>commons.site</commons.scmPubServer>
<sonar.host.url>https://analysis.apache.org/</sonar.host.url>