You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/07/19 21:31:37 UTC

svn commit: r965595 - /james/server/trunk/pom.xml

Author: norman
Date: Mon Jul 19 19:31:37 2010
New Revision: 965595

URL: http://svn.apache.org/viewvc?rev=965595&view=rev
Log:
Upgrade to bouncycastle jdk1.5 1.45 (JAMES-1028)

Modified:
    james/server/trunk/pom.xml

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=965595&r1=965594&r2=965595&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Jul 19 19:31:37 2010
@@ -565,22 +565,10 @@
 
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcmail-jdk14</artifactId>
-      <version>129</version>
+      <artifactId>bcmail-jdk15</artifactId>
+      <version>1.45</version>
     </dependency>
     <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcmail-jdk14-workaround</artifactId>
-      <version>129</version>
-    </dependency>
-    <!-- TODO test the updated version
-    <dependency>
-      <groupId>bouncycastle</groupId>
-      <artifactId>bcmail-jdk14</artifactId>
-      <version>136</version>
-    </dependency>
-     -->
-    <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-jspf</artifactId>
       <version>0.9.5</version>
@@ -656,12 +644,12 @@
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging-api</artifactId>
-      <version>1.1</version>
+      <version>${commons.logging.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.1</version>
+      <version>${commons.logging.version}</version>
       <exclusions>
         <exclusion>
           <artifactId>logkit</artifactId>
@@ -966,18 +954,18 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-rmi</artifactId>
-      <version>2.1.0</version>
+      <version>${jackrabbit.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>2.1.0</version>
+      <version>${jackrabbit.version}</version>
     </dependency>
 	<dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>2.1.0</version>
+      <version>${jackrabbit.version}</version>
     </dependency>
    
     <dependency>
@@ -1115,6 +1103,8 @@
     <imap.version>0.1-M2-SNAPSHOT</imap.version>
     <protocols.version>1.1</protocols.version>
     <jsieve.version>0.4</jsieve.version>
+    <jackrabbit.version>2.1.0</jackrabbit.version>
+    <commons.logging.version>1.1</commons.logging.version>
 
   </properties>
 



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