You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/10/11 21:43:10 UTC
svn commit: r583933 - in /incubator/cxf/trunk: integration/jbi/pom.xml
parent/pom.xml rt/bindings/jbi/pom.xml rt/transports/jbi/pom.xml
systests/pom.xml
Author: dkulp
Date: Thu Oct 11 12:43:09 2007
New Revision: 583933
URL: http://svn.apache.org/viewvc?rev=583933&view=rev
Log:
Upgrade to ServiceMix 3.1.2 (non-incubator version!) and remove references to incubator repository since its now not-needed.
Modified:
incubator/cxf/trunk/integration/jbi/pom.xml
incubator/cxf/trunk/parent/pom.xml
incubator/cxf/trunk/rt/bindings/jbi/pom.xml
incubator/cxf/trunk/rt/transports/jbi/pom.xml
incubator/cxf/trunk/systests/pom.xml
Modified: incubator/cxf/trunk/integration/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/pom.xml?rev=583933&r1=583932&r2=583933&view=diff
==============================================================================
--- incubator/cxf/trunk/integration/jbi/pom.xml (original)
+++ incubator/cxf/trunk/integration/jbi/pom.xml Thu Oct 11 12:43:09 2007
@@ -56,60 +56,38 @@
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-jbi</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jbi</artifactId>
<version>${project.version}</version>
</dependency>
-
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
-
-
-
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jbi</artifactId>
- <version>${servicemix.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>servicemix</groupId>
- <artifactId>jaxp</artifactId>
- </exclusion>
- <exclusion>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-
-
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${project.version}</version>
</dependency>
-
-
-
</dependencies>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/cxf/trunk/integration/jbi</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/cxf/trunk/integration/jbi</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-integration-jbi</url>
+ <url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-integration-jbi</url>
</scm>
</project>
Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=583933&r1=583932&r2=583933&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Thu Oct 11 12:43:09 2007
@@ -61,7 +61,7 @@
<spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
<downloadSources>true</downloadSources>
- <servicemix.version>3.1-incubating</servicemix.version>
+ <servicemix.version>3.1.2</servicemix.version>
</properties>
@@ -128,7 +128,7 @@
<version>1.1</version>
<dependencies>
<dependency>
- <groupId>org.apache.cxf</groupId>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-dv</artifactId>
<version>${project.version}</version>
</dependency>
@@ -358,6 +358,23 @@
<groupId>ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.6.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-jbi</artifactId>
+ <version>${servicemix.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxp</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: incubator/cxf/trunk/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/jbi/pom.xml?rev=583933&r1=583932&r2=583933&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/bindings/jbi/pom.xml (original)
+++ incubator/cxf/trunk/rt/bindings/jbi/pom.xml Thu Oct 11 12:43:09 2007
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jbi</artifactId>
- <version>${servicemix.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -118,10 +118,4 @@
<url>http://svn.apache.org/viewvc/incubator/cxf/trunk/cxf-parent/cxf-rt-bindings-jbi</url>
</scm>
- <repositories>
- <repository>
- <id>apache-incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
</project>
Modified: incubator/cxf/trunk/rt/transports/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/jbi/pom.xml?rev=583933&r1=583932&r2=583933&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/jbi/pom.xml (original)
+++ incubator/cxf/trunk/rt/transports/jbi/pom.xml Thu Oct 11 12:43:09 2007
@@ -63,10 +63,8 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-jbi</artifactId>
- <version>${servicemix.version}</version>
+ <scope>provided</scope>
</dependency>
-
-
</dependencies>
<build>
Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?rev=583933&r1=583932&r2=583933&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Thu Oct 11 12:43:09 2007
@@ -51,8 +51,8 @@
<wsdlOption>
<wsdl>${basedir}/src/test/resources/wsdl/pizza_service.wsdl</wsdl>
<extraargs>
- <extraarg>-exsh</extraarg>
- <extraarg>true</extraarg>
+ <extraarg>-exsh</extraarg>
+ <extraarg>true</extraarg>
</extraargs>
</wsdlOption>
@@ -60,9 +60,9 @@
<wsdl>${basedir}/src/test/resources/wsdl/cxf-993.wsdl</wsdl>
</wsdlOption>
- <wsdlOption>
- <wsdl>${basedir}/src/test/resources/wsdl/mtom.wsdl</wsdl>
- </wsdlOption>
+ <wsdlOption>
+ <wsdl>${basedir}/src/test/resources/wsdl/mtom.wsdl</wsdl>
+ </wsdlOption>
</wsdlOptions>
</configuration>
@@ -396,12 +396,5 @@
<properties>
<surefire.fork.mode>pertest</surefire.fork.mode>
</properties>
-
- <repositories>
- <repository>
- <id>apache-incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
</project>