From: Florian Zschocke <f.zschocke+git@gmail.com>
Date: Sun, 6 Nov 2022 13:38:01 +0000 (+0100)
Subject: Merge branch 'pr-1214' into master
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=212bcbe1804e865e3dd318b3ac6181447b9286e7;p=gitblit.git

Merge branch 'pr-1214' into master

Fix conflict from earlier JGit update to 4.5
Add updated Eclipse and IntelliJ files.
---

212bcbe1804e865e3dd318b3ac6181447b9286e7
diff --cc .classpath
index 3df5d97a,42cbfbc8..434e5a40
--- a/.classpath
+++ b/.classpath
@@@ -58,21 -42,20 +58,21 @@@
  	<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.5.7.201904151645-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.5.7.201904151645-r.jar" />
 -	<classpathentry kind="lib" path="ext/org.eclipse.jgit-4.1.1.201511131810-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.1.1.201511131810-r.jar" />
++	<classpathentry kind="lib" path="ext/org.eclipse.jgit-4.6.1.201703071140-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.6.1.201703071140-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/JavaEWAH-1.1.6.jar" sourcepath="ext/src/JavaEWAH-1.1.6.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.5.7.201904151645-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.5.7.201904151645-r.jar" />
 -	<classpathentry kind="lib" path="ext/org.eclipse.jdt.annotation-1.1.0.jar" sourcepath="ext/src/org.eclipse.jdt.annotation-1.1.0.jar" />
 -	<classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.1.1.201511131810-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.1.1.201511131810-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" />
 -	<classpathentry kind="lib" path="ext/sshd-core-1.0.0.jar" sourcepath="ext/src/sshd-core-1.0.0.jar" />
 -	<classpathentry kind="lib" path="ext/mina-core-2.0.9.jar" sourcepath="ext/src/mina-core-2.0.9.jar" />
++	<classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.6.1.201703071140-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.6.1.201703071140-r.jar" />
 +	<classpathentry kind="lib" path="ext/bcprov-jdk15on-1.69.jar" sourcepath="ext/src/bcprov-jdk15on-1.69.jar" />
 +	<classpathentry kind="lib" path="ext/bcmail-jdk15on-1.69.jar" sourcepath="ext/src/bcmail-jdk15on-1.69.jar" />
 +	<classpathentry kind="lib" path="ext/bcutil-jdk15on-1.69.jar" sourcepath="ext/src/bcutil-jdk15on-1.69.jar" />
 +	<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.69.jar" sourcepath="ext/src/bcpkix-jdk15on-1.69.jar" />
 +	<classpathentry kind="lib" path="ext/eddsa-0.2.0.jar" sourcepath="ext/src/eddsa-0.2.0.jar" />
 +	<classpathentry kind="lib" path="ext/sshd-core-1.7.0.jar" sourcepath="ext/src/sshd-core-1.7.0.jar" />
 +	<classpathentry kind="lib" path="ext/mina-core-2.0.21.jar" sourcepath="ext/src/mina-core-2.0.21.jar" />
  	<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
  	<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
  	<classpathentry kind="lib" path="ext/gson-2.3.1.jar" sourcepath="ext/src/gson-2.3.1.jar" />
diff --cc build.moxie
index e8974d47,7a1c0262..84edf30a
--- a/build.moxie
+++ b/build.moxie
@@@ -105,20 -103,20 +105,20 @@@ repositories: central, eclipse-snapshot
  
  # Convenience properties for dependencies
  properties: {
 -  jetty.version  : 9.2.13.v20150730
 -  slf4j.version  : 1.7.12
 +  jetty.version  : 9.3.16.v20170120
 +  slf4j.version  : 1.7.29
    wicket.version : 1.4.22
    lucene.version : 5.5.2
-   jgit.version   : 4.5.7.201904151645-r
+   jgit.version   : 4.6.1.201703071140-r
    groovy.version : 2.4.4
 -  bouncycastle.version : 1.52
 +  bouncycastle.version : 1.69
    selenium.version : 2.28.0
    wikitext.version : 1.4
 -  sshd.version: 1.0.0
 -  mina.version: 2.0.9
 -  guice.version : 4.0
 +  sshd.version: 1.7.0
 +  mina.version: 2.0.21
 +  guice.version : 5.1.0
    # Gitblit maintains a fork of guice-servlet
 -  guice-servlet.version : 4.0-gb2
 +  guice-servlet.version : 5.1.0-gb2
    }
  
  # Dependencies
diff --cc gitblit.iml
index a6ac9045,1f4aa248..4d842d49
--- a/gitblit.iml
+++ b/gitblit.iml
@@@ -583,13 -409,13 +583,13 @@@
        </library>
      </orderEntry>
      <orderEntry type="module-library">
-       <library name="org.eclipse.jgit-4.5.7.201904151645-r.jar">
 -      <library name="org.eclipse.jgit-4.1.1.201511131810-r.jar">
++      <library name="org.eclipse.jgit-4.6.1.201703071140-r.jar">
          <CLASSES>
-           <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.5.7.201904151645-r.jar!/" />
 -          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.1.1.201511131810-r.jar!/" />
++          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.6.1.201703071140-r.jar!/" />
          </CLASSES>
          <JAVADOC />
          <SOURCES>
-           <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.5.7.201904151645-r.jar!/" />
 -          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.1.1.201511131810-r.jar!/" />
++          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.6.1.201703071140-r.jar!/" />
          </SOURCES>
        </library>
      </orderEntry>
@@@ -605,13 -431,13 +605,13 @@@
        </library>
      </orderEntry>
      <orderEntry type="module-library">
--      <library name="JavaEWAH-0.7.9.jar">
++      <library name="JavaEWAH-1.1.6.jar">
          <CLASSES>
--          <root url="jar://$MODULE_DIR$/ext/JavaEWAH-0.7.9.jar!/" />
++          <root url="jar://$MODULE_DIR$/ext/JavaEWAH-1.1.6.jar!/" />
          </CLASSES>
          <JAVADOC />
          <SOURCES>
--          <root url="jar://$MODULE_DIR$/ext/src/JavaEWAH-0.7.9.jar!/" />
++          <root url="jar://$MODULE_DIR$/ext/src/JavaEWAH-1.1.6.jar!/" />
          </SOURCES>
        </library>
      </orderEntry>
@@@ -660,20 -486,9 +660,20 @@@
        </library>
      </orderEntry>
      <orderEntry type="module-library">
-       <library name="org.eclipse.jgit.http.server-4.5.7.201904151645-r.jar">
 -      <library name="org.eclipse.jdt.annotation-1.1.0.jar">
++      <library name="org.eclipse.jgit.http.server-4.6.1.201703071140-r.jar">
 +        <CLASSES>
-           <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.5.7.201904151645-r.jar!/" />
++          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.6.1.201703071140-r.jar!/" />
 +        </CLASSES>
 +        <JAVADOC />
 +        <SOURCES>
-           <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-4.5.7.201904151645-r.jar!/" />
++          <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-4.6.1.201703071140-r.jar!/" />
 +        </SOURCES>
 +      </library>
 +    </orderEntry>
 +    <orderEntry type="module-library">
 +      <library name="bcprov-jdk15on-1.69.jar">
          <CLASSES>
 -          <root url="jar://$MODULE_DIR$/ext/org.eclipse.jdt.annotation-1.1.0.jar!/" />
 +          <root url="jar://$MODULE_DIR$/ext/bcprov-jdk15on-1.69.jar!/" />
          </CLASSES>
          <JAVADOC />
          <SOURCES>