cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: remove bcprov-jdk14
Date Wed, 12 Sep 2012 20:45:54 GMT
Updated Branches:
  refs/heads/4.0 2f10c636e -> e966259f4


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/e966259f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e966259f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e966259f

Branch: refs/heads/4.0
Commit: e966259f41ece2c245369ff7efa237ff5d34aee3
Parents: 2f10c63
Author: Edison Su <sudison@gmail.com>
Authored: Wed Sep 12 13:43:26 2012 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Wed Sep 12 13:43:26 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/e966259f/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/e966259f/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


Mime
View raw message