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 2009/08/28 03:01:22 UTC
svn commit: r808709 - in /servicemix/smx3/branches/servicemix-3.2: ./
common/servicemix-soap/ common/servicemix-soap2/
deployables/bindingcomponents/servicemix-cxf-bc/
deployables/bindingcomponents/servicemix-ftp/
deployables/bindingcomponents/servicem...
Author: ffang
Date: Fri Aug 28 01:01:22 2009
New Revision: 808709
URL: http://svn.apache.org/viewvc?rev=808709&view=rev
Log:
[SM-1877]should ship only one bcprov version in the kit
Modified:
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/pom.xml
servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap2/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-osworkflow/pom.xml
servicemix/smx3/branches/servicemix-3.2/pom.xml
Modified: servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/pom.xml?rev=808709&r1=808708&r2=808709&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap/pom.xml Fri Aug 28 01:01:22 2009
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
+ <artifactId>bcprov-jdk15</artifactId>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
Modified: servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap2/pom.xml?rev=808709&r1=808708&r2=808709&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap2/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/common/servicemix-soap2/pom.xml Fri Aug 28 01:01:22 2009
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
+ <artifactId>bcprov-jdk15</artifactId>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml?rev=808709&r1=808708&r2=808709&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-cxf-bc/pom.xml Fri Aug 28 01:01:22 2009
@@ -90,6 +90,12 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>${cxf-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -262,7 +268,7 @@
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
+ <artifactId>bcprov-jdk15</artifactId>
<version>${bcprov-version}</version>
<scope>provided</scope>
</dependency>
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/pom.xml?rev=808709&r1=808708&r2=808709&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-ftp/pom.xml Fri Aug 28 01:01:22 2009
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
+ <artifactId>bcprov-jdk15</artifactId>
<version>${bcprov-version}</version>
<scope>provided</scope>
</dependency>
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml?rev=808709&r1=808708&r2=808709&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/bindingcomponents/servicemix-jms/pom.xml Fri Aug 28 01:01:22 2009
@@ -182,7 +182,7 @@
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
+ <artifactId>bcprov-jdk15</artifactId>
<version>${bcprov-version}</version>
<scope>provided</scope>
</dependency>
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-osworkflow/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-osworkflow/pom.xml?rev=808709&r1=808708&r2=808709&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-osworkflow/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-osworkflow/pom.xml Fri Aug 28 01:01:22 2009
@@ -91,7 +91,7 @@
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
+ <artifactId>bcprov-jdk15</artifactId>
<version>${bcprov-version}</version>
<scope>provided</scope>
</dependency>
Modified: servicemix/smx3/branches/servicemix-3.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/pom.xml?rev=808709&r1=808708&r2=808709&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/pom.xml (original)
+++ servicemix/smx3/branches/servicemix-3.2/pom.xml Fri Aug 28 01:01:22 2009
@@ -1906,8 +1906,8 @@
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>136</version>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>140</version>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>