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 2007/11/28 17:23:33 UTC
svn commit: r599054 - in /servicemix/branches/servicemix-4.0:
bundles/cxf/pom.xml itests/tests/pom.xml jbi/itests/pom.xml pom.xml
Author: gnodet
Date: Wed Nov 28 08:23:32 2007
New Revision: 599054
URL: http://svn.apache.org/viewvc?rev=599054&view=rev
Log:
Fix build a bit
Modified:
servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml
servicemix/branches/servicemix-4.0/itests/tests/pom.xml
servicemix/branches/servicemix-4.0/jbi/itests/pom.xml
servicemix/branches/servicemix-4.0/pom.xml
Modified: servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml?rev=599054&r1=599053&r2=599054&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml Wed Nov 28 08:23:32 2007
@@ -74,13 +74,6 @@
</servicemix.osgi.private.pkg>
</properties>
- <repositories>
- <repository>
- <id>apache-incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: servicemix/branches/servicemix-4.0/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/itests/tests/pom.xml?rev=599054&r1=599053&r2=599054&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/itests/tests/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/itests/tests/pom.xml Wed Nov 28 08:23:32 2007
@@ -523,27 +523,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <forkMode>pertest</forkMode>
+ <systemProperties>
+ <property>
+ <name>org.springframework.osgi.test.framework</name>
+ <value>${osgi.test.platform}</value>
+ </property>
+ </systemProperties>
</configuration>
- <executions>
- <execution>
- <id>default</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- <forkMode>pertest</forkMode>
- <systemProperties>
- <property>
- <name>org.springframework.osgi.test.framework</name>
- <value>${osgi.test.platform}</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: servicemix/branches/servicemix-4.0/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml?rev=599054&r1=599053&r2=599054&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/jbi/itests/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/jbi/itests/pom.xml Wed Nov 28 08:23:32 2007
@@ -260,7 +260,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>5.0-SNAPSHOT</version>
+ <version>${activemq.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -316,14 +316,14 @@
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-shared-compat</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>${servicemix3.version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-eip</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>${servicemix3.version}</version>
<classifier>installer</classifier>
<type>zip</type>
</artifactItem>
Modified: servicemix/branches/servicemix-4.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/pom.xml?rev=599054&r1=599053&r2=599054&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/pom.xml Wed Nov 28 08:23:32 2007
@@ -76,11 +76,12 @@
<cxf.version>2.0.3-incubator</cxf.version>
<xbean.version>3.3-SNAPSHOT</xbean.version>
<jaxb.api.version>2.0</jaxb.api.version>
- <jaxb.impl.version>2.0.5</jaxb.impl.version>
+ <jaxb.impl.version>2.0.3</jaxb.impl.version>
<jaxws.api.version>2.0</jaxws.api.version>
<openejb.version>3.0.0-SNAPSHOT</openejb.version>
<openjpa.version>1.0.1</openjpa.version>
<pax.logging.version>0.9.8-SNAPSHOT</pax.logging.version>
+ <servicemix3.version>3.2.1-SNAPSHOT</servicemix3.version>
</properties>
<repositories>
@@ -144,7 +145,7 @@
<enabled>true</enabled>
</snapshots>
</repository>
- <!-- Apache snapshot -->
+ <!-- OPS4J snapshot -->
<repository>
<id>ops4j-snapshots</id>
<name>OPS4J Snapshot repository</name>
@@ -170,16 +171,21 @@
</repository>
<!-- ServiceMix repo -->
<repository>
- <id>servicemix-snapshots</id>
+ <id>servicemix</id>
<name>ServiceMix Repository</name>
<url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
<releases>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
+ <!-- Apache Incubating repository -->
+ <repository>
+ <id>apache-incubator</id>
+ <url>http://people.apache.org/repo/m2-incubating-repository</url>
+ </repository>
</repositories>
<dependencyManagement>
@@ -202,7 +208,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.cxf</artifactId>
- <version>2.0.2-incubator-4.0-SNAPSHOT</version>
+ <version>${cxf.version}-4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -227,12 +233,12 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.openejb</artifactId>
- <version>3.0.0-SNAPSHOT-4.0-SNAPSHOT</version>
+ <version>${openejb.version}-4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.openjpa</artifactId>
- <version>1.0.0-4.0-SNAPSHOT</version>
+ <version>${openjpa.version}-4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
@@ -491,7 +497,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>3.1.2</version>
+ <version>${servicemix3.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -502,12 +508,12 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-eip</artifactId>
- <version>3.1.2</version>
+ <version>${servicemix3.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
- <version>3.1.2</version>
+ <version>${servicemix3.version}</version>
</dependency>
<dependency>
<groupId>org.jencks</groupId>