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/27 17:25:43 UTC
svn commit: r381373 - in /incubator/servicemix/trunk: ./ etc/
servicemix-assembly/
servicemix-assembly/src/main/release/examples/servicemix-web/
servicemix-bpe/ servicemix-components/ servicemix-core/ servicemix-http/
servicemix-jsr181/ servicemix-lwco...
Author: gnodet
Date: Mon Feb 27 08:25:37 2006
New Revision: 381373
URL: http://svn.apache.org/viewcvs?rev=381373&view=rev
Log:
Upgrade xfire and xmlschema to 1.0, jetty to beta10
Modified:
incubator/servicemix/trunk/etc/project.properties
incubator/servicemix/trunk/pom.xml
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-bpe/project.xml
incubator/servicemix/trunk/servicemix-components/pom.xml
incubator/servicemix/trunk/servicemix-components/project.xml
incubator/servicemix/trunk/servicemix-core/project.xml
incubator/servicemix/trunk/servicemix-http/pom.xml
incubator/servicemix/trunk/servicemix-http/project.xml
incubator/servicemix/trunk/servicemix-jsr181/pom.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=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/project.properties (original)
+++ incubator/servicemix/trunk/etc/project.properties Mon Feb 27 08:25:37 2006
@@ -232,7 +232,7 @@
# http://openejb.codehaus.org/, (Used in Geronimo) - BSD
openejb_core_version=2.0
# http://jetty.mortbay.org/, ASL 2
-jetty_version=6.0.0beta9
+jetty_version=6.0.0beta10
# http://incubator.apache.org/ode
ode_bpe_version=1.0-20060224-patched
# http://jakarta.apache.org/oro/, ASL 2
@@ -279,14 +279,13 @@
# http://www.xbean.org/, ASL 2
xbean_version=2.2
# http://xfire.codehaus.org/, http://xfire.codehaus.org/License - BSD
-xfire_version=1.0-20060222
-#xfire_jaxws_version=1.0-20060106
-# from ws-commons ?
-xfire_xmlschema_version=20051110
+xfire_version=1.0
# ?
xml_apis_version=1.3.02
# http://xmlbeans.apache.org/, ASL 2
xmlbeans_version=2.0.0
+# http://ws.apache.org/commons/XmlSchema/, ASL 2
+xmlschema_version=1.0
# http://xstream.codehaus.org/, http://xstream.codehaus.org/license.html, BSD, (Used in Geronimo)
xstream_version=1.1.2
#BSD
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/pom.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Mon Feb 27 08:25:37 2006
@@ -377,7 +377,7 @@
<dependency>
<groupId>org.apache.db.ddlutils</groupId>
<artifactId>ddlutils</artifactId>
- <version>1.0-20060216</version>
+ <version>1.0-20060223</version>
<exclusions>
<exclusion>
<groupId>dom4j</groupId>
@@ -1033,9 +1033,9 @@
<version>1.1.2</version>
</dependency>
<dependency>
- <groupId>jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.0.0beta9</version>
+ <version>6.0.0beta10</version>
</dependency>
<dependency>
<groupId>jgroups</groupId>
@@ -1378,14 +1378,9 @@
<version>20051114</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.dependencies</groupId>
+ <groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-all</artifactId>
- <version>1.0-20060106</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.dependencies</groupId>
- <artifactId>xfire-jaxws</artifactId>
- <version>1.0-20060106</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
@@ -1428,9 +1423,9 @@
<version>1.0-alpha-2</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.dependencies</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
- <version>20060108</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>lucene</groupId>
Modified: incubator/servicemix/trunk/servicemix-assembly/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/project.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/project.xml Mon Feb 27 08:25:37 2006
@@ -459,7 +459,7 @@
<!-- optional used for in-web container testing -->
<dependency>
- <groupId>jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty_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=381373&r1=381372&r2=381373&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 Mon Feb 27 08:25:37 2006
@@ -29,7 +29,7 @@
geronimo_spec_jms_version=1.0
activemq_version=4.0-SNAPSHOT
commons_logging_version=1.0.4
-jetty_version=6.0.0beta9
+jetty_version=6.0.0beta10
spring_version=1.2.6
xbean_version=2.2
jencks_version=1.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=381373&r1=381372&r2=381373&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 Mon Feb 27 08:25:37 2006
@@ -109,7 +109,7 @@
</dependency>
<dependency>
- <groupId>jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty_version}</version>
<properties>
Modified: incubator/servicemix/trunk/servicemix-bpe/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-bpe/project.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-bpe/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-bpe/project.xml Mon Feb 27 08:25:37 2006
@@ -246,9 +246,9 @@
<version>${mx4j_version}</version>
</dependency>
<dependency>
- <groupId>xfire</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
- <version>${xfire_xmlschema_version}</version>
+ <version>${xmlschema_version}</version>
</dependency>
<!-- Testing only -->
@@ -296,7 +296,7 @@
<version>${stax_utils_version}</version>
</dependency>
<dependency>
- <groupId>jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty_version}</version>
</dependency>
Modified: incubator/servicemix/trunk/servicemix-components/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/pom.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/pom.xml Mon Feb 27 08:25:37 2006
@@ -55,7 +55,7 @@
<artifactId>commons-pool</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.dependencies</groupId>
+ <groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-all</artifactId>
</dependency>
<dependency>
@@ -110,7 +110,7 @@
<artifactId>rome</artifactId>
</dependency>
<dependency>
- <groupId>jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
<dependency>
Modified: incubator/servicemix/trunk/servicemix-components/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/project.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/project.xml Mon Feb 27 08:25:37 2006
@@ -490,7 +490,7 @@
<!-- optional used for in-web container testing -->
<dependency>
- <groupId>jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty_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=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/project.xml Mon Feb 27 08:25:37 2006
@@ -280,7 +280,7 @@
<!-- optional used for in-web container testing -->
<dependency>
- <groupId>jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty_version}</version>
</dependency>
Modified: incubator/servicemix/trunk/servicemix-http/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/pom.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/pom.xml Mon Feb 27 08:25:37 2006
@@ -62,7 +62,7 @@
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
- <groupId>jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
<dependency>
Modified: incubator/servicemix/trunk/servicemix-http/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/project.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/project.xml Mon Feb 27 08:25:37 2006
@@ -90,7 +90,7 @@
</properties>
</dependency>
<dependency>
- <groupId>jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty_version}</version>
<properties>
Modified: incubator/servicemix/trunk/servicemix-jsr181/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/pom.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/pom.xml Mon Feb 27 08:25:37 2006
@@ -46,14 +46,10 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.dependencies</groupId>
+ <groupId>org.codehaus.xfire</groupId>
<artifactId>xfire-all</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.dependencies</groupId>
- <artifactId>xfire-jaxws</artifactId>
- </dependency>
- <dependency>
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
</dependency>
@@ -72,7 +68,7 @@
<artifactId>wsm</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.dependencies</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
</dependency>
<dependency>
Modified: incubator/servicemix/trunk/servicemix-jsr181/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/project.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/project.xml Mon Feb 27 08:25:37 2006
@@ -216,9 +216,9 @@
<version>${mx4j_version}</version>
</dependency>
<dependency>
- <groupId>xfire</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
- <version>${xfire_xmlschema_version}</version>
+ <version>${xmlschema_version}</version>
</dependency>
<!-- Testing only -->
Modified: incubator/servicemix/trunk/servicemix-lwcontainer/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-lwcontainer/project.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/project.xml Mon Feb 27 08:25:37 2006
@@ -149,9 +149,9 @@
<version>${mx4j_version}</version>
</dependency>
<dependency>
- <groupId>xfire</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
- <version>${xfire_xmlschema_version}</version>
+ <version>${xmlschema_version}</version>
</dependency>
Modified: incubator/servicemix/trunk/servicemix-sca/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/project.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/project.xml Mon Feb 27 08:25:37 2006
@@ -247,9 +247,9 @@
<version>${mx4j_version}</version>
</dependency>
<dependency>
- <groupId>xfire</groupId>
+ <groupId>org.apache.ws.commons</groupId>
<artifactId>XmlSchema</artifactId>
- <version>${xfire_xmlschema_version}</version>
+ <version>${xmlschema_version}</version>
</dependency>
<!-- Testing only -->
Modified: incubator/servicemix/trunk/servicemix-wsn2005/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/project.xml?rev=381373&r1=381372&r2=381373&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/project.xml Mon Feb 27 08:25:37 2006
@@ -211,7 +211,7 @@
<version>${wsdl4j_version}</version>
</dependency>
<dependency>
- <groupId>jetty</groupId>
+ <groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty_version}</version>
</dependency>