You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ja...@apache.org on 2012/07/18 17:58:58 UTC
svn commit: r1362992 - in /servicemix/smx4/nmr/trunk:
features/src/main/resources/ jbi/itests/
jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ parent/
Author: janstey
Date: Wed Jul 18 15:58:57 2012
New Revision: 1362992
URL: http://svn.apache.org/viewvc?rev=1362992&view=rev
Log:
revert fix for SMX4NMR-295, will need to wait until we are using Karaf 2.3 or greater
Modified:
servicemix/smx4/nmr/trunk/features/src/main/resources/features.xml
servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
servicemix/smx4/nmr/trunk/parent/pom.xml
Modified: servicemix/smx4/nmr/trunk/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/features/src/main/resources/features.xml?rev=1362992&r1=1362991&r2=1362992&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/features/src/main/resources/features.xml (original)
+++ servicemix/smx4/nmr/trunk/features/src/main/resources/features.xml Wed Jul 18 15:58:57 2012
@@ -39,6 +39,7 @@
<bundle>mvn:org.apache.servicemix.nmr/org.apache.servicemix.nmr.audit/${pom.version}</bundle>
</feature>
<feature name="woodstox" version="${woodstox.version}" start-level='50'>
+ <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
<bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle>
<bundle>mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox.version}</bundle>
</feature>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=1362992&r1=1362991&r2=1362992&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Wed Jul 18 15:58:57 2012
@@ -219,6 +219,11 @@
<artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java?rev=1362992&r1=1362991&r2=1362992&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java Wed Jul 18 15:58:57 2012
@@ -296,6 +296,7 @@ public class IntegrationTest extends Abs
mavenBundle("org.codehaus.woodstox", "stax2-api"),
mavenBundle("org.codehaus.woodstox", "woodstox-core-asl"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
+ mavenBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.stax-api-1.0"),
mavenBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jbi-api-1.0"),
mavenBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.activation-api-1.1"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?rev=1362992&r1=1362991&r2=1362992&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java Wed Jul 18 15:58:57 2012
@@ -315,6 +315,7 @@ public class ManagementTest extends Abst
mavenBundle("org.codehaus.woodstox", "stax2-api"),
mavenBundle("org.codehaus.woodstox", "woodstox-core-asl"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.wsdl4j"),
+ mavenBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.stax-api-1.0"),
mavenBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jbi-api-1.0"),
mavenBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.activation-api-1.1"),
mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
Modified: servicemix/smx4/nmr/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/parent/pom.xml?rev=1362992&r1=1362991&r2=1362992&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/parent/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/parent/pom.xml Wed Jul 18 15:58:57 2012
@@ -872,6 +872,11 @@
<artifactId>org.apache.servicemix.specs.scripting-api-1.0</artifactId>
<version>${servicemix.specs.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>