You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/02/16 15:00:10 UTC
svn commit: r378249 - in /incubator/servicemix/trunk: etc/
servicemix-assembly/
servicemix-assembly/src/main/release/examples/servicemix-web/
servicemix-components/ servicemix-core/ servicemix-http/ servicemix-jms/
servicemix-jsr181/ servicemix-lwconta...
Author: gnodet
Date: Thu Feb 16 06:00:06 2006
New Revision: 378249
URL: http://svn.apache.org/viewcvs?rev=378249&view=rev
Log:
Remove snapshot dependencies (still AMQ and ActiveSoap)
Use only activemq-core
Upgrade to spring-1.2.6
Modified:
incubator/servicemix/trunk/etc/project.properties
incubator/servicemix/trunk/servicemix-assembly/project.xml
incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties
incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml
incubator/servicemix/trunk/servicemix-components/project.xml
incubator/servicemix/trunk/servicemix-core/project.xml
incubator/servicemix/trunk/servicemix-http/project.xml
incubator/servicemix/trunk/servicemix-jms/project.xml
incubator/servicemix/trunk/servicemix-jsr181/project.xml
incubator/servicemix/trunk/servicemix-lwcontainer/project.xml
incubator/servicemix/trunk/servicemix-sca/project.xml
incubator/servicemix/trunk/servicemix-wsn2005/project.xml
Modified: incubator/servicemix/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/etc/project.properties?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/project.properties (original)
+++ incubator/servicemix/trunk/etc/project.properties Thu Feb 16 06:00:06 2006
@@ -152,7 +152,7 @@
# http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html, public domain (used in Geronimo)
concurrent_version=1.3.4
# http://db.apache.org/ddlutils/, ASL 2
-ddlutils_version=1.0-SNAPSHOT
+ddlutils_version=1.0-20060216
# http://db.apache.org/derby/, ASL 2
derby_version=10.1.1.0
derbynet_version=10.1.1.0
@@ -236,7 +236,7 @@
# http://openejb.codehaus.org/, (Used in Geronimo) - BSD
openejb_core_version=2.0-SNAPSHOT
# http://jetty.mortbay.org/, ASL 2
-jetty_version=6.0-SNAPSHOT
+jetty_version=6.0.0beta9
# http://jakarta.apache.org/oro/, ASL 2
oro_version=2.0.8
# http://portals.apache.org/pluto/, ASL 2
@@ -260,7 +260,7 @@
# ?
smack_version=1.5.0
# http://www.springframework.org/, ASL 2
-spring_version=1.2.5
+spring_version=1.2.6
# http://jakarta.apache.org/taglibs/, ASL 2
standard_taglibs_version = 1.1.1
# ?
@@ -279,7 +279,7 @@
xerces_version=2.2.1
xercesImpl_version=2.7.1
# http://www.xbean.org/, ASL 2
-xbean_version=2.2-SNAPSHOT
+xbean_version=2.2
# http://xfire.codehaus.org/, http://xfire.codehaus.org/License - BSD
xfire_version=1.0-20060106
xfire_jaxws_version=1.0-20060106
Modified: incubator/servicemix/trunk/servicemix-assembly/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/project.xml?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/project.xml Thu Feb 16 06:00:06 2006
@@ -333,7 +333,7 @@
<!-- for ActiveMQ 4.x -->
<dependency>
<groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
<properties>
<lib>true</lib>
@@ -522,13 +522,6 @@
</dependency>
<dependency>
- <id>activecluster</id>
- <version>${activecluster_version}</version>
- <properties>
- <optional>true</optional>
- </properties>
- </dependency>
- <dependency>
<id>activesoap</id>
<version>${activesoap_version}</version>
<properties>
@@ -763,7 +756,7 @@
</dependency>
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>org.apache.db.ddlutils</groupId>
<artifactId>ddlutils</artifactId>
<version>${ddlutils_version}</version>
<properties>
Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties Thu Feb 16 06:00:06 2006
@@ -29,9 +29,9 @@
geronimo_spec_jms_version=1.0
activemq_version=4.0-SNAPSHOT
commons_logging_version=1.0.4
-jetty_version=6.0-SNAPSHOT
-spring_version=1.2.5
-xbean_version=2.2-SNAPSHOT
+jetty_version=6.0.0beta9
+spring_version=1.2.6
+xbean_version=2.2
jencks_version=1.1.2
concurrent_version=1.3.4
commons_dbcp_version=1.2
Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml Thu Feb 16 06:00:06 2006
@@ -45,7 +45,7 @@
<dependency>
<groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
<properties>
<war.bundle>true</war.bundle>
Modified: incubator/servicemix/trunk/servicemix-components/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/project.xml?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/project.xml Thu Feb 16 06:00:06 2006
@@ -370,12 +370,12 @@
<!-- Jabber component -->
<dependency>
- <groupId>activemq</groupId>
+ <groupId>jivesoftware</groupId>
<artifactId>smack</artifactId>
<version>${smack_version}</version>
</dependency>
<dependency>
- <groupId>activemq</groupId>
+ <groupId>jivesoftware</groupId>
<artifactId>smackx</artifactId>
<version>${smack_version}</version>
</dependency>
Modified: incubator/servicemix/trunk/servicemix-core/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/project.xml?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/project.xml Thu Feb 16 06:00:06 2006
@@ -329,7 +329,7 @@
</dependency>
<dependency>
- <groupId>servicemix</groupId>
+ <groupId>org.apache.db.ddlutils</groupId>
<artifactId>ddlutils</artifactId>
<version>${ddlutils_version}</version>
</dependency>
Modified: incubator/servicemix/trunk/servicemix-http/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/project.xml?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/project.xml Thu Feb 16 06:00:06 2006
@@ -235,7 +235,7 @@
</dependency>
<dependency>
<groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: incubator/servicemix/trunk/servicemix-jms/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/project.xml?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-jms/project.xml Thu Feb 16 06:00:06 2006
@@ -141,7 +141,7 @@
</dependency>
<dependency>
<groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: incubator/servicemix/trunk/servicemix-jsr181/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/project.xml?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/project.xml Thu Feb 16 06:00:06 2006
@@ -258,8 +258,18 @@
</dependency>
<dependency>
<groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>activeio</groupId>
+ <artifactId>activeio</artifactId>
+ <version>${activeio_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>${stax_utils_version}</version>
</dependency>
<dependency>
<groupId>jencks</groupId>
Modified: incubator/servicemix/trunk/servicemix-lwcontainer/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-lwcontainer/project.xml?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/project.xml Thu Feb 16 06:00:06 2006
@@ -165,8 +165,13 @@
<!-- Testing only -->
<dependency>
<groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>activeio</groupId>
+ <artifactId>activeio</artifactId>
+ <version>${activeio_version}</version>
</dependency>
<dependency>
<groupId>jencks</groupId>
Modified: incubator/servicemix/trunk/servicemix-sca/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/project.xml?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/project.xml Thu Feb 16 06:00:06 2006
@@ -204,6 +204,16 @@
</dependency>
<!-- Provided dependencies -->
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>activeio</groupId>
+ <artifactId>activeio</artifactId>
+ <version>${activeio_version}</version>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>servicemix-core</artifactId>
@@ -262,7 +272,7 @@
</dependency>
<dependency>
<groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
</dependency>
<dependency>
Modified: incubator/servicemix/trunk/servicemix-wsn2005/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/project.xml?rev=378249&r1=378248&r2=378249&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/project.xml Thu Feb 16 06:00:06 2006
@@ -169,8 +169,13 @@
<dependency>
<groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-core</artifactId>
<version>${activemq_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>activeio</groupId>
+ <artifactId>activeio</artifactId>
+ <version>${activeio_version}</version>
</dependency>
<dependency>