Author: bblfish
Date: Wed Apr 6 22:20:42 2011
New Revision: 1089649
URL: http://svn.apache.org/viewvc?rev=1089649&view=rev
Log:
CLEREZZA-480: bouncycastle is now OSGi enabled.
Modified:
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
incubator/clerezza/trunk/parent/pom.xml
incubator/clerezza/trunk/parent/ssl.keygen/base/pom.xml
Modified:
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml?rev=1089649&r1=1089648&r2=1089649&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
(original)
+++
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
Wed Apr 6 22:20:42 2011
@@ -575,5 +575,11 @@
<artifactId>permissiondescriptions</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk16</artifactId>
+ <scope>runtime</scope>
+ <version>1.46</version>
+ </dependency>
</dependencies>
</project>
Modified: incubator/clerezza/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/pom.xml?rev=1089649&r1=1089648&r2=1089649&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/pom.xml (original)
+++ incubator/clerezza/trunk/parent/pom.xml Wed Apr 6 22:20:42 2011
@@ -1218,6 +1218,11 @@
<artifactId>java-rdfa-htmlparser</artifactId>
<version>0.4.2-RC2</version>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk16</artifactId>
+ <version>1.46</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<distributionManagement>
Modified: incubator/clerezza/trunk/parent/ssl.keygen/base/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/ssl.keygen/base/pom.xml?rev=1089649&r1=1089648&r2=1089649&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/ssl.keygen/base/pom.xml (original)
+++ incubator/clerezza/trunk/parent/ssl.keygen/base/pom.xml Wed Apr 6 22:20:42
2011
@@ -14,10 +14,10 @@
<name>Clerezza - FOAF+SSL Keygen :: Base Component</name>
<build>
<plugins>
- <plugin>
- <!-- this plugin is needed because bouncycastle is not
available
- as an OSGI module. Please vote to make it so by going to
- http://www.bouncycastle.org/jira/browse/BJA-287 -->
+ <!--plugin>
+ this plugin was needed because bouncycastle was not available
+ as an OSGI module. This has now been closed. Keeping this test as
it can be useful for other
+ http://www.bouncycastle.org/jira/browse/BJA-287
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -28,7 +28,7 @@
<Export-Package>!junit,org.apache.clerezza.ssl.keygen.*</Export-Package>
</instructions>
</configuration>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -62,12 +62,11 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- <version>1.45</version>
- <scope>compile</scope>
- </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk16</artifactId>
+ <version>1.46</version>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
