From: Olivier Lamy <olamy@apache.org>
Date: Sat, 7 Jul 2012 22:06:25 +0000 (+0000)
Subject: fix release profile
X-Git-Tag: archiva-1.4-M3~537
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8eeb8736a452f961109d5daf3530057ea5e924ae;p=archiva.git

fix release profile

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1358655 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/pom.xml b/pom.xml
index 2b0a7c5a5..d43a6261d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1723,9 +1723,8 @@
             <useReleaseProfile>false</useReleaseProfile>
             <autoVersionSubmodules>true</autoVersionSubmodules>
             <goals>deploy</goals>
-            <preparationGoals>clean</preparationGoals>
-            <!-- TODO: merge these when upgrading to latest ASF parent POM -->
-            <arguments>-Papache-release,release</arguments>
+            <preparationGoals>clean install</preparationGoals>
+            <arguments>-Prelease</arguments>
           </configuration>
         </plugin>
         <plugin>
@@ -1782,15 +1781,17 @@
     <profile>
       <id>release</id>
       <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <inherited>false</inherited>
-            <configuration>
-              <finalName>apache-archiva-${project.version}-src</finalName>
-            </configuration>
-          </plugin>
-        </plugins>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <artifactId>maven-assembly-plugin</artifactId>
+              <inherited>false</inherited>
+              <configuration>
+                <finalName>apache-archiva-${project.version}-src</finalName>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
       </build>
     </profile>