diff options
author | Florian Zschocke <f.zschocke+git@gmail.com> | 2022-11-11 12:56:47 +0100 |
---|---|---|
committer | Florian Zschocke <f.zschocke+git@gmail.com> | 2022-11-11 12:56:47 +0100 |
commit | 3198339587e7c3056d022ecff2d271b576953f2e (patch) | |
tree | dab8dea2007aabcaea6fc54afd3324b83c7ba8aa | |
parent | 30abff544589292fbead49d2b04a96d604938eb0 (diff) | |
download | gitblit-3198339587e7c3056d022ecff2d271b576953f2e.tar.gz gitblit-3198339587e7c3056d022ecff2d271b576953f2e.zip |
deps: Update JGit to 4.11.9.201909030838-r and other dependencies
Update JGit, and also update other dependencies where the 4.11 JGit
version uses newer versions than we do:
commond-codec updated to 1.9
commons-compress updated to 1.15
gson updated to 2.8.2
-rw-r--r-- | .classpath | 20 | ||||
-rw-r--r-- | build.moxie | 8 | ||||
-rw-r--r-- | gitblit.iml | 76 |
3 files changed, 52 insertions, 52 deletions
@@ -58,14 +58,15 @@ <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.8.0.201706111038-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.8.0.201706111038-r.jar" /> + <classpathentry kind="lib" path="ext/org.eclipse.jgit-4.11.9.201909030838-r.jar" sourcepath="ext/src/org.eclipse.jgit-4.11.9.201909030838-r.jar" /> <classpathentry kind="lib" path="ext/jsch-0.1.54.jar" sourcepath="ext/src/jsch-0.1.54.jar" /> + <classpathentry kind="lib" path="ext/jzlib-1.1.1.jar" sourcepath="ext/src/jzlib-1.1.1.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.8.0.201706111038-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.8.0.201706111038-r.jar" /> + <classpathentry kind="lib" path="ext/httpclient-4.5.2.jar" sourcepath="ext/src/httpclient-4.5.2.jar" /> + <classpathentry kind="lib" path="ext/httpcore-4.4.4.jar" sourcepath="ext/src/httpcore-4.4.4.jar" /> + <classpathentry kind="lib" path="ext/commons-logging-1.2.jar" sourcepath="ext/src/commons-logging-1.2.jar" /> + <classpathentry kind="lib" path="ext/commons-codec-1.9.jar" sourcepath="ext/src/commons-codec-1.9.jar" /> + <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-4.11.9.201909030838-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-4.11.9.201909030838-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" /> @@ -75,13 +76,13 @@ <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" /> + <classpathentry kind="lib" path="ext/gson-2.8.2.jar" sourcepath="ext/src/gson-2.8.2.jar" /> <classpathentry kind="lib" path="ext/groovy-all-2.4.4.jar" sourcepath="ext/src/groovy-all-2.4.4.jar" /> <classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.8.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.8.jar" /> <classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0.jar" /> <classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" /> - <classpathentry kind="lib" path="ext/commons-compress-1.4.1.jar" sourcepath="ext/src/commons-compress-1.4.1.jar" /> - <classpathentry kind="lib" path="ext/xz-1.0.jar" sourcepath="ext/src/xz-1.0.jar" /> + <classpathentry kind="lib" path="ext/commons-compress-1.15.jar" sourcepath="ext/src/commons-compress-1.15.jar" /> + <classpathentry kind="lib" path="ext/objenesis-2.6.jar" sourcepath="ext/src/objenesis-2.6.jar" /> <classpathentry kind="lib" path="ext/commons-io-2.2.jar" sourcepath="ext/src/commons-io-2.2.jar" /> <classpathentry kind="lib" path="ext/force-partner-api-24.0.0.jar" sourcepath="ext/src/force-partner-api-24.0.0.jar" /> <classpathentry kind="lib" path="ext/force-wsc-24.0.0.jar" sourcepath="ext/src/force-wsc-24.0.0.jar" /> @@ -112,7 +113,6 @@ <classpathentry kind="lib" path="ext/mockito-core-2.28.2.jar" sourcepath="ext/src/mockito-core-2.28.2.jar" /> <classpathentry kind="lib" path="ext/byte-buddy-1.9.10.jar" sourcepath="ext/src/byte-buddy-1.9.10.jar" /> <classpathentry kind="lib" path="ext/byte-buddy-agent-1.9.10.jar" sourcepath="ext/src/byte-buddy-agent-1.9.10.jar" /> - <classpathentry kind="lib" path="ext/objenesis-2.6.jar" sourcepath="ext/src/objenesis-2.6.jar" /> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" /> <classpathentry kind="src" path="src/main/dagger"> <attributes> diff --git a/build.moxie b/build.moxie index cb4ddcc5..dd26d3f6 100644 --- a/build.moxie +++ b/build.moxie @@ -109,7 +109,7 @@ properties: { slf4j.version : 1.7.29 wicket.version : 1.4.22 lucene.version : 5.5.2 - jgit.version : 4.8.0.201706111038-r + jgit.version : 4.11.9.201909030838-r groovy.version : 2.4.4 bouncycastle.version : 1.69 selenium.version : 2.28.0 @@ -175,19 +175,19 @@ dependencies: - compile 'org.apache.sshd:sshd-core:${sshd.version}' :war !org.easymock - compile 'org.apache.mina:mina-core:${mina.version}' :war !org.easymock - compile 'rome:rome:0.9' :war :manager :api -- compile 'com.google.code.gson:gson:2.3.1' :war :fedclient :manager :api +- compile 'com.google.code.gson:gson:2.8.2' :war :fedclient :manager :api - compile 'org.codehaus.groovy:groovy-all:${groovy.version}' :war - compile 'com.unboundid:unboundid-ldapsdk:2.3.8' :war - compile 'org.apache.ivy:ivy:2.2.0' :war - compile 'com.toedter:jcalendar:1.3.2' :authority -- compile 'org.apache.commons:commons-compress:1.4.1' :war +- compile 'org.apache.commons:commons-compress:1.15' :war - compile 'commons-io:commons-io:2.2' :war - compile 'com.force.api:force-partner-api:24.0.0' :war - compile 'org.freemarker:freemarker:2.3.22' :war - compile 'com.github.dblock.waffle:waffle-jna:1.7.3' :war - compile 'org.kohsuke:libpam4j:1.8' :war - compile 'args4j:args4j:2.0.29' :war :fedclient -- compile 'commons-codec:commons-codec:1.7' :war +- compile 'commons-codec:commons-codec:1.9' :war - compile 'redis.clients:jedis:2.6.2' :war - compile 'ro.fortsoft.pf4j:pf4j:0.9.0' :war - compile 'org.apache.tika:tika-core:1.5' :war diff --git a/gitblit.iml b/gitblit.iml index eebba6a7..2f1bfb32 100644 --- a/gitblit.iml +++ b/gitblit.iml @@ -583,13 +583,13 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="org.eclipse.jgit-4.8.0.201706111038-r.jar"> + <library name="org.eclipse.jgit-4.11.9.201909030838-r.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.8.0.201706111038-r.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit-4.11.9.201909030838-r.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.8.0.201706111038-r.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit-4.11.9.201909030838-r.jar!/" /> </SOURCES> </library> </orderEntry> @@ -605,6 +605,17 @@ </library> </orderEntry> <orderEntry type="module-library"> + <library name="jzlib-1.1.1.jar"> + <CLASSES> + <root url="jar://$MODULE_DIR$/ext/jzlib-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/ext/src/jzlib-1.1.1.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> <library name="JavaEWAH-1.1.6.jar"> <CLASSES> <root url="jar://$MODULE_DIR$/ext/JavaEWAH-1.1.6.jar!/" /> @@ -616,57 +627,57 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="httpclient-4.3.6.jar"> + <library name="httpclient-4.5.2.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/httpclient-4.3.6.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/httpclient-4.5.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.3.6.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/httpclient-4.5.2.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="httpcore-4.3.3.jar"> + <library name="httpcore-4.4.4.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/httpcore-4.3.3.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/httpcore-4.4.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.3.3.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/httpcore-4.4.4.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="commons-logging-1.1.3.jar"> + <library name="commons-logging-1.2.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/commons-logging-1.1.3.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/commons-logging-1.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.1.3.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/commons-logging-1.2.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="commons-codec-1.7.jar"> + <library name="commons-codec-1.9.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/commons-codec-1.7.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/commons-codec-1.9.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/commons-codec-1.7.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/commons-codec-1.9.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="org.eclipse.jgit.http.server-4.8.0.201706111038-r.jar"> + <library name="org.eclipse.jgit.http.server-4.11.9.201909030838-r.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.8.0.201706111038-r.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/org.eclipse.jgit.http.server-4.11.9.201909030838-r.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-4.8.0.201706111038-r.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/org.eclipse.jgit.http.server-4.11.9.201909030838-r.jar!/" /> </SOURCES> </library> </orderEntry> @@ -770,13 +781,13 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="gson-2.3.1.jar"> + <library name="gson-2.8.2.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/gson-2.3.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/gson-2.8.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/gson-2.3.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/gson-2.8.2.jar!/" /> </SOURCES> </library> </orderEntry> @@ -823,24 +834,24 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="commons-compress-1.4.1.jar"> + <library name="commons-compress-1.15.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/commons-compress-1.4.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/commons-compress-1.15.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.4.1.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.15.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> - <library name="xz-1.0.jar"> + <library name="objenesis-2.6.jar"> <CLASSES> - <root url="jar://$MODULE_DIR$/ext/xz-1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/objenesis-2.6.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/xz-1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/ext/src/objenesis-2.6.jar!/" /> </SOURCES> </library> </orderEntry> @@ -1174,17 +1185,6 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library" scope="TEST"> - <library name="objenesis-2.6.jar"> - <CLASSES> - <root url="jar://$MODULE_DIR$/ext/objenesis-2.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/ext/src/objenesis-2.6.jar!/" /> - </SOURCES> - </library> - </orderEntry> <orderEntry type="inheritedJdk" /> </component> </module> |