Moved the remaining bits to the activemq-optional module to a trash dir that we won't build anymore. We can clean it out once we are sure we don't need anything from it.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1407199 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2012-11-08 18:13:11 +00:00
parent 98b985228f
commit ecaae53fe8
26 changed files with 36 additions and 21 deletions

View File

@ -41,10 +41,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>activemq-console</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-optional</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
@ -73,12 +69,24 @@
<artifactSet>
<includes>
<include>${project.groupId}:activemq-client</include>
<include>${project.groupId}:activemq-openwire-legacy</include>
<include>${project.groupId}:activemq-camel</include>
<include>${project.groupId}:activemq-core</include>
<include>${project.groupId}:activemq-console</include>
<include>${project.groupId}:activemq-jaas</include>
<include>${project.groupId}:activemq-optional</include>
<include>${project.groupId}:kahadb</include>
<include>${project.groupId}:activemq-broker</include>
<include>${project.groupId}:activemq-console</include>
<include>${project.groupId}:activemq-spring</include>
<include>${project.groupId}:activemq-http</include>
<include>${project.groupId}:activemq-mqtt</include>
<include>${project.groupId}:activemq-stomp</include>
<include>${project.groupId}:activemq-amqp-store</include>
<include>${project.groupId}:activemq-kahadb-store</include>
<include>${project.groupId}:activemq-leveldb-store</include>
<include>${project.groupId}:activemq-jdbc-store</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>

View File

@ -96,6 +96,10 @@
<artifactId>activemq-leveldb-store</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-console</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>

View File

@ -121,7 +121,11 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>
<artifactId>activemq-http</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-log4j-appender</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>

View File

@ -112,10 +112,6 @@
<artifactId>activemq-fileserver</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-optional</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-pool</artifactId>

View File

@ -110,7 +110,10 @@
<includes>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:jcl-over-slf4j</include>
<include>${pom.groupId}:activemq-core</include>
<include>${pom.groupId}:activemq-client</include>
<include>${pom.groupId}:activemq-broker</include>
<include>${pom.groupId}:activemq-kahadb-store</include>
<include>${pom.groupId}:activemq-spring</include>
<include>${pom.groupId}:activemq-console</include>
<include>${pom.groupId}:activemq-jaas</include>
<include>${pom.groupId}:kahadb</include>
@ -137,7 +140,12 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
<include>${pom.groupId}:activemq-optional</include>
<include>${pom.groupId}:activemq-mqtt</include>
<include>${pom.groupId}:activemq-stomp</include>
<include>${pom.groupId}:activemq-http</include>
<include>${pom.groupId}:activemq-jdbc-store</include>
<include>${pom.groupId}:activemq-leveldb-store</include>
<include>${pom.groupId}:activemq-log4j-appender</include>
<include>${pom.groupId}:activemq-pool</include>
<include>${pom.groupId}:activemq-xmpp</include>
<include>${pom.groupId}:activemq-spring</include>

View File

@ -217,7 +217,6 @@
<module>activemq-blueprint</module>
<module>activemq-karaf</module>
<module>activemq-openwire-generator</module>
<module>activemq-optional</module>
<module>activemq-pool</module>
<module>activemq-ra</module>
<module>activemq-rar</module>
@ -381,11 +380,6 @@
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-optional</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>

View File

@ -23,6 +23,7 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
<version>5.8-SNAPSHOT</version>
<version>5.8-SNAPSHOT</version>
</parent>
<artifactId>activemq-optional</artifactId>