You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2012/12/06 19:41:39 UTC
svn commit: r1418027 - in /activemq/activemq-apollo/trunk:
apollo-amqp/pom.xml apollo-cli/pom.xml apollo-distro/pom.xml
apollo-openwire/pom.xml apollo-stomp/pom.xml pom.xml
Author: chirino
Date: Thu Dec 6 18:41:38 2012
New Revision: 1418027
URL: http://svn.apache.org/viewvc?rev=1418027&view=rev
Log:
Moving the amqp module out of the unstable category. Also lets be more consistent about how module depend on the apollo-web module.
Modified:
activemq/activemq-apollo/trunk/apollo-amqp/pom.xml
activemq/activemq-apollo/trunk/apollo-cli/pom.xml
activemq/activemq-apollo/trunk/apollo-distro/pom.xml
activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
activemq/activemq-apollo/trunk/pom.xml
Modified: activemq/activemq-apollo/trunk/apollo-amqp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-amqp/pom.xml?rev=1418027&r1=1418026&r2=1418027&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-amqp/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-amqp/pom.xml Thu Dec 6 18:41:38 2012
@@ -49,6 +49,12 @@
<artifactId>proton-hawtdispatch</artifactId>
<version>${qpid-proton-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apollo-web</artifactId>
+ <version>99-trunk-SNAPSHOT</version>
+ <optional>true</optional>
+ </dependency>
<!-- Scala Support -->
<dependency>
@@ -94,13 +100,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apollo-web</artifactId>
- <version>99-trunk-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
<!-- Joram JMS conformance tests -->
<dependency>
<groupId>org.fusesource.joram-jms-tests</groupId>
Modified: activemq/activemq-apollo/trunk/apollo-cli/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/pom.xml?rev=1418027&r1=1418026&r2=1418027&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/pom.xml Thu Dec 6 18:41:38 2012
@@ -148,6 +148,12 @@
<version>99-trunk-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apollo-amqp</artifactId>
+ <version>99-trunk-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -286,12 +292,6 @@
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>apollo-amqp</artifactId>
- <version>99-trunk-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
<artifactId>apollo-network</artifactId>
<version>99-trunk-SNAPSHOT</version>
<scope>test</scope>
Modified: activemq/activemq-apollo/trunk/apollo-distro/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/pom.xml?rev=1418027&r1=1418026&r2=1418027&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/pom.xml Thu Dec 6 18:41:38 2012
@@ -78,6 +78,11 @@
<artifactId>apollo-mqtt</artifactId>
<version>99-trunk-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apollo-amqp</artifactId>
+ <version>99-trunk-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -156,12 +161,6 @@
<profile>
<id>unstable</id>
<dependencies>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apollo-amqp</artifactId>
- <version>99-trunk-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>apollo-network</artifactId>
Modified: activemq/activemq-apollo/trunk/apollo-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/pom.xml?rev=1418027&r1=1418026&r2=1418027&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/pom.xml Thu Dec 6 18:41:38 2012
@@ -43,6 +43,12 @@
<artifactId>apollo-broker</artifactId>
<version>99-trunk-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apollo-web</artifactId>
+ <version>99-trunk-SNAPSHOT</version>
+ <optional>true</optional>
+ </dependency>
<!-- Scala Support -->
<dependency>
@@ -103,13 +109,6 @@
<version>${jetty-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apollo-web</artifactId>
- <version>99-trunk-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
Modified: activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/pom.xml?rev=1418027&r1=1418026&r2=1418027&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/pom.xml Thu Dec 6 18:41:38 2012
@@ -45,6 +45,13 @@
<version>99-trunk-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apollo-web</artifactId>
+ <version>99-trunk-SNAPSHOT</version>
+ <optional>true</optional>
+ </dependency>
+
<!-- Scala Support -->
<dependency>
<groupId>org.scala-lang</groupId>
@@ -90,14 +97,6 @@
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>apollo-web</artifactId>
- <version>99-trunk-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1418027&r1=1418026&r2=1418027&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Thu Dec 6 18:41:38 2012
@@ -176,6 +176,7 @@
<module>apollo-bdb</module>
<module>apollo-dto</module>
<module>apollo-stomp</module>
+ <module>apollo-amqp</module>
<module>apollo-mqtt</module>
<module>apollo-web</module>
<module>apollo-cli</module>
@@ -486,7 +487,6 @@
<id>unstable</id>
<modules>
<module>apollo-network</module>
- <module>apollo-amqp</module>
</modules>
</profile>