You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2011/09/01 09:44:55 UTC
svn commit: r1163927 - in /servicemix/smx4/features/trunk:
assembly/src/main/filtered-resources/features.xml
examples/itests/tests/pom.xml
examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
pom.xml
Author: ffang
Date: Thu Sep 1 07:44:55 2011
New Revision: 1163927
URL: http://svn.apache.org/viewvc?rev=1163927&view=rev
Log:
[SMX4-906]upgrade xmlsec and opensaml bundle version
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=1163927&r1=1163926&r2=1163927&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Thu Sep 1 07:44:55 2011
@@ -56,6 +56,7 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${opensaml.bundle.version}</bundle>
<bundle>mvn:org.apache.ws.security/wss4j/${wss4j.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans.bundle.version}</bundle>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=1163927&r1=1163926&r2=1163927&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Thu Sep 1 07:44:55 2011
@@ -443,6 +443,10 @@
<artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.joda-time</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1163927&r1=1163926&r2=1163927&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java Thu Sep 1 07:44:55 2011
@@ -97,6 +97,7 @@ public class IntegrationTest extends Abs
//for ws-security
getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.opensaml"),
+ getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.joda-time"),
getBundle("org.apache.ws.security", "wss4j"),
getBundle("org.apache.servicemix.specs", "org.apache.servicemix.specs.jbi-api-1.0"),
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1163927&r1=1163926&r2=1163927&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Thu Sep 1 07:44:55 2011
@@ -164,7 +164,8 @@
<josql.bundle.version>1.5_4</josql.bundle.version>
<jsmpp.bundle.version>2.1.0_2</jsmpp.bundle.version>
<mvel.bundle.version>2.0.8_4</mvel.bundle.version>
- <opensaml.bundle.version>1.1_5</opensaml.bundle.version>
+ <opensaml.bundle.version>2.4.1_1</opensaml.bundle.version>
+ <jodatime.bundle.version>1.5.2_2</jodatime.bundle.version>
<oscore.bundle.version>2.2.4_4</oscore.bundle.version>
<osworkflow.bundle.version>2.7.0_4</osworkflow.bundle.version>
<oro.bundle.version>2.0.8_4</oro.bundle.version>
@@ -180,7 +181,7 @@
<xerces.bundle.version>2.9.1_4</xerces.bundle.version>
<xmlbeans.bundle.version>2.5.0_1</xmlbeans.bundle.version>
<xmlresolver.bundle.version>1.2_3</xmlresolver.bundle.version>
- <xmlsec.bundle.version>1.4.4_1</xmlsec.bundle.version>
+ <xmlsec.bundle.version>1.4.5_1</xmlsec.bundle.version>
<!-- ServiceMix legal shared resources -->
<servicemix.legal.version>1.0</servicemix.legal.version>
@@ -451,6 +452,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.joda-time</artifactId>
+ <version>${jodatime.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
<version>${opensaml.bundle.version}</version>
</dependency>