You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2014/02/15 22:15:16 UTC
git commit: AMQ-5047. Fix packaging issues related to maven version
Repository: activemq
Updated Branches:
refs/heads/trunk 93ca04468 -> 7b555c289
AMQ-5047. Fix packaging issues related to maven version
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/7b555c28
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/7b555c28
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/7b555c28
Branch: refs/heads/trunk
Commit: 7b555c28986c93aea74cd8b6ce2839f11a2c58b2
Parents: 93ca044
Author: Hadrian Zbarcea <hz...@gmail.com>
Authored: Sat Feb 15 16:15:04 2014 -0500
Committer: Hadrian Zbarcea <hz...@gmail.com>
Committed: Sat Feb 15 16:15:04 2014 -0500
----------------------------------------------------------------------
activemq-amqp/pom.xml | 5 +++++
activemq-client/pom.xml | 28 +++++-----------------------
activemq-http/pom.xml | 4 ++++
activemq-kahadb-store/pom.xml | 1 +
activemq-mqtt/pom.xml | 1 +
activemq-spring/pom.xml | 6 ++++++
activemq-stomp/pom.xml | 5 +++++
pom.xml | 26 +-------------------------
8 files changed, 28 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/7b555c28/activemq-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index f20b5af..56990f4 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -94,6 +94,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-leveldb-store</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/activemq/blob/7b555c28/activemq-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index 18f940b..57b3a29 100755
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -85,14 +85,6 @@
<scope>test</scope>
</dependency>
- <!-- =============================== -->
- <!-- Plugin Dependencies -->
- <!-- =============================== -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-generator</artifactId>
- <optional>true</optional>
- </dependency>
</dependencies>
<reporting>
@@ -247,14 +239,6 @@
<!-- Execute with: mvn -P openwire-generate antrun:run -->
<profile>
<id>openwire-generate</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire-generator</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -277,13 +261,11 @@
</tasks>
</configuration>
<dependencies>
- <!-- not needed on osx; dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.6.0</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-openwire-generator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/activemq/blob/7b555c28/activemq-http/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 3ed05a2..818b88c 100755
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -36,6 +36,10 @@
<artifactId>activemq-spring</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-stomp</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/activemq/blob/7b555c28/activemq-kahadb-store/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index e2fffc5..7ed3775 100755
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -104,6 +104,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>xalan</groupId>
http://git-wip-us.apache.org/repos/asf/activemq/blob/7b555c28/activemq-mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index 6b125e8..1180b99 100755
--- a/activemq-mqtt/pom.xml
+++ b/activemq-mqtt/pom.xml
@@ -114,6 +114,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>xalan</groupId>
http://git-wip-us.apache.org/repos/asf/activemq/blob/7b555c28/activemq-spring/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 753aa4c..0f7ad5d 100755
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -55,6 +55,11 @@
<artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jdbc-store</artifactId>
<optional>true</optional>
@@ -150,6 +155,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
http://git-wip-us.apache.org/repos/asf/activemq/blob/7b555c28/activemq-stomp/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index b23e027..b63d6e0 100755
--- a/activemq-stomp/pom.xml
+++ b/activemq-stomp/pom.xml
@@ -75,6 +75,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/activemq/blob/7b555c28/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6214b7f..c926faa 100755
--- a/pom.xml
+++ b/pom.xml
@@ -222,6 +222,7 @@
</distributionManagement>
<modules>
+ <module>activemq-openwire-generator</module>
<module>activemq-client</module>
<module>activemq-openwire-legacy</module>
<module>activemq-broker</module>
@@ -238,7 +239,6 @@
<module>activemq-fileserver</module>
<module>activemq-jaas</module>
<module>activemq-karaf</module>
- <module>activemq-openwire-generator</module>
<module>activemq-jms-pool</module>
<module>activemq-pool</module>
<module>activemq-ra</module>
@@ -453,7 +453,6 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
<version>${activeio-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -594,7 +593,6 @@
<groupId>org.apache.hadoop.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
- <optional>true</optional>
</dependency>
<!-- zeroconf transport -->
@@ -602,7 +600,6 @@
<groupId>javax.jmdns</groupId>
<artifactId>jmdns</artifactId>
<version>${jmdns-version}</version>
- <optional>true</optional>
</dependency>
<!-- For jsvc support -->
@@ -634,7 +631,6 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean-version}</version>
- <optional>true</optional>
<exclusions>
<exclusion>
<groupId>qdox</groupId>
@@ -677,44 +673,37 @@
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring-version}</version>
- <optional>true</optional>
</dependency>
<!--
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>${spring-version}</version>
- <optional>true</optional>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -782,13 +771,11 @@
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${org-apache-derby-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<version>${org-apache-derby-version}</version>
- <optional>true</optional>
</dependency>
<!-- Optional Axion support -->
@@ -796,21 +783,18 @@
<groupId>axion</groupId>
<artifactId>axion</artifactId>
<version>${axion-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-primitives</groupId>
<artifactId>commons-primitives</artifactId>
<version>${commons-primitives-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
<version>${regexp-version}</version>
- <optional>true</optional>
</dependency>
<!-- Optional HSQL DB Support -->
@@ -819,7 +803,6 @@
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb-version}</version>
- <optional>true</optional>
</dependency>
-->
@@ -827,7 +810,6 @@
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>${commons-dbcp-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
@@ -842,7 +824,6 @@
<groupId>howl</groupId>
<artifactId>howl-logger</artifactId>
<version>${howl-version}</version>
- <optional>true</optional>
</dependency>
-->
@@ -851,14 +832,12 @@
<groupId>activemq</groupId>
<artifactId>smack</artifactId>
<version>1.5.0</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>activemq</groupId>
<artifactId>smackx</artifactId>
<version>1.5.0</version>
- <optional>true</optional>
</dependency>
<!-- =============================== -->
@@ -1009,7 +988,6 @@
<groupId>org.fusesource.mqtt-client</groupId>
<artifactId>mqtt-client</artifactId>
<version>${mqtt-client-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
@@ -1066,13 +1044,11 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>${velocity-version}</version>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.josql</artifactId>
<version>${josql-version}</version>
- <optional>true</optional>
</dependency>
</dependencies>