Update to JGit 3.1.0

Change-Id: I94d4f6146c79541bf8a36e4c3dca1842e46cddd5

diff --git a/.classpath b/.classpath
index c95f3699f5f5ad7b23537ae8c92190d834e9759d..ba81e42f81d660e1ac30322c106d68b6a52f0df6 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -21,10 +21,10 @@
        <classpathentry kind="lib" path="ext/lucene-queries-3.6.1.jar" sourcepath="ext/src/lucene-queries-3.6.1.jar" />
        <classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />
        <classpathentry kind="lib" path="ext/markdownpapers-core-1.3.2.jar" sourcepath="ext/src/markdownpapers-core-1.3.2.jar" />
-       <classpathentry kind="lib" path="ext/org.eclipse.jgit-3.0.0.201306101825-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.0.0.201306101825-r.jar" />
+       <classpathentry kind="lib" path="ext/org.eclipse.jgit-3.1.0.201310021548-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.1.0.201310021548-r.jar" />
        <classpathentry kind="lib" path="ext/jsch-0.1.46.jar" sourcepath="ext/src/jsch-0.1.46.jar" />
        <classpathentry kind="lib" path="ext/JavaEWAH-0.5.6.jar" sourcepath="ext/src/JavaEWAH-0.5.6.jar" />
-       <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.0.0.201306101825-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.0.0.201306101825-r.jar" />
+       <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar" />
        <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.47.jar" sourcepath="ext/src/bcprov-jdk15on-1.47.jar" />
        <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.47.jar" sourcepath="ext/src/bcmail-jdk15on-1.47.jar" />
        <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.47.jar" sourcepath="ext/src/bcpkix-jdk15on-1.47.jar" />

diff --git a/build.moxie b/build.moxie
index bbcd0e75b1f1fb74987a1ed48b3857d2b5cc4504..df0a36d1d59471755e741f375ad4376accab94cd 100644 (file)
--- a/build.moxie
+++ b/build.moxie
@@ -3,7 +3,7 @@
 #
 
 # Specify minimum Moxie version required to build
-requires: 0.7.4
+requires: 0.8.3
 
 # Project Metadata
 name: Gitblit
@@ -90,18 +90,18 @@ dependencyDirectory: ext
 
 # Register the Eclipse JGit Maven repositories
 registeredRepositories:
-- { id: jgit, url: 'http://download.eclipse.org/jgit/maven' }
-- { id: jgit-snapshots, url: 'https://repo.eclipse.org/content/groups/snapshots' }
+- { id: eclipse, url: 'http://repo.eclipse.org/content/groups/releases' }
+- { id: eclipse-snapshots, url: 'http://repo.eclipse.org/content/groups/snapshots' }
 
 # Source all dependencies from the following repositories in the specified order
-repositories: central, jgit-snapshots, jgit
+repositories: central, eclipse-snapshots, eclipse
 
 # Convenience properties for dependencies
 properties: {
   jetty.version  : 7.6.13.v20130916
   wicket.version : 1.4.21
   lucene.version : 3.6.1
-  jgit.version   : 3.0.0.201306101825-r
+  jgit.version   : 3.1.0.201310021548-r
   groovy.version : 1.8.8
   bouncycastle.version : 1.47
   selenium.version : 2.28.0

diff --git a/build.xml b/build.xml
index 077f7ad0d1ec09c033b394160af832a4afc7bf0e..57b7ca2471c4aa9f4451455ed14f74fa919baee1 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
                documentation @ http://gitblit.github.io/moxie\r
                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\r
        -->\r
-       <property name="moxie.version" value="0.8.2" />\r
+       <property name="moxie.version" value="0.8.3" />\r
        <property name="moxie.url" value="http://gitblit.github.io/moxie/maven" />\r
        <property name="moxie.jar" value="moxie-toolkit-${moxie.version}.jar" />\r
        <property name="moxie.dir" value="${user.home}/.moxie" />\r

diff --git a/gitblit.iml b/gitblit.iml
index 3c04319ad23a2544705e3b7e902a7503a313db62..736376b3131bb6c5ece6aed090a2effffefced97 100644 (file)
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -207,13 +207,13 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="org.eclipse.jgit-3.0.0.201306101825-r.jar">
+      <library name="org.eclipse.jgit-3.1.0.201310021548-r.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.0.0.201306101825-r.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.1.0.201310021548-r.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.0.0.201306101825-r.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.1.0.201310021548-r.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -240,13 +240,13 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="org.eclipse.jgit.http.server-3.0.0.201306101825-r.jar">
+      <library name="org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.0.0.201306101825-r.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.0.0.201306101825-r.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>

diff --git a/releases.moxie b/releases.moxie
index 78825fd1ab4c14d7f405ebcc1ad19c1659ee4c68..48db5e4641a18d3fc7a73b7344c540f0a5462bd0 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -29,6 +29,7 @@ r20: {
        - Added a normalized diffstat display to the commit, commitdiff, and compare pages
     dependencyChanges:
        - updated to Jetty 7.6.13
+       - updated to JGit 3.1.0
     settings:
     - { name: 'git.createRepositoriesShared', defaultValue: 'false' }
     - { name: 'git.allowAnonymousPushes', defaultValue: 'false' }