Author: sebb
Date: Fri Jun 18 14:28:24 2010
New Revision: 956012
URL: http://svn.apache.org/viewvc?rev=956012&view=rev
Log:
Remove distributionManagement overrides, so we default to Nexus (Apache parent
v7)
Remove "ci" profile as it no longer does anything.
Synchronise "rc" and "release" profiles: attach assembly to "release" package
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=956012&r1=956011&r2=956012&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Fri Jun 18 14:28:24 2010
@@ -37,20 +37,6 @@
<url>http://vmbuild.apache.org/continuum/</url>
</ciManagement>
- <distributionManagement>
- <!--
- This POM's parent POM (the Apache root POM) provides repositories.
Unfortunately,
- this allows for accidental deployments. So we disable them here by
providing
- a dummy repository. Use "mvn -Prc deploy" (Apache snapshot repository) or
- "mvn -Prelease deploy" (Apache release repository), if you really want
to deploy.
- -->
- <repository>
- <id>dummy</id>
- <name>Dummy to avoid accidental deploys</name>
- <url />
- </repository>
- </distributionManagement>
-
<!--
This section *must* be overwritten by subprojects. It is only to allow
a release of the commons-parent POM.
@@ -268,7 +254,6 @@
</plugins>
</pluginManagement>
<plugins>
- <!-- TODO: later use toolchain support to do compilation on an external
JDK 1.3+ compiler -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
@@ -436,30 +421,7 @@
<profiles>
<profile>
- <id>ci</id>
- <distributionManagement>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
-
<url>${commons.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>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
- </profile>
-
- <profile>
<id>release</id>
- <distributionManagement>
- <repository>
- <id>apache.releases</id>
- <name>Apache Release Distribution Repository</name>
-
<url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- </distributionManagement>
<build>
<plugins>
<!-- We want to sign the artifact, the POM, and all attached
artifacts -->
@@ -519,24 +481,23 @@
<source>${maven.compile.source}</source>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
<profile>
<id>rc</id>
- <distributionManagement>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
-
<url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/staged</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots</id>
- <name>Apache Development Snapshot Repository</name>
-
<url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- </distributionManagement>
<build>
<plugins>
<!-- We want to sign the artifact, the POM, and all attached
artifacts -->
