Update to JGit 3.3.0

diff --git a/.classpath b/.classpath
index 462ac8c3967458ce0cde863973e60f5469b41d8b..f0ff08e6850de5b0ec1fd8419c760373a11a1181 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -43,10 +43,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.2.0.201312181205-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.2.0.201312181205-r.jar" />
+       <classpathentry kind="lib" path="ext/org.eclipse.jgit-3.3.0.201403021825-r.jar" sourcepath="ext/src/org.eclipse.jgit-3.3.0.201403021825-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.2.0.201312181205-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.2.0.201312181205-r.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.3.0.201403021825-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.3.0.201403021825-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" />
@@ -69,7 +73,6 @@
        <classpathentry kind="lib" path="ext/jna-3.5.0.jar" sourcepath="ext/src/jna-3.5.0.jar" />
        <classpathentry kind="lib" path="ext/guava-13.0.1.jar" sourcepath="ext/src/guava-13.0.1.jar" />
        <classpathentry kind="lib" path="ext/libpam4j-1.7.jar" sourcepath="ext/src/libpam4j-1.7.jar" />
-       <classpathentry kind="lib" path="ext/commons-codec-1.7.jar" sourcepath="ext/src/commons-codec-1.7.jar" />
        <classpathentry kind="lib" path="ext/jedis-2.3.1.jar" sourcepath="ext/src/jedis-2.3.1.jar" />
        <classpathentry kind="lib" path="ext/commons-pool2-2.0.jar" sourcepath="ext/src/commons-pool2-2.0.jar" />
        <classpathentry kind="lib" path="ext/junit-4.11.jar" sourcepath="ext/src/junit-4.11.jar" />
@@ -81,9 +84,6 @@
        <classpathentry kind="lib" path="ext/cglib-nodep-2.1_3.jar" sourcepath="ext/src/cglib-nodep-2.1_3.jar" />
        <classpathentry kind="lib" path="ext/json-20080701.jar" sourcepath="ext/src/json-20080701.jar" />
        <classpathentry kind="lib" path="ext/selenium-api-2.28.0.jar" sourcepath="ext/src/selenium-api-2.28.0.jar" />
-       <classpathentry kind="lib" path="ext/httpclient-4.2.1.jar" sourcepath="ext/src/httpclient-4.2.1.jar" />
-       <classpathentry kind="lib" path="ext/httpcore-4.2.1.jar" sourcepath="ext/src/httpcore-4.2.1.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-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar" />
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
        <classpathentry kind="src" path="src/main/dagger">

diff --git a/build.moxie b/build.moxie
index 02066b4c205ee2f9c98c39383151b8778444fc97..b8d368b80bca3888c67215a23bb53d28ff837619 100644 (file)
--- a/build.moxie
+++ b/build.moxie
@@ -104,7 +104,7 @@ properties: {
   jetty.version  : 8.1.13.v20130916
   wicket.version : 1.4.21
   lucene.version : 4.6.0
-  jgit.version   : 3.2.0.201312181205-r
+  jgit.version   : 3.3.0.201403021825-r
   groovy.version : 1.8.8
   bouncycastle.version : 1.49
   selenium.version : 2.28.0
@@ -152,8 +152,8 @@ dependencies:
 - compile 'org.fusesource.wikitext:tracwiki-core:${wikitext.version}' :war
 - compile 'org.fusesource.wikitext:mediawiki-core:${wikitext.version}' :war
 - compile 'org.fusesource.wikitext:confluence-core:${wikitext.version}' :war
-- compile 'org.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager :authority
-- compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :manager :authority
+- compile 'org.eclipse.jgit:org.eclipse.jgit:${jgit.version}' :war :fedclient :manager :authority !junit
+- compile 'org.eclipse.jgit:org.eclipse.jgit.http.server:${jgit.version}' :war :manager :authority !junit
 - compile 'org.bouncycastle:bcprov-jdk15on:${bouncycastle.version}' :war :authority
 - compile 'org.bouncycastle:bcmail-jdk15on:${bouncycastle.version}' :war :authority
 - compile 'org.bouncycastle:bcpkix-jdk15on:${bouncycastle.version}' :war :authority

diff --git a/gitblit.iml b/gitblit.iml
index 7ebe2e89a2ba2ab292351514e8751623fa2c266d..fc9656fc4caf82f49fb95fe9aae895fa593320ec 100644 (file)
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -430,13 +430,13 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="org.eclipse.jgit-3.2.0.201312181205-r.jar">
+      <library name="org.eclipse.jgit-3.3.0.201403021825-r.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.2.0.201312181205-r.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-3.3.0.201403021825-r.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.2.0.201312181205-r.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-3.3.0.201403021825-r.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -452,24 +452,68 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="JavaEWAH-0.5.6.jar">
+      <library name="JavaEWAH-0.7.9.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/JavaEWAH-0.5.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/JavaEWAH-0.7.9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/JavaEWAH-0.5.6.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/JavaEWAH-0.7.9.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="org.eclipse.jgit.http.server-3.2.0.201312181205-r.jar">
+      <library name="httpclient-4.1.3.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.2.0.201312181205-r.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/httpclient-4.1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.2.0.201312181205-r.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.1.3.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="httpcore-4.1.4.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/httpcore-4.1.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.1.4.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="commons-logging-1.1.1.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.1.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.1.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="commons-codec-1.7.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/commons-codec-1.7.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/commons-codec-1.7.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="org.eclipse.jgit.http.server-3.3.0.201403021825-r.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-3.3.0.201403021825-r.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-3.3.0.201403021825-r.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -713,17 +757,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="commons-codec-1.7.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/commons-codec-1.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/commons-codec-1.7.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="jedis-2.3.1.jar">
         <CLASSES>
@@ -845,39 +878,6 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module-library" scope="TEST">
-      <library name="httpclient-4.2.1.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/httpclient-4.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.2.1.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="TEST">
-      <library name="httpcore-4.2.1.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/httpcore-4.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.2.1.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library" scope="TEST">
-      <library name="commons-logging-1.1.1.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.1.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
     <orderEntry type="module-library" scope="TEST">
       <library name="commons-exec-1.1.jar">
         <CLASSES>

diff --git a/releases.moxie b/releases.moxie
index ecee9bae5ea1bc0bcf505b4fe1cc1634b84b79b5..e82a0e2c057d0e9d9305b1931d49222138d48536 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -82,7 +82,7 @@ r20: {
        - Added setting to hide the top-level navigation header to facilitate embedding Gitblit in something else.
     dependencyChanges:
        - updated to Jetty 8.1.13
-       - updated to JGit 3.2.0
+       - updated to JGit 3.3.0
        - updated to Lucene 4.6.0
        - updated to BouncyCastle 1.49
        - replaced MarkdownPapers with pegdown 1.4.2