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-6223 

Include the junit integration jar in the lib/extra area of the binary
distro.
This commit is contained in:
Timothy Bish 2016-04-04 12:43:34 -04:00
parent b2327db3b7
commit 666029e024
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
assembly/pom.xml
View File

@ -70,6 +70,11 @@
<groupId>${project.groupId}</groupId>
<artifactId>activemq-partition</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq.tooling</groupId>
<artifactId>activemq-junit</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.fusesource.hawtdispatch</groupId>
@ -95,7 +100,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${org.osgi.core-version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@ -269,13 +273,13 @@
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
</dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-websocket-api</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
@ -359,20 +363,20 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
</dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
</dependency>
<dependency>
<groupId>org.jasypt</groupId>
<artifactId>jasypt</artifactId>
@ -453,7 +457,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven-dependency-plugin-version}</version>
<executions>
<execution>
<id>unpack</id>
@ -580,7 +583,7 @@
</plugins>
</build>
</profile>
<profile>
<profile>
<id>activemq.tests-autoTransport</id>
<activation>
<property>

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

@ -260,6 +260,9 @@
<includes>
<!-- mqtt -->
<include>org.fusesource.mqtt-client:mqtt-client</include>
<!-- junit integration -->
<include>org.apache.activemq.tooling:activemq-junit</include>
</includes>
</dependencySet>
<dependencySet>
@ -272,7 +275,7 @@
<include>org.eclipse.jetty.aggregate:jetty-all</include>
<include>org.apache.tomcat:tomcat-servlet-api</include>
<include>org.apache.tomcat:tomcat-websocket-api</include>
<!-- JSP support -->
<!-- Jetty JSP api-->
<include>org.eclipse.jetty:apache-jsp</include>
@ -282,9 +285,9 @@
<include>org.eclipse.jetty:apache-jstl</include>
<include>org.apache.taglibs:taglibs-standard-spec</include>
<!-- jstl and el impl -->
<include>org.mortbay.jasper:apache-el</include>
<include>org.mortbay.jasper:apache-el</include>
<include>org.apache.taglibs:taglibs-standard-impl</include>
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
<include>org.ow2.asm:asm</include>
<include>org.eclipse.jetty.orbit:org.eclipse.jdt.core</include>