From 006651e6002feadc940066633290fb15d526c3b0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Mar 2015 09:10:02 -0500
Subject: [PATCH] Update SLF4j, JGit, Groovy, BouncyCastle, Mina, Gson, Freemarker, libpam4j, args4j, Jedis, waffle-jna, Unboundid
---
src/main/java/com/gitblit/utils/cli/CmdLineParser.java | 10 ++
.classpath | 41 +++++-----
src/main/java/com/gitblit/manager/PluginManager.java | 15 +--
src/main/java/com/gitblit/utils/X509Utils.java | 10 ++
build.moxie | 29 +++---
gitblit.iml | 131 +++++++++++++++++---------------
6 files changed, 131 insertions(+), 105 deletions(-)
diff --git a/.classpath b/.classpath
index bc6b967..9539a09 100644
--- a/.classpath
+++ b/.classpath
@@ -8,15 +8,15 @@
<classpathentry kind="lib" path="ext/guice-4.0-beta5.jar" sourcepath="ext/src/guice-4.0-beta5.jar" />
<classpathentry kind="lib" path="ext/javax.inject-1.jar" sourcepath="ext/src/javax.inject-1.jar" />
<classpathentry kind="lib" path="ext/aopalliance-1.0.jar" sourcepath="ext/src/aopalliance-1.0.jar" />
- <classpathentry kind="lib" path="ext/guava-17.0.jar" sourcepath="ext/src/guava-17.0.jar" />
+ <classpathentry kind="lib" path="ext/guava-18.0.jar" sourcepath="ext/src/guava-18.0.jar" />
<classpathentry kind="lib" path="ext/guice-servlet-4.0-gb1.jar" sourcepath="ext/src/guice-servlet-4.0-gb1.jar" />
<classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
- <classpathentry kind="lib" path="ext/slf4j-api-1.7.7.jar" sourcepath="ext/src/slf4j-api-1.7.7.jar" />
- <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.7.jar" sourcepath="ext/src/slf4j-log4j12-1.7.7.jar" />
+ <classpathentry kind="lib" path="ext/slf4j-api-1.7.10.jar" sourcepath="ext/src/slf4j-api-1.7.10.jar" />
+ <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.10.jar" sourcepath="ext/src/slf4j-log4j12-1.7.10.jar" />
<classpathentry kind="lib" path="ext/javax.mail-1.5.1.jar" sourcepath="ext/src/javax.mail-1.5.1.jar" />
<classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />
- <classpathentry kind="lib" path="ext/jetty-all-9.2.3.v20140905.jar" sourcepath="ext/src/jetty-all-9.2.3.v20140905.jar" />
+ <classpathentry kind="lib" path="ext/jetty-all-9.2.9.v20150224.jar" sourcepath="ext/src/jetty-all-9.2.9.v20150224.jar" />
<classpathentry kind="lib" path="ext/wicket-1.4.21.jar" sourcepath="ext/src/wicket-1.4.21.jar" />
<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" />
<classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" />
@@ -41,24 +41,24 @@
<classpathentry kind="lib" path="ext/tracwiki-core-1.4.jar" sourcepath="ext/src/tracwiki-core-1.4.jar" />
<classpathentry kind="lib" path="ext/mediawiki-core-1.4.jar" sourcepath="ext/src/mediawiki-core-1.4.jar" />
<classpathentry kind="lib" path="ext/confluence-core-1.4.jar" sourcepath="ext/src/confluence-core-1.4.jar" />
- <classpathentry kind="lib" path="ext/org.eclipse.jgit-3.5.1.201410131835-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.5.1.201410131835-r.jar" />
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit-3.6.2.201501210735-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.6.2.201501210735-r.jar" />
<classpathentry kind="lib" path="ext/jsch-0.1.50.jar" sourcepath="ext/src/jsch-0.1.50.jar" />
<classpathentry kind="lib" path="ext/JavaEWAH-0.7.9.jar" sourcepath="ext/src/JavaEWAH-0.7.9.jar" />
<classpathentry kind="lib" path="ext/httpclient-4.1.3.jar" sourcepath="ext/src/httpclient-4.1.3.jar" />
<classpathentry kind="lib" path="ext/httpcore-4.1.4.jar" sourcepath="ext/src/httpcore-4.1.4.jar" />
<classpathentry kind="lib" path="ext/commons-logging-1.1.1.jar" sourcepath="ext/src/commons-logging-1.1.1.jar" />
<classpathentry kind="lib" path="ext/commons-codec-1.7.jar" sourcepath="ext/src/commons-codec-1.7.jar" />
- <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar" />
- <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.49.jar" sourcepath="ext/src/bcprov-jdk15on-1.49.jar" />
- <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.49.jar" sourcepath="ext/src/bcmail-jdk15on-1.49.jar" />
- <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.49.jar" sourcepath="ext/src/bcpkix-jdk15on-1.49.jar" />
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.6.2.201501210735-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.6.2.201501210735-r.jar" />
+ <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.51.jar" sourcepath="ext/src/bcprov-jdk15on-1.51.jar" />
+ <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.51.jar" sourcepath="ext/src/bcmail-jdk15on-1.51.jar" />
+ <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.51.jar" sourcepath="ext/src/bcpkix-jdk15on-1.51.jar" />
<classpathentry kind="lib" path="ext/sshd-core-0.13.0.jar" sourcepath="ext/src/sshd-core-0.13.0.jar" />
- <classpathentry kind="lib" path="ext/mina-core-2.0.7.jar" sourcepath="ext/src/mina-core-2.0.7.jar" />
+ <classpathentry kind="lib" path="ext/mina-core-2.0.9.jar" sourcepath="ext/src/mina-core-2.0.9.jar" />
<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
- <classpathentry kind="lib" path="ext/gson-2.2.2.jar" sourcepath="ext/src/gson-2.2.2.jar" />
- <classpathentry kind="lib" path="ext/groovy-all-2.3.3.jar" sourcepath="ext/src/groovy-all-2.3.3.jar" />
- <classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.0.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.0.jar" />
+ <classpathentry kind="lib" path="ext/gson-2.3.1.jar" sourcepath="ext/src/gson-2.3.1.jar" />
+ <classpathentry kind="lib" path="ext/groovy-all-2.4.1.jar" sourcepath="ext/src/groovy-all-2.4.1.jar" />
+ <classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.8.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.8.jar" />
<classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0.jar" />
<classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" />
<classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1.jar" />
@@ -67,13 +67,13 @@
<classpathentry kind="lib" path="ext/force-partner-api-24.0.0.jar" sourcepath="ext/src/force-partner-api-24.0.0.jar" />
<classpathentry kind="lib" path="ext/force-wsc-24.0.0.jar" sourcepath="ext/src/force-wsc-24.0.0.jar" />
<classpathentry kind="lib" path="ext/js-1.7R2.jar" sourcepath="ext/src/js-1.7R2.jar" />
- <classpathentry kind="lib" path="ext/freemarker-2.3.20.jar" sourcepath="ext/src/freemarker-2.3.20.jar" />
- <classpathentry kind="lib" path="ext/waffle-jna-1.5.jar" sourcepath="ext/src/waffle-jna-1.5.jar" />
- <classpathentry kind="lib" path="ext/platform-3.5.0.jar" sourcepath="ext/src/platform-3.5.0.jar" />
- <classpathentry kind="lib" path="ext/jna-3.5.0.jar" sourcepath="ext/src/jna-3.5.0.jar" />
- <classpathentry kind="lib" path="ext/libpam4j-1.7.jar" sourcepath="ext/src/libpam4j-1.7.jar" />
- <classpathentry kind="lib" path="ext/args4j-2.0.26.jar" sourcepath="ext/src/args4j-2.0.26.jar" />
- <classpathentry kind="lib" path="ext/jedis-2.3.1.jar" sourcepath="ext/src/jedis-2.3.1.jar" />
+ <classpathentry kind="lib" path="ext/freemarker-2.3.22.jar" sourcepath="ext/src/freemarker-2.3.22.jar" />
+ <classpathentry kind="lib" path="ext/waffle-jna-1.7.3.jar" sourcepath="ext/src/waffle-jna-1.7.3.jar" />
+ <classpathentry kind="lib" path="ext/jna-4.1.0.jar" sourcepath="ext/src/jna-4.1.0.jar" />
+ <classpathentry kind="lib" path="ext/jna-platform-4.1.0.jar" sourcepath="ext/src/jna-platform-4.1.0.jar" />
+ <classpathentry kind="lib" path="ext/libpam4j-1.8.jar" sourcepath="ext/src/libpam4j-1.8.jar" />
+ <classpathentry kind="lib" path="ext/args4j-2.0.29.jar" sourcepath="ext/src/args4j-2.0.29.jar" />
+ <classpathentry kind="lib" path="ext/jedis-2.6.2.jar" sourcepath="ext/src/jedis-2.6.2.jar" />
<classpathentry kind="lib" path="ext/commons-pool2-2.0.jar" sourcepath="ext/src/commons-pool2-2.0.jar" />
<classpathentry kind="lib" path="ext/pf4j-0.9.0.jar" sourcepath="ext/src/pf4j-0.9.0.jar" />
<classpathentry kind="lib" path="ext/tika-core-1.5.jar" sourcepath="ext/src/tika-core-1.5.jar" />
@@ -88,6 +88,7 @@
<classpathentry kind="lib" path="ext/json-20080701.jar" sourcepath="ext/src/json-20080701.jar" />
<classpathentry kind="lib" path="ext/selenium-api-2.28.0.jar" sourcepath="ext/src/selenium-api-2.28.0.jar" />
<classpathentry kind="lib" path="ext/commons-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar" />
+ <classpathentry kind="lib" path="ext/platform-3.4.0.jar" sourcepath="ext/src/platform-3.4.0.jar" />
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
<classpathentry kind="src" path="src/main/dagger">
<attributes>
diff --git a/build.moxie b/build.moxie
index 9465af1..03c1f7f 100644
--- a/build.moxie
+++ b/build.moxie
@@ -103,15 +103,16 @@
# Convenience properties for dependencies
properties: {
jetty.version : 9.2.9.v20150224
+ slf4j.version : 1.7.10
wicket.version : 1.4.21
lucene.version : 4.10.0
- jgit.version : 3.5.1.201410131835-r
- groovy.version : 2.3.3
- bouncycastle.version : 1.49
+ jgit.version : 3.6.2.201501210735-r
+ groovy.version : 2.4.1
+ bouncycastle.version : 1.51
selenium.version : 2.28.0
wikitext.version : 1.4
sshd.version: 0.13.0
- mina.version: 2.0.7
+ mina.version: 2.0.9
guice.version : 4.0-beta5
# Gitblit maintains a fork of guice-servlet
guice-servlet.version : 4.0-gb1
@@ -131,11 +132,11 @@
dependencies:
- compile 'com.google.inject:guice:${guice.version}' :war :fedclient
- compile 'com.google.inject.extensions:guice-servlet:${guice-servlet.version}' :war
-- compile 'com.google.guava:guava:17.0' :war :fedclient
+- compile 'com.google.guava:guava:18.0' :war :fedclient
- compile 'com.intellij:annotations:12.0' :war
- compile 'log4j:log4j:1.2.17' :war :fedclient
-- compile 'org.slf4j:slf4j-api:1.7.7' :war :fedclient
-- compile 'org.slf4j:slf4j-log4j12:1.7.7' :war :fedclient
+- compile 'org.slf4j:slf4j-api:${slf4j.version}' :war :fedclient
+- compile 'org.slf4j:slf4j-log4j12:${slf4j.version}' :war :fedclient
- compile 'com.sun.mail:javax.mail:1.5.1' :war
- compile 'javax.servlet:javax.servlet-api:3.1.0' :fedclient
- compile 'org.eclipse.jetty.aggregate:jetty-all:${jetty.version}' @jar
@@ -162,20 +163,20 @@
- compile 'org.apache.sshd:sshd-core:${sshd.version}' :war !org.easymock
- compile 'org.apache.mina:mina-core:${mina.version}' :war !org.easymock
- compile 'rome:rome:0.9' :war :manager :api
-- compile 'com.google.code.gson:gson:2.2.2' :war :fedclient :manager :api
+- compile 'com.google.code.gson:gson:2.3.1' :war :fedclient :manager :api
- compile 'org.codehaus.groovy:groovy-all:${groovy.version}' :war
-- compile 'com.unboundid:unboundid-ldapsdk:2.3.0' :war
+- compile 'com.unboundid:unboundid-ldapsdk:2.3.8' :war
- compile 'org.apache.ivy:ivy:2.2.0' :war
- compile 'com.toedter:jcalendar:1.3.2' :authority
- compile 'org.apache.commons:commons-compress:1.4.1' :war
- compile 'commons-io:commons-io:2.2' :war
- compile 'com.force.api:force-partner-api:24.0.0' :war
-- compile 'org.freemarker:freemarker:2.3.20' :war
-- compile 'com.github.dblock.waffle:waffle-jna:1.5' :war
-- compile 'org.kohsuke:libpam4j:1.7' :war
-- compile 'args4j:args4j:2.0.26' :war :fedclient
+- compile 'org.freemarker:freemarker:2.3.22' :war
+- compile 'com.github.dblock.waffle:waffle-jna:1.7.3' :war
+- compile 'org.kohsuke:libpam4j:1.8' :war
+- compile 'args4j:args4j:2.0.29' :war :fedclient
- compile 'commons-codec:commons-codec:1.7' :war
-- compile 'redis.clients:jedis:2.3.1' :war
+- compile 'redis.clients:jedis:2.6.2' :war
- compile 'ro.fortsoft.pf4j:pf4j:0.9.0' :war
- compile 'org.apache.tika:tika-core:1.5' :war
- compile 'org.jsoup:jsoup:1.7.3' :war
diff --git a/gitblit.iml b/gitblit.iml
index 8f2e297..990df65 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -47,13 +47,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="guava-17.0.jar">
+ <library name="guava-18.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/guava-17.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/guava-18.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/guava-17.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/guava-18.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -91,24 +91,24 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="slf4j-api-1.7.7.jar">
+ <library name="slf4j-api-1.7.10.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.7.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.7.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.10.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="slf4j-log4j12-1.7.7.jar">
+ <library name="slf4j-log4j12-1.7.10.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.7.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.7.7.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.7.10.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -135,13 +135,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jetty-all-9.2.3.v20140905.jar">
+ <library name="jetty-all-9.2.9.v20150224.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.3.v20140905.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.9.v20150224.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.3.v20140905.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.9.v20150224.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -408,13 +408,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit-3.5.1.201410131835-r.jar">
+ <library name="org.eclipse.jgit-3.6.2.201501210735-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.5.1.201410131835-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.6.2.201501210735-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.5.1.201410131835-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.6.2.201501210735-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -485,46 +485,46 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar">
+ <library name="org.eclipse.jgit.http.server-3.6.2.201501210735-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.6.2.201501210735-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.6.2.201501210735-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="bcprov-jdk15on-1.49.jar">
+ <library name="bcprov-jdk15on-1.51.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/bcprov-jdk15on-1.49.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/bcprov-jdk15on-1.51.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.49.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.51.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="bcmail-jdk15on-1.49.jar">
+ <library name="bcmail-jdk15on-1.51.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/bcmail-jdk15on-1.49.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/bcmail-jdk15on-1.51.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.49.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.51.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="bcpkix-jdk15on-1.49.jar">
+ <library name="bcpkix-jdk15on-1.51.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/bcpkix-jdk15on-1.49.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/bcpkix-jdk15on-1.51.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.49.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.51.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -540,13 +540,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="mina-core-2.0.7.jar">
+ <library name="mina-core-2.0.9.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/mina-core-2.0.7.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/mina-core-2.0.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/mina-core-2.0.7.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/mina-core-2.0.9.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -573,35 +573,35 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="gson-2.2.2.jar">
+ <library name="gson-2.3.1.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/gson-2.2.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/gson-2.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/gson-2.2.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/gson-2.3.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="groovy-all-2.3.3.jar">
+ <library name="groovy-all-2.4.1.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/groovy-all-2.3.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/groovy-all-2.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/groovy-all-2.3.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/groovy-all-2.4.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="unboundid-ldapsdk-2.3.0.jar">
+ <library name="unboundid-ldapsdk-2.3.8.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/unboundid-ldapsdk-2.3.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/unboundid-ldapsdk-2.3.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/unboundid-ldapsdk-2.3.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/unboundid-ldapsdk-2.3.8.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -692,79 +692,79 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="freemarker-2.3.20.jar">
+ <library name="freemarker-2.3.22.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/freemarker-2.3.20.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/freemarker-2.3.22.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/freemarker-2.3.20.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/freemarker-2.3.22.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="waffle-jna-1.5.jar">
+ <library name="waffle-jna-1.7.3.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/waffle-jna-1.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/waffle-jna-1.7.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/waffle-jna-1.5.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/waffle-jna-1.7.3.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="platform-3.5.0.jar">
+ <library name="jna-4.1.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/platform-3.5.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jna-4.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/platform-3.5.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jna-4.1.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jna-3.5.0.jar">
+ <library name="jna-platform-4.1.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jna-3.5.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jna-platform-4.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jna-3.5.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jna-platform-4.1.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="libpam4j-1.7.jar">
+ <library name="libpam4j-1.8.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/libpam4j-1.7.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/libpam4j-1.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/libpam4j-1.7.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/libpam4j-1.8.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="args4j-2.0.26.jar">
+ <library name="args4j-2.0.29.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/args4j-2.0.26.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/args4j-2.0.29.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/args4j-2.0.26.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/args4j-2.0.29.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jedis-2.3.1.jar">
+ <library name="jedis-2.6.2.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jedis-2.3.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jedis-2.6.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jedis-2.3.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jedis-2.6.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -922,6 +922,17 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library" scope="TEST">
+ <library name="platform-3.4.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/platform-3.4.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/platform-3.4.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
<orderEntry type="inheritedJdk" />
</component>
</module>
diff --git a/src/main/java/com/gitblit/manager/PluginManager.java b/src/main/java/com/gitblit/manager/PluginManager.java
index bc3be52..b3936e5 100644
--- a/src/main/java/com/gitblit/manager/PluginManager.java
+++ b/src/main/java/com/gitblit/manager/PluginManager.java
@@ -15,12 +15,13 @@
*/
package com.gitblit.manager;
-import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
import java.net.Proxy;
@@ -61,8 +62,7 @@
import com.gitblit.utils.FileUtils;
import com.gitblit.utils.JsonUtils;
import com.gitblit.utils.StringUtils;
-import com.google.common.io.Files;
-import com.google.common.io.InputSupplier;
+import com.google.common.io.ByteStreams;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -533,12 +533,9 @@
// try to get the server-specified last-modified date of this artifact
long lastModified = conn.getHeaderFieldDate("Last-Modified", System.currentTimeMillis());
- Files.copy(new InputSupplier<InputStream>() {
- @Override
- public InputStream getInput() throws IOException {
- return new BufferedInputStream(conn.getInputStream());
- }
- }, tmpFile);
+ try (InputStream is = conn.getInputStream(); OutputStream os = new FileOutputStream(tmpFile);) {
+ ByteStreams.copy(is, os);
+ }
File destFile = new File(pFolder, StringUtils.getLastPathElement(u.getPath()));
if (destFile.exists()) {
diff --git a/src/main/java/com/gitblit/utils/X509Utils.java b/src/main/java/com/gitblit/utils/X509Utils.java
index f0c1b9d..fc0b797 100644
--- a/src/main/java/com/gitblit/utils/X509Utils.java
+++ b/src/main/java/com/gitblit/utils/X509Utils.java
@@ -80,7 +80,10 @@
import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
import org.bouncycastle.jce.PrincipalUtil;
import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
+import org.bouncycastle.openssl.PEMEncryptor;
import org.bouncycastle.openssl.PEMWriter;
+import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
+import org.bouncycastle.openssl.jcajce.JcePEMEncryptorBuilder;
import org.bouncycastle.operator.ContentSigner;
import org.bouncycastle.operator.OperatorCreationException;
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
@@ -883,8 +886,11 @@
if (pemFile.exists()) {
pemFile.delete();
}
- PEMWriter pemWriter = new PEMWriter(new FileWriter(pemFile));
- pemWriter.writeObject(pair.getPrivate(), "DES-EDE3-CBC", clientMetadata.password.toCharArray(), new SecureRandom());
+ JcePEMEncryptorBuilder builder = new JcePEMEncryptorBuilder("DES-EDE3-CBC");
+ builder.setSecureRandom(new SecureRandom());
+ PEMEncryptor pemEncryptor = builder.build(clientMetadata.password.toCharArray());
+ JcaPEMWriter pemWriter = new JcaPEMWriter(new FileWriter(pemFile));
+ pemWriter.writeObject(pair.getPrivate(), pemEncryptor);
pemWriter.writeObject(userCert);
pemWriter.writeObject(caCert);
pemWriter.flush();
diff --git a/src/main/java/com/gitblit/utils/cli/CmdLineParser.java b/src/main/java/com/gitblit/utils/cli/CmdLineParser.java
index e698eb5..09ae836 100644
--- a/src/main/java/com/gitblit/utils/cli/CmdLineParser.java
+++ b/src/main/java/com/gitblit/utils/cli/CmdLineParser.java
@@ -429,5 +429,15 @@
public boolean isMultiValued() {
return false;
}
+
+ @Override
+ public boolean help() {
+ return true;
+ }
+
+ @Override
+ public String[] forbids() {
+ return new String [0];
+ }
}
}
--
Gitblit v1.9.1