diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-30 10:45:02 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-30 10:45:02 -0400 |
| commit | 136fbddd52fba5a06e3c833dce5460cf11f2d5be (patch) | |
| tree | 19c04f903ca70837cbba6922726d1aaaed3de2f5 | |
| parent | e6ea43157d30203222c07ff6c0477c077332235d (diff) | |
| parent | 87939ba68fbcf01f4f38399a36c062107521e469 (diff) | |
| download | gitblit-136fbddd52fba5a06e3c833dce5460cf11f2d5be.tar.gz gitblit-136fbddd52fba5a06e3c833dce5460cf11f2d5be.zip | |
Merge branch 'ticket/198' into develop
| -rw-r--r-- | .classpath | 4 | ||||
| -rw-r--r-- | build.moxie | 2 | ||||
| -rw-r--r-- | gitblit.iml | 12 |
3 files changed, 9 insertions, 9 deletions
@@ -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-3.4.1.201406201815-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.4.1.201406201815-r.jar" /> + <classpathentry kind="lib" path="ext/org.eclipse.jgit-3.5.0.201409260305-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.5.0.201409260305-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.1.201406201815-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar" /> + <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.5.0.201409260305-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.5.0.201409260305-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 6b6c0085..965ecde8 100644 --- a/build.moxie +++ b/build.moxie @@ -105,7 +105,7 @@ properties: { jetty.version : 9.2.2.v20140723 wicket.version : 1.4.21 lucene.version : 4.10.0 - jgit.version : 3.4.1.201406201815-r + jgit.version : 3.5.0.201409260305-r groovy.version : 2.3.3 bouncycastle.version : 1.49 selenium.version : 2.28.0 diff --git a/gitblit.iml b/gitblit.iml index e49bc80e..cfe8b542 100644 --- a/gitblit.iml +++ b/gitblit.iml @@ -408,13 +408,13 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="org.eclipse.jgit-3.4.1.201406201815-r.jar"> + <library name="org.eclipse.jgit-3.5.0.201409260305-r.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.5.0.201409260305-r.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.4.1.201406201815-r.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.5.0.201409260305-r.jar!/" /> </SOURCES> </library> </orderEntry> @@ -485,13 +485,13 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar"> + <library name="org.eclipse.jgit.http.server-3.5.0.201409260305-r.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.5.0.201409260305-r.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.4.1.201406201815-r.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.5.0.201409260305-r.jar!/" /> </SOURCES> </library> </orderEntry> |