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

fix release profile

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

diff --git a/pom.xml b/pom.xml
index 54b8da0e6..a183f8714 100644
--- a/pom.xml
+++ b/pom.xml
@@ -579,6 +579,7 @@
           <configuration>
             <tagBase>https://svn.apache.org/repos/asf/archiva/tags/</tagBase>
             <useReleaseProfile>false</useReleaseProfile>
+            <goals>deploy</goals>
             <arguments>-Prelease</arguments>
           </configuration>
         </plugin>
@@ -628,38 +629,34 @@
     <profile>
       <id>release</id>
       <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-assembly-plugin</artifactId>
-              <dependencies>
-                <dependency>
-                  <groupId>org.apache.apache.resources</groupId>
-                  <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                  <version>1.0.4</version>
-                </dependency>
-              </dependencies>
-              <executions>
-                <execution>
-                  <id>source-release-assembly</id>
-                  <phase>package</phase>
-                  <goals>
-                    <goal>single</goal>
-                  </goals>
-                  <configuration>
-                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                    <descriptorRefs>
-                      <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
-                    </descriptorRefs>
-                    <tarLongFileFormat>gnu</tarLongFileFormat>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-          </plugins>
-        </pluginManagement>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.apache.resources</groupId>
+                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                <version>1.0.4</version>
+              </dependency>
+            </dependencies>
+            <executions>
+              <execution>
+                <id>source-release-assembly</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                  <descriptorRefs>
+                    <descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
+                  </descriptorRefs>
+                  <tarLongFileFormat>gnu</tarLongFileFormat>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <!-- We want to sign the artifact, the POM, and all attached artifacts -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>