From 96df29eb09147c7428c9b775fc53a4fdf2d7d86f Mon Sep 17 00:00:00 2001
From: Martyn Taylor <mtaylor@redhat.com>
Date: Wed, 4 Mar 2015 16:27:09 +0000
Subject: [PATCH] Move source assembly to apache-release profile

---
 pom.xml | 90 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 47 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index 76c6f4d3be..c8b35a429b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -495,49 +495,7 @@
             <module>examples</module>
             <module>distribution</module>
          </modules>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-assembly-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <goals>
-                           <goal>single</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                           <finalName>apache-activemq-${project.version}</finalName>
-                           <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-                           <descriptorRefs>
-                              <descriptorRef>
-                                 source-release
-                              </descriptorRef>
-                           </descriptorRefs>
-                        </configuration>
-                     </execution>
-                  </executions>
-                  <dependencies>
-                     <dependency>
-                        <!-- apache version not yet released -->
-                        <!--<groupId>org.apache</groupId>-->
-                        <groupId>org.apache.geronimo.genesis</groupId>
-                        <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                        <!-- apache version not yet known -->
-                        <version>2.0</version>
-                     </dependency>
-                  </dependencies>
-               </plugin>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-surefire-plugin</artifactId>
-                  <version>2.14.1</version>
-                  <configuration>
-                     <test>false</test>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </build>
+         
       </profile>
       <profile>
          <id>hudson-tests</id>
@@ -641,6 +599,52 @@
             <skipTests>true</skipTests>
          </properties>
       </profile>
+      <profile>
+         <id>apache-release</id>
+         <activation>
+            <property>
+               <name>apache-release</name>
+            </property>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-assembly-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <goals>
+                           <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                           <finalName>apache-activemq-${project.version}</finalName>
+                           <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                           <descriptorRefs>
+                              <descriptorRef>
+                                 source-release
+                              </descriptorRef>
+                           </descriptorRefs>
+                        </configuration>
+                     </execution>
+                  </executions>
+                  <dependencies>
+                     <dependency>
+                        <!-- apache version not yet released -->
+                        <!--<groupId>org.apache</groupId>-->
+                        <groupId>org.apache.geronimo.genesis</groupId>
+                        <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                        <!-- apache version not yet known -->
+                        <version>2.0</version>
+                     </dependency>
+                  </dependencies>
+               </plugin>
+            </plugins>
+         </build>
+         <properties>
+            <skipTests>true</skipTests>
+         </properties>
+      </profile>
    </profiles>
 
    <build>