You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/04/07 17:48:37 UTC
[09/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442
bcprov versions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6cb4e3dc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6cb4e3dc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6cb4e3dc
Branch: refs/heads/4.9-mvn-upgrade
Commit: 6cb4e3dc6ae061fe2e69b5506a9c547533ff3ba3
Parents: f845bb4
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Feb 3 11:27:06 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 7 21:18:01 2016 +0530
----------------------------------------------------------------------
pom.xml | 10 ++--------
services/console-proxy-rdp/rdpconsole/pom.xml | 1 +
utils/pom.xml | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cb4e3dc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fb62258..3b78e99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<!-- do not forget to also upgrade hamcrest library with junit -->
<cs.junit.version>4.12</cs.junit.version>
<cs.hamcrest.version>1.3</cs.hamcrest.version>
- <cs.bcprov.version>1.46</cs.bcprov.version>
+ <cs.bcprov.version>1.54</cs.bcprov.version>
<cs.jsch.version>0.1.53</cs.jsch.version>
<cs.jpa.version>2.1.1</cs.jpa.version>
<cs.jasypt.version>1.9.2</cs.jasypt.version>
@@ -116,7 +116,6 @@
<cs.xml-apis.version>1.4.01</cs.xml-apis.version>
<cs.joda-time.version>2.8.1</cs.joda-time.version>
<cs.batik.version>1.8</cs.batik.version>
- <cs.bcprov-jdk15on.version>1.54</cs.bcprov-jdk15on.version>
<cs.servicemix.version>2.3.4_1</cs.servicemix.version>
<cs.jetty.version>9.3.7.v20160115</cs.jetty.version>
<cs.cxf.version>3.1.4</cs.cxf.version>
@@ -239,7 +238,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>${cs.bcprov-jdk15on.version}</version>
+ <version>${cs.bcprov.version}</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
@@ -319,11 +318,6 @@
<version>${cs.commons-validator.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- <version>${cs.bcprov.version}</version>
- </dependency>
- <dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>${cs.jsch.version}</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cb4e3dc/services/console-proxy-rdp/rdpconsole/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml
index a27f2eb..628d039 100755
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -77,6 +77,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
+ <version>1.46</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cb4e3dc/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 93d7d01..206eb18 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
+ <artifactId>bcprov-jdk15on</artifactId>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>