Author: rdonkin
Date: Tue May 26 11:27:40 2009
New Revision: 778656

URL: http://svn.apache.org/viewvc?rev=778656&view=rev
Log:
MAILETCRYPTO-6 Upgrade to latest BC version. 
https://issues.apache.org/jira/browse/MAILETCRYPTO-6

Added:
    james/mailet/crypto/trunk/stage/org.bouncycastle/jars/bcmail-jdk15-143.jar  
 (with props)
    james/mailet/crypto/trunk/stage/org.bouncycastle/jars/bcprov-jdk15-143.jar  
 (with props)
Removed:
    james/mailet/crypto/trunk/stage/org.bouncycastle/jars/bcmail-jdk14-129.jar
    
james/mailet/crypto/trunk/stage/org.bouncycastle/jars/bcmail-jdk14-workaround-129.jar
Modified:
    james/mailet/crypto/trunk/build.xml
    james/mailet/crypto/trunk/default.properties
    james/mailet/crypto/trunk/include.properties
    james/mailet/crypto/trunk/pom.xml

Modified: james/mailet/crypto/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/james/mailet/crypto/trunk/build.xml?rev=778656&r1=778655&r2=778656&view=diff
==============================================================================
--- james/mailet/crypto/trunk/build.xml (original)
+++ james/mailet/crypto/trunk/build.xml Tue May 26 11:27:40 2009
@@ -39,9 +39,9 @@
         <pathelement path="${javax-mail.jar}"/>
         <pathelement path="${javax-activation.jar}"/>
         <pathelement path="${mailet.jar}"/>
-        <pathelement path="${mailet-base.jar}"/>
-        <pathelement path="${bc-workaround.jar}"/>
+        <pathelement path="${mailet-base.jar}"/>
         <pathelement path="${bc.jar}"/>
+        <pathelement path="${bc-prov.jar}"/>
         <pathelement path="${java.class.path}" />
         <pathelement path="${build.classes}" />
     </path>

Modified: james/mailet/crypto/trunk/default.properties
URL: 
http://svn.apache.org/viewvc/james/mailet/crypto/trunk/default.properties?rev=778656&r1=778655&r2=778656&view=diff
==============================================================================
--- james/mailet/crypto/trunk/default.properties (original)
+++ james/mailet/crypto/trunk/default.properties Tue May 26 11:27:40 2009
@@ -29,7 +29,7 @@
 project=apache-james
 name=crypto-mailets
 Name=Cryptography Mailets
-version=1.0-SNAPSHOT
+version=1.1-SNAPSHOT
 manifestVersion=3.0
 year=2009
 extension.name=org.apache.james
@@ -45,8 +45,8 @@
 # javac task to run without this}
 
 build.compiler = modern
-jdk.source = 1.4
-jdk.target = 1.4
+jdk.target = 1.5
+jdk.source = 1.5
 
 #
 # compiler switches

Modified: james/mailet/crypto/trunk/include.properties
URL: 
http://svn.apache.org/viewvc/james/mailet/crypto/trunk/include.properties?rev=778656&r1=778655&r2=778656&view=diff
==============================================================================
--- james/mailet/crypto/trunk/include.properties (original)
+++ james/mailet/crypto/trunk/include.properties Tue May 26 11:27:40 2009
@@ -53,8 +53,8 @@
 mailet-base.jar=stage/org.apache.james/jars/apache-mailet-base-1.0.jar 
 
 # ----- Bouncy Castle -----
-bc-workaround.jar=stage/org.bouncycastle/jars/bcmail-jdk14-workaround-129.jar
-bc.jar=stage/org.bouncycastle/jars/bcmail-jdk14-129.jar
+bc.jar=stage/org.bouncycastle/jars/bcmail-jdk15-143.jar
+bc-prov.jar=stage/org.bouncycastle/jars/bcprov-jdk15-143.jar
 
 # ----- JUnit ------
 junit.jar=stage/junit/jars/junit-3.8.1.jar

Modified: james/mailet/crypto/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/mailet/crypto/trunk/pom.xml?rev=778656&r1=778655&r2=778656&view=diff
==============================================================================
--- james/mailet/crypto/trunk/pom.xml (original)
+++ james/mailet/crypto/trunk/pom.xml Tue May 26 11:27:40 2009
@@ -62,6 +62,7 @@
     <james.www.id>crypto-mailet-website</james.www.id>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      <target.jdk>1.5</target.jdk>
+     <version.bc>143</version.bc>
   </properties>
 
   <distributionManagement>
@@ -90,13 +91,13 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcmail-jdk14</artifactId>
-      <version>129</version>
+      <artifactId>bcmail-jdk15</artifactId>
+      <version>${version.bc}</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcmail-jdk14-workaround</artifactId>
-      <version>129</version>
+      <artifactId>bcprov-jdk15</artifactId>
+      <version>${version.bc}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Added: 
james/mailet/crypto/trunk/stage/org.bouncycastle/jars/bcmail-jdk15-143.jar
URL: 
http://svn.apache.org/viewvc/james/mailet/crypto/trunk/stage/org.bouncycastle/jars/bcmail-jdk15-143.jar?rev=778656&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
james/mailet/crypto/trunk/stage/org.bouncycastle/jars/bcmail-jdk15-143.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: 
james/mailet/crypto/trunk/stage/org.bouncycastle/jars/bcprov-jdk15-143.jar
URL: 
http://svn.apache.org/viewvc/james/mailet/crypto/trunk/stage/org.bouncycastle/jars/bcprov-jdk15-143.jar?rev=778656&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
james/mailet/crypto/trunk/stage/org.bouncycastle/jars/bcprov-jdk15-143.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to