summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-07-03 14:04:09 -0600
committerJames Moger <james.moger@gitblit.com>2014-07-03 14:04:09 -0600
commit7480c393a865750415e920eec3b4e78e42c37ec5 (patch)
tree2b13cbcf1383b54ffb8f4f82276adb93ad6c98b6
parent4ed96d6b2e42f07177ee6d50a00d118afafe35c0 (diff)
parent728c57649305adc7a3329249aaf465e393bfcd8c (diff)
downloadgitblit-7480c393a865750415e920eec3b4e78e42c37ec5.tar.gz
gitblit-7480c393a865750415e920eec3b4e78e42c37ec5.zip
Merged #126 "Update to JGit 3.4.1"
-rw-r--r--.classpath4
-rw-r--r--build.moxie2
-rw-r--r--gitblit.iml12
3 files changed, 9 insertions, 9 deletions
diff --git a/.classpath b/.classpath
index 69dda192..a96ccac9 100644
--- a/.classpath
+++ b/.classpath
@@ -40,14 +40,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-3.4.0.201406110918-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.4.0.201406110918-r.jar" />
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit-3.4.1.201406201815-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.4.1.201406201815-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.4.0.201406110918-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.4.0.201406110918-r.jar" />
+ <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.4.1.201406201815-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" />
diff --git a/build.moxie b/build.moxie
index 241df7e1..a3f763ea 100644
--- a/build.moxie
+++ b/build.moxie
@@ -104,7 +104,7 @@ properties: {
jetty.version : 9.2.1.v20140609
wicket.version : 1.4.21
lucene.version : 4.8.1
- jgit.version : 3.4.0.201406110918-r
+ jgit.version : 3.4.1.201406201815-r
groovy.version : 2.3.3
bouncycastle.version : 1.49
selenium.version : 2.28.0
diff --git a/gitblit.iml b/gitblit.iml
index b58676f0..163484c2 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -397,13 +397,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit-3.4.0.201406110918-r.jar">
+ <library name="org.eclipse.jgit-3.4.1.201406201815-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.4.0.201406110918-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.4.0.201406110918-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -474,13 +474,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="org.eclipse.jgit.http.server-3.4.0.201406110918-r.jar">
+ <library name="org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.4.0.201406110918-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.4.0.201406110918-r.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar!/" />
</SOURCES>
</library>
</orderEntry>