From a4f5d747ef1e276dade54a6114f1257bc15c1755 Mon Sep 17 00:00:00 2001
From: Martyn Taylor <mtaylor@redhat.com>
Date: Thu, 5 Mar 2015 14:44:02 +0000
Subject: [PATCH] Build bin/source distro together

---
 distribution/activemq/pom.xml | 52 +++++++++++------------------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml
index 5bc30e7b80..a6a9e75520 100644
--- a/distribution/activemq/pom.xml
+++ b/distribution/activemq/pom.xml
@@ -184,38 +184,6 @@
          <build>
          </build>
       </profile>
-      <profile>
-         <id>source-release</id>
-         <activation>
-            <property>
-               <name>apache-release</name>
-            </property>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-deploy-plugin</artifactId>
-               </plugin>
-               <plugin>
-                  <artifactId>maven-assembly-plugin</artifactId>
-                  <version>2.2</version>
-                  <configuration>
-                     <descriptor>src/main/assembly/source-assembly.xml</descriptor>
-                     <tarLongFileMode>gnu</tarLongFileMode>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <phase>package</phase>
-                        <goals>
-                           <goal>single</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
    </profiles>
 
    <build>
@@ -233,12 +201,24 @@
          <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <version>2.2</version>
-            <configuration>
-               <descriptor>src/main/assembly/dep.xml</descriptor>
-               <tarLongFileMode>gnu</tarLongFileMode>
-            </configuration>
             <executions>
                <execution>
+                  <id>source</id>
+                  <configuration>
+                     <descriptor>src/main/assembly/source-assembly.xml</descriptor>
+                     <tarLongFileMode>gnu</tarLongFileMode>
+                  </configuration>
+                  <phase>package</phase>
+                  <goals>
+                     <goal>single</goal>
+                  </goals>
+               </execution>
+               <execution>
+                 <id>bin</id>
+                  <configuration>
+                     <descriptor>src/main/assembly/dep.xml</descriptor>
+                     <tarLongFileMode>gnu</tarLongFileMode>
+                  </configuration>
                   <phase>package</phase>
                   <goals>
                      <goal>single</goal>