You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2013/05/23 20:33:00 UTC

svn commit: r1485809 - in /activemq/trunk: activemq-all/pom.xml activemq-osgi/pom.xml

Author: chirino
Date: Thu May 23 18:33:00 2013
New Revision: 1485809

URL: http://svn.apache.org/r1485809
Log:
Fixes AMQ-4549 : The activemq-all and activemq-osgi modules should have proper uber sources.jar files too.

Modified:
    activemq/trunk/activemq-all/pom.xml
    activemq/trunk/activemq-osgi/pom.xml

Modified: activemq/trunk/activemq-all/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-all/pom.xml?rev=1485809&r1=1485808&r2=1485809&view=diff
==============================================================================
--- activemq/trunk/activemq-all/pom.xml (original)
+++ activemq/trunk/activemq-all/pom.xml Thu May 23 18:33:00 2013
@@ -108,11 +108,11 @@
                   <include>${project.groupId}:activemq-console</include>
                   <include>${project.groupId}:activemq-spring</include>
 
+                  <include>${project.groupId}:activemq-amqp</include>
                   <include>${project.groupId}:activemq-http</include>
                   <include>${project.groupId}:activemq-mqtt</include>
                   <include>${project.groupId}:activemq-stomp</include>
 
-                  <include>${project.groupId}:activemq-amq-store</include>
                   <include>${project.groupId}:activemq-kahadb-store</include>
                   <include>${project.groupId}:activemq-leveldb-store</include>
                   <include>${project.groupId}:activemq-jdbc-store</include>
@@ -180,6 +180,210 @@
             </plugins>
           </build>
         </profile>
+        <profile>
+          <id>apache-release</id>
+
+          <dependencies>
+
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-client</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-openwire-legacy</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-camel</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-jaas</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-broker</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-console</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-spring</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-amqp</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-http</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-mqtt</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-stomp</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-kahadb-store</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-jdbc-store</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>${project.groupId}</groupId>
+              <artifactId>activemq-leveldb-store</artifactId>
+              <version>${project.version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.activemq.protobuf</groupId>
+              <artifactId>activemq-protobuf</artifactId>
+              <version>${activemq-protobuf-version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>org.fusesource.hawtbuf</groupId>
+              <artifactId>hawtbuf</artifactId>
+              <version>${hawtbuf-version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>org.jasypt</groupId>
+              <artifactId>jasypt</artifactId>
+              <version>${jasypt-version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.geronimo.specs</groupId>
+              <artifactId>geronimo-jms_1.1_spec</artifactId>
+              <version>1.1.1</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <!-- <dependency>
+              <groupId>org.apache.geronimo.specs</groupId>
+              <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+              <version>1.0.1</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency> -->
+            <dependency>
+              <groupId>org.apache.geronimo.specs</groupId>
+              <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+              <version>1.0.1</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>org.apache.geronimo.specs</groupId>
+              <artifactId>geronimo-annotation_1.0_spec</artifactId>
+              <version>1.1.1</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>org.slf4j</groupId>
+              <artifactId>slf4j-api</artifactId>
+              <version>${slf4j-version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>org.slf4j</groupId>
+              <artifactId>slf4j-log4j12</artifactId>
+              <version>${slf4j-version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+            <dependency>
+              <groupId>log4j</groupId>
+              <artifactId>log4j</artifactId>
+              <version>${log4j-version}</version>
+              <classifier>sources</classifier>
+              <optional>true</optional>
+            </dependency>
+          </dependencies>
+          
+          <build>
+            <plugins>
+              <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                  <skipSource>true</skipSource>
+                </configuration>
+              </plugin>
+              <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                  <execution>
+                    <id>uber-sources-jar</id>
+                    <phase>package</phase>
+                    <goals>
+                      <goal>single</goal>
+                    </goals>
+                    <configuration>
+                      <descriptors>
+                        <descriptor>${basedir}/src/main/descriptors/uber-sources.xml</descriptor>
+                      </descriptors>
+                      <appendAssemblyId>true</appendAssemblyId>
+                    </configuration>
+                  </execution>
+                </executions>
+              </plugin>
+            </plugins>
+          </build>
+        </profile>
     </profiles>
 
 </project>

Modified: activemq/trunk/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/pom.xml?rev=1485809&r1=1485808&r2=1485809&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/pom.xml (original)
+++ activemq/trunk/activemq-osgi/pom.xml Thu May 23 18:33:00 2013
@@ -315,6 +315,212 @@
         </plugins>
       </build>
     </profile>
+    
+    <profile>
+      <id>apache-release</id>
+
+      <dependencies>
+
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-client</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-openwire-legacy</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-camel</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-jaas</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-broker</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-console</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-spring</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-amqp</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-http</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-mqtt</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-stomp</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-kahadb-store</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-jdbc-store</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>activemq-leveldb-store</artifactId>
+          <version>${project.version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.activemq.protobuf</groupId>
+          <artifactId>activemq-protobuf</artifactId>
+          <version>${activemq-protobuf-version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.fusesource.hawtbuf</groupId>
+          <artifactId>hawtbuf</artifactId>
+          <version>${hawtbuf-version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.jasypt</groupId>
+          <artifactId>jasypt</artifactId>
+          <version>${jasypt-version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jms_1.1_spec</artifactId>
+          <version>1.1.1</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <!-- <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+          <version>1.0.1</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency> -->
+        <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+          <version>1.0.1</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-annotation_1.0_spec</artifactId>
+          <version>1.1.1</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+          <version>${slf4j-version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+          <version>${slf4j-version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+        <dependency>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+          <version>${log4j-version}</version>
+          <classifier>sources</classifier>
+          <optional>true</optional>
+        </dependency>
+      </dependencies>
+      
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-source-plugin</artifactId>
+            <configuration>
+              <skipSource>true</skipSource>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>uber-sources-jar</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <descriptors>
+                    <descriptor>${basedir}/src/main/descriptors/uber-sources.xml</descriptor>
+                  </descriptors>
+                  <appendAssemblyId>true</appendAssemblyId>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
   </profiles>
 
 </project>