Updated to BouncyCastle 1.47

diff --git a/.classpath b/.classpath
index 30e6d4c37982abd1190c957cf17c8f9425071c8a..60409521ad35a9df8a4c054de0629f282dd28fb1 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -24,8 +24,9 @@
        <classpathentry kind="lib" path="ext/org.eclipse.jgit-2.1.0.201209190230-r.jar" sourcepath="ext/src/org.eclipse.jgit-2.1.0.201209190230-r-sources.jar" />
        <classpathentry kind="lib" path="ext/jsch-0.1.44-1.jar" sourcepath="ext/src/jsch-0.1.44-1-sources.jar" />
        <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-2.1.0.201209190230-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-2.1.0.201209190230-r-sources.jar" />
-       <classpathentry kind="lib" path="ext/bcprov-jdk16-1.46.jar" sourcepath="ext/src/bcprov-jdk16-1.46-sources.jar" />
-       <classpathentry kind="lib" path="ext/bcmail-jdk16-1.46.jar" sourcepath="ext/src/bcmail-jdk16-1.46-sources.jar" />
+       <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.47.jar" sourcepath="ext/src/bcprov-jdk15on-1.47-sources.jar" />
+       <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.47.jar" sourcepath="ext/src/bcmail-jdk15on-1.47-sources.jar" />
+       <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.47.jar" sourcepath="ext/src/bcpkix-jdk15on-1.47-sources.jar" />
        <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9-sources.jar" />
        <classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0-sources.jar" />
        <classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/src/gson-1.7.2-sources.jar" />

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index b8fa5f543f68030118ac7aab8c27d21bdef498c8..9165793f53fdeaa95bc9c5264ceff9d13dc99ce7 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -80,6 +80,7 @@ If *realm.ldap.maintainTeams==true* **AND** *realm.ldap.admins* is not empty, th
 - updated to Groovy 1.8.8\r
 - updated to Wicket 1.4.21\r
 - updated to Lucene 3.6.1\r
+- updated to BouncyCastle 1.47\r
 \r
 <hr/>\r
 \r

diff --git a/src/com/gitblit/build/Build.java b/src/com/gitblit/build/Build.java
index b5940878bc05ac5cc678b131559e02081e36520b..481ead5cf7d9edc73270811e1f1bb61a54dcf9ae 100644 (file)
--- a/src/com/gitblit/build/Build.java
+++ b/src/com/gitblit/build/Build.java
@@ -86,6 +86,7 @@ public class Build {
                downloadFromApache(MavenObject.MARKDOWNPAPERS, BuildType.RUNTIME);\r
                downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.RUNTIME);\r
                downloadFromApache(MavenObject.BOUNCYCASTLE_MAIL, BuildType.RUNTIME);\r
+               downloadFromApache(MavenObject.BOUNCYCASTLE_PKIX, BuildType.RUNTIME);\r
                downloadFromApache(MavenObject.JSCH, BuildType.RUNTIME);\r
                downloadFromApache(MavenObject.ROME, BuildType.RUNTIME);\r
                downloadFromApache(MavenObject.JDOM, BuildType.RUNTIME);\r
@@ -121,6 +122,7 @@ public class Build {
                downloadFromApache(MavenObject.MARKDOWNPAPERS, BuildType.COMPILETIME);\r
                downloadFromApache(MavenObject.BOUNCYCASTLE, BuildType.COMPILETIME);\r
                downloadFromApache(MavenObject.BOUNCYCASTLE_MAIL, BuildType.COMPILETIME);\r
+               downloadFromApache(MavenObject.BOUNCYCASTLE_PKIX, BuildType.COMPILETIME);\r
                downloadFromApache(MavenObject.JSCH, BuildType.COMPILETIME);\r
                downloadFromApache(MavenObject.ROME, BuildType.COMPILETIME);\r
                downloadFromApache(MavenObject.JDOM, BuildType.COMPILETIME);\r
@@ -616,18 +618,25 @@ public class Build {
                                "");\r
 \r
                public static final MavenObject BOUNCYCASTLE = new MavenObject(\r
-                "BouncyCastle", "org/bouncycastle", "bcprov-jdk16", "1.46",\r
+                "BouncyCastle", "org/bouncycastle", "bcprov-jdk15on", "1.47",\r
                 1900000, 1400000, 4670000,\r
-                               "ce091790943599535cbb4de8ede84535b0c1260c",\r
-                               "d2b70567594225923450d7e3f80cd022c852725e",\r
-                               "873a6fe765f33fc27df498a5d1f5bf077e503b2f");\r
+                               "b6f5d9926b0afbde9f4dbe3db88c5247be7794bb",\r
+                               "85e6e1ad449d5a3f09624bf4038fc8d2b02de81c",\r
+                               "");\r
 \r
                public static final MavenObject BOUNCYCASTLE_MAIL = new MavenObject(\r
-                "BouncyCastle Mail", "org/bouncycastle", "bcmail-jdk16", "1.46",\r
+                "BouncyCastle Mail", "org/bouncycastle", "bcmail-jdk15on", "1.47",\r
                 502000, 420000, 482000,\r
-                               "08a9233bfd6ad38ea32df5e6ff91035b650584b9",\r
-                               "3ebd62bc56854767512dc5deec0a17795f2e671d",\r
-                               "3b7c5f3938f202311bdca0bf7ed46bc0118af081");\r
+                               "a35ccec640177d0de5815568529021af5546d6a7",\r
+                               "f742330cfe1e7365dbdf773c24b92382172164a7",\r
+                               "");\r
+\r
+               public static final MavenObject BOUNCYCASTLE_PKIX = new MavenObject(\r
+                "BouncyCastle PKIX", "org/bouncycastle", "bcpkix-jdk15on", "1.47",\r
+                502000, 420000, 482000,\r
+                               "cd204e6f26d2bbf65ff3a30de8831d3a1344e851",\r
+                               "80e774a73d0e6a6b40ddf35fff613f9f30fe2a98",\r
+                               "");\r
 \r
                public static final MavenObject JGIT = new MavenObject(\r
                 "JGit", "org/eclipse/jgit", "org.eclipse.jgit", "2.1.0.201209190230-r",\r