From 174863b3ee4f28f7bc76914b3ef9b14dbf484743 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 18 Nov 2015 09:06:12 -0500
Subject: [PATCH] Update to JGit 4.1.1
---
.classpath | 4 ++--
releases.moxie | 2 +-
build.moxie | 2 +-
gitblit.iml | 16 ++++++++++------
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/.classpath b/.classpath
index da27c4d..ccf6a4e 100644
--- a/.classpath
+++ b/.classpath
@@ -41,7 +41,7 @@
<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.1.0.201509280440-r.jar" />
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit-4.1.1.201511131810-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.1.1.201511131810-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.3.6.jar" sourcepath="ext/src/httpclient-4.3.6.jar" />
@@ -49,7 +49,7 @@
<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.jdt.annotation-1.1.0.jar" />
- <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.1.0.201509280440-r.jar" />
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.1.1.201511131810-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 f82b9f8..c5210ef 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.4
- jgit.version : 4.1.0.201509280440-r
+ jgit.version : 4.1.1.201511131810-r
groovy.version : 2.4.4
bouncycastle.version : 1.52
selenium.version : 2.28.0
diff --git a/gitblit.iml b/gitblit.iml
index 62b1e45..93331b2 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -408,12 +408,14 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit-4.1.0.201509280440-r.jar">
+ <library name="org.eclipse.jgit-4.1.1.201511131810-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.1.0.201509280440-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.1.1.201511131810-r.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.1.1.201511131810-r.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -492,12 +494,14 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit.http.server-4.1.0.201509280440-r.jar">
+ <library name="org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.1.0.201509280440-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar!/" />
+ </SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
diff --git a/releases.moxie b/releases.moxie
index d7a227e..3de8e9c 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -58,7 +58,7 @@
- Freemarker 2.3.22
- Lucene 4.10.0 (ticket-159)
- SSHD 1.0.0
- - JGit 4.0.2
+ - JGit 4.1.1
- Groovy 2.4.4
- Wicket 1.4.22
- BouncyCastle 1.52
--
Gitblit v1.9.1