Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ-1677. Spring dependencies. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@652107 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hadrian Zbarcea 2008-04-29 20:55:10 +00:00
parent e57b646261
commit c65a66fe3e
12 changed files with 32 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activemq-console/pom.xml
View File

@ -50,11 +50,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
@ -93,4 +88,4 @@
</plugins>
</build>
</project>
</project>

8
activemq-core/pom.xml
View File

@ -123,11 +123,6 @@
<artifactId>xbean-spring</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@ -366,6 +361,9 @@
<includes>
<include>**/*Test.*</include>
</includes>
<excludes>
<exclude>**/perf/SimpleDurableTopicTest.*</exclude>
</excludes>
<excludes>
<!-- These tests run too slow to execute as part of the unit tests -->

8
activemq-fileserver/pom.xml
View File

@ -94,12 +94,6 @@
<artifactId>jetty</artifactId>
</dependency>
<!-- For Spring servlet -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<!-- used for testing -->
<dependency>
<groupId>junit</groupId>
@ -111,4 +105,4 @@
<properties>
<jetty.port>8080</jetty.port>
</properties>
</project>
</project>

8
activemq-jpa-store/pom.xml
View File

@ -69,13 +69,13 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<optional>true</optional>
</dependency>

4
activemq-optional/pom.xml
View File

@ -48,7 +48,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
@ -157,4 +157,4 @@
</plugins>
</build>
</project>
</project>

6
activemq-ra/pom.xml
View File

@ -41,10 +41,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<!--
<dependency>
<groupId>org.apache.activemq</groupId>
@ -140,4 +136,4 @@
</build>
</project>
</project>

7
activemq-web-console/pom.xml
View File

@ -165,11 +165,6 @@
<artifactId>activemq-jaas</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
@ -261,4 +256,4 @@
<properties>
<jetty.port>8080</jetty.port>
</properties>
</project>
</project>

8
activemq-web-demo/pom.xml
View File

@ -97,12 +97,6 @@
<scope>test</scope>
</dependency>
<!-- For Spring servlet -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<!-- for custom XML parsing -->
<dependency>
<groupId>org.apache.xbean</groupId>
@ -136,4 +130,4 @@
<properties>
<jetty.port>8080</jetty.port>
</properties>
</project>
</project>

9
activemq-xmpp/pom.xml
View File

@ -156,13 +156,6 @@
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<!--<version>2.0</version>-->
</dependency>
<dependency>
<groupId>jivesoftware</groupId>
<artifactId>smack</artifactId>
@ -266,4 +259,4 @@
</plugins>
</build>
</project>
</project>

7
assembly/pom.xml
View File

@ -180,11 +180,6 @@
<artifactId>xbean-spring</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
@ -434,4 +429,4 @@
</profile>
</profiles>
</project>
</project>

3
assembly/src/main/descriptors/common-bin.xml
View File

@ -144,7 +144,8 @@
<include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.xbean:xbean-spring</include>
<include>org.springframework:spring</include>
<include>org.springframework:spring-core</include>
<include>org.springframework:spring-beans</include>
<include>xstream:xstream</include>
<include>xmlpull:xmlpull</include>
</includes>

14
pom.xml
View File

@ -450,6 +450,19 @@
</dependency>
<!-- Optional Spring Support -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</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</artifactId>
@ -490,6 +503,7 @@
</exclusion>
</exclusions>
</dependency>
-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>