https://issues.apache.org/jira/browse/AMQ-4682 - include feature in assembly and osgi uber jar

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

activemq-osgi/pom.xml

@@ -124,12 +124,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-http</artifactId>
     </dependency>
-    <!--
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-xmpp</artifactId>
-    </dependency>
-    -->
 
     <!-- Additional Dependencies. -->
     <dependency>
@@ -162,6 +156,11 @@
       <artifactId>activemq-spring</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>activemq-runtime-config</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>

assembly/pom.xml

@@ -158,12 +158,15 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-jaas</artifactId>
     </dependency>
-    <!--
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-xmpp</artifactId>
+      <artifactId>activemq-runtime-config</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jvnet.jaxb2_commons</groupId>
+      <artifactId>jaxb2-basics-runtime</artifactId>
+      <version>${jaxb-basics-version}</version>
     </dependency>
-    -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-spring</artifactId>

assembly/src/main/descriptors/common-bin.xml

@@ -192,7 +192,6 @@
         <include>org.apache.httpcomponents:httpcore</include>
         <include>org.apache.xbean:xbean-spring</include>
         <include>org.springframework:spring-aop</include>
-        <include>org.springframework:spring-asm</include>
         <include>org.springframework:spring-beans</include>
         <include>org.springframework:spring-context</include>
         <include>org.springframework:spring-core</include>
@@ -211,6 +210,8 @@
         <include>org.apache.qpid:proton</include>
         <include>org.apache.qpid:proton-api</include>
         <include>org.apache.qpid:proton-jms</include>
+        <include>${pom.groupId}:activemq-runtime-config</include>
+        <include>org.jvnet.jaxb2_commons:jaxb2-basics-runtime</include>
 
         <!-- activemq-leveldb-store dependencies -->
         <include>org.scala-lang:scala-library</include>

pom.xml

@@ -369,6 +369,11 @@
         <artifactId>activemq-spring</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-runtime-config</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web</artifactId>