activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [17/18] git commit: AMQ-5047. Fix packaging issues related to maven version
Date Thu, 20 Mar 2014 18:44:13 GMT
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/720d8115
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/720d8115
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/720d8115

Branch: refs/heads/activemq-5.9
Commit: 720d8115c019335a4745976e3685f7f451ecb920
Parents: b254cbc
Author: Hadrian Zbarcea <hzbarcea@gmail.com>
Authored: Sat Feb 15 16:15:04 2014 -0500
Committer: Hadrian Zbarcea <hadrian@apache.org>
Committed: Thu Mar 20 14:28:24 2014 -0400

----------------------------------------------------------------------
 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/720d8115/activemq-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 6eddd37..2efc579 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/720d8115/activemq-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index d5e4c82..7c88c3b 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>
@@ -246,14 +238,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>
@@ -276,13 +260,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/720d8115/activemq-http/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 01ae8bd..0d3c358 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/720d8115/activemq-kahadb-store/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index e79cd04..a4dbeac 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/720d8115/activemq-mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index 9dbd9b6..6223626 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/720d8115/activemq-spring/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 6dbc901..bfa662d 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/720d8115/activemq-stomp/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index fc5d184..ed7cd55 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/720d8115/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6e40701..dac3722 100755
--- a/pom.xml
+++ b/pom.xml
@@ -221,6 +221,7 @@
   </distributionManagement>
 
   <modules>
+    <module>activemq-openwire-generator</module>
     <module>activemq-client</module>
     <module>activemq-openwire-legacy</module>
     <module>activemq-broker</module>
@@ -237,7 +238,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>
@@ -447,7 +447,6 @@
         <groupId>org.apache.activemq</groupId>
         <artifactId>activeio-core</artifactId>
         <version>${activeio-version}</version>
-         <optional>true</optional>
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
@@ -588,7 +587,6 @@
         <groupId>org.apache.hadoop.zookeeper</groupId>
         <artifactId>zookeeper</artifactId>
         <version>${zookeeper-version}</version>
-        <optional>true</optional>
       </dependency>
 
       <!-- zeroconf transport -->
@@ -596,7 +594,6 @@
         <groupId>javax.jmdns</groupId>
         <artifactId>jmdns</artifactId>
         <version>${jmdns-version}</version>
-        <optional>true</optional>
       </dependency>
 
       <!-- For jsvc support -->
@@ -628,7 +625,6 @@
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-spring</artifactId>
         <version>${xbean-version}</version>
-        <optional>true</optional>
         <exclusions>
           <exclusion>
             <groupId>qdox</groupId>
@@ -671,44 +667,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>
@@ -776,13 +765,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 -->
@@ -790,21 +777,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 -->
@@ -813,7 +797,6 @@
         <groupId>hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
         <version>${hsqldb-version}</version>
-        <optional>true</optional>
         </dependency>
       -->
 
@@ -821,7 +804,6 @@
         <groupId>commons-dbcp</groupId>
         <artifactId>commons-dbcp</artifactId>
         <version>${commons-dbcp-version}</version>
-        <optional>true</optional>
       </dependency>
 
       <dependency>
@@ -836,7 +818,6 @@
         <groupId>howl</groupId>
         <artifactId>howl-logger</artifactId>
         <version>${howl-version}</version>
-        <optional>true</optional>
         </dependency>
       -->
 
@@ -845,14 +826,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>
 
       <!-- =============================== -->
@@ -1003,7 +982,6 @@
         <groupId>org.fusesource.mqtt-client</groupId>
         <artifactId>mqtt-client</artifactId>
         <version>${mqtt-client-version}</version>
-        <optional>true</optional>
       </dependency>
 
       <dependency>
@@ -1060,13 +1038,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>


Mime
View raw message