You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2016/04/04 18:44:29 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-6223
Repository: activemq
Updated Branches:
refs/heads/master b2327db3b -> 666029e02
https://issues.apache.org/jira/browse/AMQ-6223
Include the junit integration jar in the lib/extra area of the binary
distro.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/666029e0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/666029e0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/666029e0
Branch: refs/heads/master
Commit: 666029e024001524a2db1880192fe01a0437811c
Parents: b2327db
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Apr 4 12:43:34 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Apr 4 12:43:34 2016 -0400
----------------------------------------------------------------------
assembly/pom.xml | 45 ++++++++++++-----------
assembly/src/main/descriptors/common-bin.xml | 9 +++--
2 files changed, 30 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/666029e0/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index db5276a..6b97588 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -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>
- <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>
+ <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>
http://git-wip-us.apache.org/repos/asf/activemq/blob/666029e0/assembly/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index bf700e6..509609c 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -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>