You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/09/13 20:43:49 UTC
[38/50] [abbrv] git commit: remove bcprov-jdk14
remove bcprov-jdk14
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/29df8d8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/29df8d8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/29df8d8b
Branch: refs/heads/javelin
Commit: 29df8d8b8e55982e7cd4934988d531bb7bf6e549
Parents: fbdd65f
Author: Edison Su <su...@gmail.com>
Authored: Wed Sep 12 13:43:26 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Wed Sep 12 13:46:12 2012 -0700
----------------------------------------------------------------------
awsapi/pom.xml | 12 ++++++++++++
debian/cloud-deps.install | 2 +-
2 files changed, 13 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/29df8d8b/awsapi/pom.xml
----------------------------------------------------------------------
diff --git a/awsapi/pom.xml b/awsapi/pom.xml
index 4ead0cd..a583384 100644
--- a/awsapi/pom.xml
+++ b/awsapi/pom.xml
@@ -95,12 +95,24 @@
<artifactId>rahas</artifactId>
<version>1.5</version>
<type>mar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
<version>1.5</version>
<type>mar</type>
+ <exclusions>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/29df8d8b/debian/cloud-deps.install
----------------------------------------------------------------------
diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install
index 11064d6..976102f 100644
--- a/debian/cloud-deps.install
+++ b/debian/cloud-deps.install
@@ -26,7 +26,7 @@
/usr/share/java/jstl-1.2.jar
/usr/share/java/axis2-1.5.1.jar
/usr/share/java/wsdl4j-1.6.2.jar
-/usr/share/java/bcprov-jdk16-1.46.jar
+/usr/share/java/bcprov-*.jar
/usr/share/java/jasypt-1.*.jar
/usr/share/java/ejb-api-3.0.jar
/usr/share/java/javax.persistence-2.0.0.jar