Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Gary Tully 2013-08-28 19:18:12 +00:00
parent 3c776cfc44
commit 30fc80ccc9
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
activemq-osgi/pom.xml
View File

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

9
assembly/pom.xml
View File

@ -158,12 +158,15 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-jaas</artifactId> <artifactId>activemq-jaas</artifactId>
</dependency> </dependency>
<!--
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <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>
-->
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-spring</artifactId> <artifactId>activemq-spring</artifactId>

3
assembly/src/main/descriptors/common-bin.xml
View File

@ -192,7 +192,6 @@
<include>org.apache.httpcomponents:httpcore</include> <include>org.apache.httpcomponents:httpcore</include>
<include>org.apache.xbean:xbean-spring</include> <include>org.apache.xbean:xbean-spring</include>
<include>org.springframework:spring-aop</include> <include>org.springframework:spring-aop</include>
<include>org.springframework:spring-asm</include>
<include>org.springframework:spring-beans</include> <include>org.springframework:spring-beans</include>
<include>org.springframework:spring-context</include> <include>org.springframework:spring-context</include>
<include>org.springframework:spring-core</include> <include>org.springframework:spring-core</include>
@ -211,6 +210,8 @@
<include>org.apache.qpid:proton</include> <include>org.apache.qpid:proton</include>
<include>org.apache.qpid:proton-api</include> <include>org.apache.qpid:proton-api</include>
<include>org.apache.qpid:proton-jms</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 --> <!-- activemq-leveldb-store dependencies -->
<include>org.scala-lang:scala-library</include> <include>org.scala-lang:scala-library</include>

5
pom.xml
View File

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