From 610bd82842e032bcaacaea6c718ea26af8cc6a09 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 18 Sep 2015 08:38:00 -0400
Subject: [PATCH] Update to JGit 4.0.2
---
.classpath | 12 ++++++------
build.moxie | 2 +-
gitblit.iml | 38 ++++++++++++++++++++------------------
3 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/.classpath b/.classpath
index a04c9e2..c063f88 100644
--- a/.classpath
+++ b/.classpath
@@ -41,14 +41,14 @@
<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-4.0.1.201506240215-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.0.1.201506240215-r.jar" />
- <classpathentry kind="lib" path="ext/jsch-0.1.51.jar" sourcepath="ext/src/jsch-0.1.51.jar" />
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit-4.0.2.201509141540-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.0.2.201509141540-r.jar" />
+ <classpathentry kind="lib" path="ext/jsch-0.1.53.jar" sourcepath="ext/src/jsch-0.1.53.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/httpclient-4.3.6.jar" sourcepath="ext/src/httpclient-4.3.6.jar" />
+ <classpathentry kind="lib" path="ext/httpcore-4.3.3.jar" sourcepath="ext/src/httpcore-4.3.3.jar" />
+ <classpathentry kind="lib" path="ext/commons-logging-1.1.3.jar" sourcepath="ext/src/commons-logging-1.1.3.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-4.0.1.201506240215-r.jar" />
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar" />
<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.52.jar" sourcepath="ext/src/bcprov-jdk15on-1.52.jar" />
<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.52.jar" sourcepath="ext/src/bcmail-jdk15on-1.52.jar" />
<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.52.jar" sourcepath="ext/src/bcpkix-jdk15on-1.52.jar" />
diff --git a/build.moxie b/build.moxie
index 3958df8..f34b319 100644
--- a/build.moxie
+++ b/build.moxie
@@ -106,7 +106,7 @@
slf4j.version : 1.7.12
wicket.version : 1.4.22
lucene.version : 4.10.0
- jgit.version : 4.0.1.201506240215-r
+ jgit.version : 4.0.2.201509141540-r
groovy.version : 2.4.4
bouncycastle.version : 1.52
selenium.version : 2.28.0
diff --git a/gitblit.iml b/gitblit.iml
index d6982f3..89ea8e6 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -408,24 +408,24 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit-4.0.1.201506240215-r.jar">
+ <library name="org.eclipse.jgit-4.0.2.201509141540-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.0.1.201506240215-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.0.2.201509141540-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.0.1.201506240215-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.0.2.201509141540-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="jsch-0.1.51.jar">
+ <library name="jsch-0.1.53.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/jsch-0.1.51.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/jsch-0.1.53.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.51.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/jsch-0.1.53.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -441,35 +441,35 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="httpclient-4.1.3.jar">
+ <library name="httpclient-4.3.6.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/httpclient-4.1.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/httpclient-4.3.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.1.3.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.3.6.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="httpcore-4.1.4.jar">
+ <library name="httpcore-4.3.3.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/httpcore-4.1.4.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/httpcore-4.3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.1.4.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.3.3.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="commons-logging-1.1.1.jar">
+ <library name="commons-logging-1.1.3.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.3.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -485,12 +485,14 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit.http.server-4.0.1.201506240215-r.jar">
+ <library name="org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.0.1.201506240215-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
--
Gitblit v1.9.1