From dbc524eb8eb26922df3a047457d21ac75d4d50d5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 30 Sep 2015 07:39:45 -0400
Subject: [PATCH] Update to JGit 4.1.0
---
.classpath | 5 +++--
build.moxie | 2 +-
gitblit.iml | 25 +++++++++++++++----------
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/.classpath b/.classpath
index b05535d..da27c4d 100644
--- a/.classpath
+++ b/.classpath
@@ -41,14 +41,15 @@
<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.2.201509141540-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.0.2.201509141540-r.jar" />
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit-4.1.0.201509280440-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" />
<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.2.201509141540-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.0.2.201509141540-r.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/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 e64c8b7..f82b9f8 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.0.2.201509141540-r
+ jgit.version : 4.1.0.201509280440-r
groovy.version : 2.4.4
bouncycastle.version : 1.52
selenium.version : 2.28.0
diff --git a/gitblit.iml b/gitblit.iml
index 56613a3..62b1e45 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -408,14 +408,12 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit-4.0.2.201509141540-r.jar">
+ <library name="org.eclipse.jgit-4.1.0.201509280440-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.0.2.201509141540-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.1.0.201509280440-r.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.0.2.201509141540-r.jar!/" />
- </SOURCES>
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
@@ -485,14 +483,21 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar">
+ <library name="org.eclipse.jdt.annotation-1.1.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jdt.annotation-1.1.0.jar!/" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-4.0.2.201509141540-r.jar!/" />
- </SOURCES>
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="org.eclipse.jgit.http.server-4.1.0.201509280440-r.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.1.0.201509280440-r.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
--
Gitblit v1.9.1