From 9984ea8f5d9fad31a5e68935756ca8eb406d6b2c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 20 Oct 2014 16:31:14 -0400
Subject: [PATCH] Merge release 1.6.1
---
gitblit.iml | 147 ++++++++++++++++++++++++++++++-------------------
1 files changed, 90 insertions(+), 57 deletions(-)
diff --git a/gitblit.iml b/gitblit.iml
index fc9656f..d6f84df 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -69,17 +69,6 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jcommander-1.17.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jcommander-1.17.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jcommander-1.17.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
<library name="log4j-1.2.17.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/log4j-1.2.17.jar!/" />
@@ -91,68 +80,57 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="slf4j-api-1.6.6.jar">
+ <library name="slf4j-api-1.7.5.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/slf4j-api-1.6.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.6.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.5.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="slf4j-log4j12-1.6.6.jar">
+ <library name="slf4j-log4j12-1.7.5.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.6.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.6.6.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.7.5.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="mail-1.4.3.jar">
+ <library name="javax.mail-1.5.1.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/mail-1.4.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/javax.mail-1.5.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/mail-1.4.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/javax.mail-1.5.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="javax.servlet-api-3.0.1.jar">
+ <library name="javax.servlet-api-3.1.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/javax.servlet-api-3.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/javax.servlet-api-3.1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/javax.servlet-api-3.0.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/javax.servlet-api-3.1.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jetty-webapp-8.1.13.v20130916.jar">
+ <library name="jetty-all-9.2.3.v20140905.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jetty-webapp-8.1.13.v20130916.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.3.v20140905.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jetty-webapp-8.1.13.v20130916.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="jetty-ajp-8.1.13.v20130916.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jetty-ajp-8.1.13.v20130916.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jetty-ajp-8.1.13.v20130916.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.3.v20140905.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -186,17 +164,6 @@
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/wicket-extensions-1.4.21.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="googlecharts-1.4.21.jar">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/ext/googlecharts-1.4.21.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/googlecharts-1.4.21.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -430,24 +397,24 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit-3.3.0.201403021825-r.jar">
+ <library name="org.eclipse.jgit-3.5.1.201410131835-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.3.0.201403021825-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.5.1.201410131835-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.3.0.201403021825-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.5.1.201410131835-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jsch-0.1.46.jar">
+ <library name="jsch-0.1.50.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jsch-0.1.46.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jsch-0.1.50.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.46.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.50.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -507,13 +474,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit.http.server-3.3.0.201403021825-r.jar">
+ <library name="org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.3.0.201403021825-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.3.0.201403021825-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -547,6 +514,28 @@
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.49.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="sshd-core-0.12.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/sshd-core-0.12.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/sshd-core-0.12.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="mina-core-2.0.7.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/mina-core-2.0.7.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/mina-core-2.0.7.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -758,6 +747,17 @@
</library>
</orderEntry>
<orderEntry type="module-library">
+ <library name="args4j-2.0.26.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/args4j-2.0.26.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/args4j-2.0.26.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
<library name="jedis-2.3.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/jedis-2.3.1.jar!/" />
@@ -779,6 +779,39 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library name="pf4j-0.8.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/pf4j-0.8.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/pf4j-0.8.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="tika-core-1.5.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/tika-core-1.5.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/tika-core-1.5.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="jsoup-1.7.3.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/jsoup-1.7.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/jsoup-1.7.3.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
<orderEntry type="module-library" scope="TEST">
<library name="junit-4.11.jar">
<CLASSES>
--
Gitblit v1.9.1