Author: rgoers Date: Wed Mar 16 05:19:38 2011 New Revision: 1082052 URL: http://svn.apache.org/viewvc?rev=1082052&view=rev Log: [maven-release-plugin] rollback the release of commons-vfs2-project-2.0
Modified: commons/proper/vfs/trunk/pom.xml Modified: commons/proper/vfs/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1082052&r1=1082051&r2=1082052&view=diff ============================================================================== --- commons/proper/vfs/trunk/pom.xml (original) +++ commons/proper/vfs/trunk/pom.xml Wed Mar 16 05:19:38 2011 @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.commons</groupId> <artifactId>commons-parent</artifactId> - <version>17</version> + <version>19</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -138,17 +138,19 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.1.1</version> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2</version> </plugin> - <!-- Commons parent specifies 2.2-beta-5 which does not work well - with multimodule builds. Explicitly update here. - Should be removed when commons-parent-18 is released. - --> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2</version> + <artifactId>maven-release-plugin</artifactId> + <version>2.1</version> + <configuration> + <preparationGoals>clean verify scm:add -Dincludes=RELEASE-NOTES.txt</preparationGoals> + <useReleaseProfile>false</useReleaseProfile> + <goals>deploy</goals> + <arguments>-Papache-release</arguments> + </configuration> </plugin> </plugins> </pluginManagement> @@ -190,13 +192,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.2</version> + <version>2.3.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> <configuration> <xmlPath>${basedir}/src/changes/changes.xml</xmlPath> <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate> @@ -224,14 +226,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.1</version> - <configuration> - <aggregate>false</aggregate> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.5</version> <configuration> @@ -256,16 +250,6 @@ <excludeFilterFile>findbugs-exclude-filter.xml</excludeFilterFile> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.1.1</version> - <configuration> - <moduleExcludes> - <xdoc>navigation.xml,changes.xml</xdoc> - </moduleExcludes> - </configuration> - </plugin> </plugins> </reporting> @@ -407,6 +391,20 @@ get the build done and then uses the assembly to package it up. --> <profiles> + <profile> + <id>Nexus</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + + <repositories> + <repository> + <id>Nexus</id> + <url>https://repository.apache.org/content/repositories/orgapachecommons-008</url> + </repository> + </repositories> + + </profile> <profile> <id>apache-release</id> <build> @@ -414,7 +412,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changes-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> <configuration> <template>announcement.vm</template> <templateDirectory>src/changes</templateDirectory> @@ -422,51 +420,28 @@ </configuration> <executions> <execution> - <id>create-announcement</id> - <phase>package</phase> + <id>create-release-notes</id> + <phase>generate-resources</phase> <goals> <goal>announcement-generate</goal> </goals> + <configuration> + <outputDirectory>.</outputDirectory> + <announcementFile>RELEASE-NOTES.txt</announcementFile> + </configuration> </execution> - </executions> - </plugin> - <!-- Activate the right profile for the actual release build. Make sure that - the release plugin passes this on to the deploy plugin. - remove when commons-parent 18 is released. - --> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <releaseProfiles>apache-release</releaseProfiles> - </configuration> - </plugin> - <!-- Create source for the test jar. This should be in the - commons or apache parent pom. - remove when commons-parent 18 is released. - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> <execution> - <id>attach-test-sources</id> + <id>create-announcement</id> + <phase>package</phase> <goals> - <goal>test-jar</goal> + <goal>announcement-generate</goal> </goals> + <configuration> + <announcementFile>RELEASE-NOTES.txt</announcementFile> + </configuration> </execution> </executions> </plugin> - <!-- Commons turns checksums on for installs in its - parent pom. But vfs does not use the commons release - profile. So we turn it on for the vfs release explicitly. - remove when commons-parent 18 is released. - --> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <configuration> - <createChecksum>true</createChecksum> - </configuration> - </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -484,5 +459,10 @@ </plugins> </build> </profile> + <profile> + <id>cleanup-release</id> + <build> + </build> + </profile> </profiles> </project>