Author: davsclaus
Date: Fri Jan 4 11:38:59 2013
New Revision: 1428800
URL: http://svn.apache.org/viewvc?rev=1428800&view=rev
Log:
Upgraded to bouncycastle 1.47
Modified:
camel/trunk/components/camel-crypto/pom.xml
camel/trunk/components/camel-ftp/pom.xml
camel/trunk/components/camel-jsch/pom.xml
camel/trunk/components/camel-ssh/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-crypto/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/pom.xml?rev=1428800&r1=1428799&r2=1428800&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/pom.xml (original)
+++ camel/trunk/components/camel-crypto/pom.xml Fri Jan 4 11:38:59 2013
@@ -54,12 +54,12 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk16</artifactId>
+ <artifactId>bcpg-jdk15on</artifactId>
<version>${bouncycastle-version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
+ <artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle-version}</version>
</dependency>
<dependency>
Modified: camel/trunk/components/camel-ftp/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/pom.xml?rev=1428800&r1=1428799&r2=1428800&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/pom.xml (original)
+++ camel/trunk/components/camel-ftp/pom.xml Fri Jan 4 11:38:59 2013
@@ -94,7 +94,13 @@
<!-- needed for sftp server -->
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk16</artifactId>
+ <artifactId>bcpg-jdk15on</artifactId>
+ <version>${bouncycastle-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncycastle-version}</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-jsch/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/pom.xml?rev=1428800&r1=1428799&r2=1428800&view=diff
==============================================================================
--- camel/trunk/components/camel-jsch/pom.xml (original)
+++ camel/trunk/components/camel-jsch/pom.xml Fri Jan 4 11:38:59 2013
@@ -79,7 +79,13 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bouncycastle-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncycastle-version}</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-ssh/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ssh/pom.xml?rev=1428800&r1=1428799&r2=1428800&view=diff
==============================================================================
--- camel/trunk/components/camel-ssh/pom.xml (original)
+++ camel/trunk/components/camel-ssh/pom.xml Fri Jan 4 11:38:59 2013
@@ -57,7 +57,13 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcpg-jdk16</artifactId>
+ <artifactId>bcpg-jdk15on</artifactId>
+ <version>${bouncycastle-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
<version>${bouncycastle-version}</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1428800&r1=1428799&r2=1428800&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Jan 4 11:38:59 2013
@@ -61,10 +61,10 @@
<!--we must use axiom 1.2.10 with abdera 1.1.2, CAMEL-5109 has more
details-->
<axiom-version>1.2.10</axiom-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>
- <bcpg-jdk16-bundle-version>1.46_2</bcpg-jdk16-bundle-version>
+ <bcpg-jdk15on-bundle-version>1.47_1</bcpg-jdk15on-bundle-version>
<beanio-version>2.0.2</beanio-version>
<bsh-version>2.0b5</bsh-version>
- <bouncycastle-version>1.46</bouncycastle-version>
+ <bouncycastle-version>1.47</bouncycastle-version>
<castor-bundle-version>1.3.1_2</castor-bundle-version>
<cglib-bundle-version>2.1_3_7</cglib-bundle-version>
<cglib-version>2.2</cglib-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1428800&r1=1428799&r2=1428800&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri
Jan 4 11:38:59 2013
@@ -114,7 +114,7 @@
<feature version='${project.version}'>camel-core</feature>
<bundle
dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle
dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcpg-jdk16/${bcpg-jdk16-bundle-version}</bundle>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcpg-jdk15on/${bcpg-jdk15on-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-crypto/${project.version}</bundle>
</feature>
<feature name='camel-http' version='${project.version}' resolver='(obr)'
start-level='50'>
