Return-Path: 
 <commits-return-16665-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: (qmail 62564 invoked from network); 16 Mar 2011 05:20:03 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 16 Mar 2011 05:20:03 -0000
Received: (qmail 29107 invoked by uid 500); 16 Mar 2011 05:20:03 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 28956 invoked by uid 500); 16 Mar 2011 05:20:02 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 28949 invoked by uid 99); 16 Mar 2011 05:20:02 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Mar 2011 05:20:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Mar 2011 05:20:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 15B1423889EA; Wed, 16 Mar 2011 05:19:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1082052 - /commons/proper/vfs/trunk/pom.xml
Date: Wed, 16 Mar 2011 05:19:39 -0000
To: commits@commons.apache.org
From: rgoers@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110316051939.15B1423889EA@eris.apache.org>

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>