Merge branch 'pr-1213' into master

Fix conflict in updated slf4j version.
Add updated Eclipse and IntelliJ files.

diff --cc .classpath
index 51cddb64566d26c00667e8f2a89235d44fbf026b,42cbfbc8714d87bb40cebb8f081cb4b05f3d6c99..3df5d97a1006efe23494e4a25c8f765cead69540
--- 1/.classpath
--- 2/.classpath
+++ b/.classpath
@@@ -6,26 -6,18 +6,34 @@@
        <classpathentry kind="src" path="src/test/bugtraq" output="bin/test-classes" />
        <classpathentry kind="src" path="src/main/resources" />
        <classpathentry kind="src" path="src/test/resources" output="bin/test-classes" />
 -      <classpathentry kind="lib" path="ext/guice-4.0.jar" sourcepath="ext/src/guice-4.0.jar" />
 +      <classpathentry kind="lib" path="ext/guice-5.1.0.jar" sourcepath="ext/src/guice-5.1.0.jar" />
        <classpathentry kind="lib" path="ext/javax.inject-1.jar" sourcepath="ext/src/javax.inject-1.jar" />
        <classpathentry kind="lib" path="ext/aopalliance-1.0.jar" sourcepath="ext/src/aopalliance-1.0.jar" />
 -      <classpathentry kind="lib" path="ext/guava-18.0.jar" sourcepath="ext/src/guava-18.0.jar" />
 -      <classpathentry kind="lib" path="ext/guice-servlet-4.0-gb2.jar" sourcepath="ext/src/guice-servlet-4.0-gb2.jar" />
 +      <classpathentry kind="lib" path="ext/guava-27.0.1-jre.jar" sourcepath="ext/src/guava-27.0.1-jre.jar" />
 +      <classpathentry kind="lib" path="ext/failureaccess-1.0.1.jar" sourcepath="ext/src/failureaccess-1.0.1.jar" />
 +      <classpathentry kind="lib" path="ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
 +      <classpathentry kind="lib" path="ext/jsr305-3.0.2.jar" sourcepath="ext/src/jsr305-3.0.2.jar" />
 +      <classpathentry kind="lib" path="ext/checker-qual-2.5.2.jar" sourcepath="ext/src/checker-qual-2.5.2.jar" />
 +      <classpathentry kind="lib" path="ext/error_prone_annotations-2.2.0.jar" sourcepath="ext/src/error_prone_annotations-2.2.0.jar" />
 +      <classpathentry kind="lib" path="ext/j2objc-annotations-1.1.jar" sourcepath="ext/src/j2objc-annotations-1.1.jar" />
 +      <classpathentry kind="lib" path="ext/guice-servlet-5.1.0-gb2.jar" sourcepath="ext/src/guice-servlet-5.1.0-gb2.jar" />
 +      <classpathentry kind="lib" path="ext/animal-sniffer-annotations-1.17.jar" sourcepath="ext/src/animal-sniffer-annotations-1.17.jar" />
        <classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
        <classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
 -      <classpathentry kind="lib" path="ext/slf4j-api-1.7.12.jar" sourcepath="ext/src/slf4j-api-1.7.12.jar" />
 -      <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.12.jar" sourcepath="ext/src/slf4j-log4j12-1.7.12.jar" />
 -      <classpathentry kind="lib" path="ext/javax.mail-1.5.1.jar" sourcepath="ext/src/javax.mail-1.5.1.jar" />
 +      <classpathentry kind="lib" path="ext/slf4j-api-1.7.29.jar" sourcepath="ext/src/slf4j-api-1.7.29.jar" />
 +      <classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.29.jar" sourcepath="ext/src/slf4j-log4j12-1.7.29.jar" />
 +      <classpathentry kind="lib" path="ext/javax.mail-1.5.6.jar" sourcepath="ext/src/javax.mail-1.5.6.jar" />
 +      <classpathentry kind="lib" path="ext/activation-1.1.jar" sourcepath="ext/src/activation-1.1.jar" />
        <classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />
-       <classpathentry kind="lib" path="ext/jetty-all-9.2.30.v20200428.jar" sourcepath="ext/src/jetty-all-9.2.30.v20200428.jar" />
 -      <classpathentry kind="lib" path="ext/jetty-all-9.2.13.v20150730.jar" sourcepath="ext/src/jetty-all-9.2.13.v20150730.jar" />
++      <classpathentry kind="lib" path="ext/jetty-servlet-9.3.16.v20170120.jar" sourcepath="ext/src/jetty-servlet-9.3.16.v20170120.jar" />
++      <classpathentry kind="lib" path="ext/jetty-security-9.3.16.v20170120.jar" sourcepath="ext/src/jetty-security-9.3.16.v20170120.jar" />
++      <classpathentry kind="lib" path="ext/jetty-server-9.3.16.v20170120.jar" sourcepath="ext/src/jetty-server-9.3.16.v20170120.jar" />
++      <classpathentry kind="lib" path="ext/jetty-continuation-9.3.16.v20170120.jar" sourcepath="ext/src/jetty-continuation-9.3.16.v20170120.jar" />
++      <classpathentry kind="lib" path="ext/jetty-http-9.3.16.v20170120.jar" sourcepath="ext/src/jetty-http-9.3.16.v20170120.jar" />
++      <classpathentry kind="lib" path="ext/jetty-io-9.3.16.v20170120.jar" sourcepath="ext/src/jetty-io-9.3.16.v20170120.jar" />
++      <classpathentry kind="lib" path="ext/jetty-util-9.3.16.v20170120.jar" sourcepath="ext/src/jetty-util-9.3.16.v20170120.jar" />
++      <classpathentry kind="lib" path="ext/jetty-webapp-9.3.16.v20170120.jar" sourcepath="ext/src/jetty-webapp-9.3.16.v20170120.jar" />
++      <classpathentry kind="lib" path="ext/jetty-xml-9.3.16.v20170120.jar" sourcepath="ext/src/jetty-xml-9.3.16.v20170120.jar" />
        <classpathentry kind="lib" path="ext/wicket-1.4.22.jar" sourcepath="ext/src/wicket-1.4.22.jar" />
        <classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.22.jar" sourcepath="ext/src/wicket-auth-roles-1.4.22.jar" />
        <classpathentry kind="lib" path="ext/wicket-extensions-1.4.22.jar" sourcepath="ext/src/wicket-extensions-1.4.22.jar" />

diff --cc build.moxie
index 9b32963e856adffcd58e43312a5e8f6f5e2cd062,6c9f99eca75c19063b10623fa87f764142990d73..e8974d4732240ba791b15a0b1af9f7dc48c1d62a
--- 1/build.moxie
--- 2/build.moxie
+++ b/build.moxie
@@@ -105,20 -103,20 +105,20 @@@ repositories: central, eclipse-snapshot
  
  # Convenience properties for dependencies
  properties: {
-   jetty.version  : 9.2.30.v20200428
+   jetty.version  : 9.3.16.v20170120
 -  slf4j.version  : 1.7.12
 +  slf4j.version  : 1.7.29
    wicket.version : 1.4.22
    lucene.version : 5.5.2
 -  jgit.version   : 4.1.1.201511131810-r
 +  jgit.version   : 4.5.7.201904151645-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
@@@ -140,9 -138,17 +140,17 @@@ dependencies
  - compile 'log4j:log4j:1.2.17' :war :fedclient :manager
  - compile 'org.slf4j:slf4j-api:${slf4j.version}' :war :fedclient :manager
  - compile 'org.slf4j:slf4j-log4j12:${slf4j.version}' :war :fedclient :manager
 -- compile 'com.sun.mail:javax.mail:1.5.1' :war
 +- compile 'com.sun.mail:javax.mail:1.5.6' :war
  - compile 'javax.servlet:javax.servlet-api:3.1.0' :fedclient
- - compile 'org.eclipse.jetty.aggregate:jetty-all:${jetty.version}' @jar
+ - compile 'org.eclipse.jetty:jetty-servlet:${jetty.version}' @jar
+ - compile 'org.eclipse.jetty:jetty-security:${jetty.version}' @jar
+ - compile 'org.eclipse.jetty:jetty-server:${jetty.version}' @jar
+ - compile 'org.eclipse.jetty:jetty-continuation:${jetty.version}' @jar
+ - compile 'org.eclipse.jetty:jetty-http:${jetty.version}' @jar
+ - compile 'org.eclipse.jetty:jetty-io:${jetty.version}' @jar
+ - compile 'org.eclipse.jetty:jetty-util:${jetty.version}' @jar
+ - compile 'org.eclipse.jetty:jetty-webapp:${jetty.version}' @jar
+ - compile 'org.eclipse.jetty:jetty-xml:${jetty.version}' @jar
  - compile 'org.apache.wicket:wicket:${wicket.version}' :war !org.mockito
  - compile 'org.apache.wicket:wicket-auth-roles:${wicket.version}' :war !org.mockito
  - compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito

diff --cc gitblit.iml
index e78bdebf4ff57f9e9a9e4a2b085509d623e5ec0f,1f4aa248380c6af5cbc53ff4f14475a32debc34d..a6ac904598ef2f70410f63850e88a8ec64041414
--- 1/gitblit.iml
--- 2/gitblit.iml
+++ b/gitblit.iml
@@@ -222,13 -136,13 +222,101 @@@
        </library>
      </orderEntry>
      <orderEntry type="module-library">
-       <library name="jetty-all-9.2.30.v20200428.jar">
 -      <library name="jetty-all-9.2.13.v20150730.jar">
++      <library name="jetty-servlet-9.3.16.v20170120.jar">
 +        <CLASSES>
-           <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.30.v20200428.jar!/" />
++          <root url="jar://$MODULE_DIR$/ext/jetty-servlet-9.3.16.v20170120.jar!/" />
 +        </CLASSES>
 +        <JAVADOC />
 +        <SOURCES>
-           <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.30.v20200428.jar!/" />
++          <root url="jar://$MODULE_DIR$/ext/src/jetty-servlet-9.3.16.v20170120.jar!/" />
++        </SOURCES>
++      </library>
++    </orderEntry>
++    <orderEntry type="module-library">
++      <library name="jetty-security-9.3.16.v20170120.jar">
++        <CLASSES>
++          <root url="jar://$MODULE_DIR$/ext/jetty-security-9.3.16.v20170120.jar!/" />
++        </CLASSES>
++        <JAVADOC />
++        <SOURCES>
++          <root url="jar://$MODULE_DIR$/ext/src/jetty-security-9.3.16.v20170120.jar!/" />
++        </SOURCES>
++      </library>
++    </orderEntry>
++    <orderEntry type="module-library">
++      <library name="jetty-server-9.3.16.v20170120.jar">
+         <CLASSES>
 -          <root url="jar://$MODULE_DIR$/ext/jetty-all-9.2.13.v20150730.jar!/" />
++          <root url="jar://$MODULE_DIR$/ext/jetty-server-9.3.16.v20170120.jar!/" />
+         </CLASSES>
+         <JAVADOC />
+         <SOURCES>
 -          <root url="jar://$MODULE_DIR$/ext/src/jetty-all-9.2.13.v20150730.jar!/" />
++          <root url="jar://$MODULE_DIR$/ext/src/jetty-server-9.3.16.v20170120.jar!/" />
++        </SOURCES>
++      </library>
++    </orderEntry>
++    <orderEntry type="module-library">
++      <library name="jetty-continuation-9.3.16.v20170120.jar">
++        <CLASSES>
++          <root url="jar://$MODULE_DIR$/ext/jetty-continuation-9.3.16.v20170120.jar!/" />
++        </CLASSES>
++        <JAVADOC />
++        <SOURCES>
++          <root url="jar://$MODULE_DIR$/ext/src/jetty-continuation-9.3.16.v20170120.jar!/" />
++        </SOURCES>
++      </library>
++    </orderEntry>
++    <orderEntry type="module-library">
++      <library name="jetty-http-9.3.16.v20170120.jar">
++        <CLASSES>
++          <root url="jar://$MODULE_DIR$/ext/jetty-http-9.3.16.v20170120.jar!/" />
++        </CLASSES>
++        <JAVADOC />
++        <SOURCES>
++          <root url="jar://$MODULE_DIR$/ext/src/jetty-http-9.3.16.v20170120.jar!/" />
++        </SOURCES>
++      </library>
++    </orderEntry>
++    <orderEntry type="module-library">
++      <library name="jetty-io-9.3.16.v20170120.jar">
++        <CLASSES>
++          <root url="jar://$MODULE_DIR$/ext/jetty-io-9.3.16.v20170120.jar!/" />
++        </CLASSES>
++        <JAVADOC />
++        <SOURCES>
++          <root url="jar://$MODULE_DIR$/ext/src/jetty-io-9.3.16.v20170120.jar!/" />
++        </SOURCES>
++      </library>
++    </orderEntry>
++    <orderEntry type="module-library">
++      <library name="jetty-util-9.3.16.v20170120.jar">
++        <CLASSES>
++          <root url="jar://$MODULE_DIR$/ext/jetty-util-9.3.16.v20170120.jar!/" />
++        </CLASSES>
++        <JAVADOC />
++        <SOURCES>
++          <root url="jar://$MODULE_DIR$/ext/src/jetty-util-9.3.16.v20170120.jar!/" />
++        </SOURCES>
++      </library>
++    </orderEntry>
++    <orderEntry type="module-library">
++      <library name="jetty-webapp-9.3.16.v20170120.jar">
++        <CLASSES>
++          <root url="jar://$MODULE_DIR$/ext/jetty-webapp-9.3.16.v20170120.jar!/" />
++        </CLASSES>
++        <JAVADOC />
++        <SOURCES>
++          <root url="jar://$MODULE_DIR$/ext/src/jetty-webapp-9.3.16.v20170120.jar!/" />
++        </SOURCES>
++      </library>
++    </orderEntry>
++    <orderEntry type="module-library">
++      <library name="jetty-xml-9.3.16.v20170120.jar">
++        <CLASSES>
++          <root url="jar://$MODULE_DIR$/ext/jetty-xml-9.3.16.v20170120.jar!/" />
++        </CLASSES>
++        <JAVADOC />
++        <SOURCES>
++          <root url="jar://$MODULE_DIR$/ext/src/jetty-xml-9.3.16.v20170120.jar!/" />
          </SOURCES>
        </library>
      </orderEntry>