You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/05/30 18:55:42 UTC
svn commit: r1487933 - in /webservices/wss4j/trunk: integration/pom.xml
parent/pom.xml pom.xml ws-security-common/pom.xml ws-security-dom/pom.xml
ws-security-stax/pom.xml
Author: coheigea
Date: Thu May 30 16:55:42 2013
New Revision: 1487933
URL: http://svn.apache.org/r1487933
Log:
Make BouncyCastle optional
Modified:
webservices/wss4j/trunk/integration/pom.xml
webservices/wss4j/trunk/parent/pom.xml
webservices/wss4j/trunk/pom.xml
webservices/wss4j/trunk/ws-security-common/pom.xml
webservices/wss4j/trunk/ws-security-dom/pom.xml
webservices/wss4j/trunk/ws-security-stax/pom.xml
Modified: webservices/wss4j/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/integration/pom.xml?rev=1487933&r1=1487932&r2=1487933&view=diff
==============================================================================
--- webservices/wss4j/trunk/integration/pom.xml (original)
+++ webservices/wss4j/trunk/integration/pom.xml Thu May 30 16:55:42 2013
@@ -187,5 +187,10 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: webservices/wss4j/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/parent/pom.xml?rev=1487933&r1=1487932&r2=1487933&view=diff
==============================================================================
--- webservices/wss4j/trunk/parent/pom.xml (original)
+++ webservices/wss4j/trunk/parent/pom.xml Thu May 30 16:55:42 2013
@@ -36,6 +36,7 @@
<url>http://ws.apache.org/wss4j/</url>
<properties>
+ <bcprov.version>1.47</bcprov.version>
<ehcache.version>2.5.1</ehcache.version>
<log4j.version>1.2.17</log4j.version>
<neethi.version>3.0.2</neethi.version>
@@ -65,6 +66,11 @@
<version>${xmlsec.version}</version>
</dependency>
<dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${bcprov.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
<version>${neethi.version}</version>
Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1487933&r1=1487932&r2=1487933&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Thu May 30 16:55:42 2013
@@ -101,7 +101,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<targetJdk>1.6</targetJdk>
- <bcprov.version>1.47</bcprov.version>
</properties>
<modules>
@@ -294,20 +293,6 @@
<profiles>
<profile>
- <id>jdk16</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>[1.5,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15on</artifactId>
- <version>${bcprov.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>fastinstall</id>
<properties>
<maven.test.skip>true</maven.test.skip>
Modified: webservices/wss4j/trunk/ws-security-common/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/pom.xml?rev=1487933&r1=1487932&r2=1487933&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-common/pom.xml Thu May 30 16:55:42 2013
@@ -297,6 +297,12 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: webservices/wss4j/trunk/ws-security-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/pom.xml?rev=1487933&r1=1487932&r2=1487933&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-dom/pom.xml Thu May 30 16:55:42 2013
@@ -240,6 +240,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<scope>provided</scope>
Modified: webservices/wss4j/trunk/ws-security-stax/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/pom.xml?rev=1487933&r1=1487932&r2=1487933&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/pom.xml (original)
+++ webservices/wss4j/trunk/ws-security-stax/pom.xml Thu May 30 16:55:42 2013
@@ -192,6 +192,11 @@
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>