mirrors
/
gitblit
mirror of https://github.com/gitblit/gitblit.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 43 Wiki Activity
Browse Source

dep: Update mina-core, commons-compress and guava 

Update dependencies: Mina Core, Guava and commons-compress.
These don't need any other adjustments.
pull/1461/head
Florian Zschocke 6 months ago
parent
251d99ed6f
commit
c706290a08
3 changed files with 27 additions and 27 deletions
Split View Show Diff Stats
  1. 6
    6
      .classpath
  2. 3
    3
      build.moxie
  3. 18
    18
      gitblit.iml

+ 6
- 6
.classpath View File

@@ -9,13 +9,13 @@
<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-31.1-jre.jar" sourcepath="ext/src/guava-31.1-jre.jar" />
<classpathentry kind="lib" path="ext/guava-32.1.3-jre.jar" sourcepath="ext/src/guava-32.1.3-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-3.12.0.jar" sourcepath="ext/src/checker-qual-3.12.0.jar" />
<classpathentry kind="lib" path="ext/error_prone_annotations-2.11.0.jar" sourcepath="ext/src/error_prone_annotations-2.11.0.jar" />
<classpathentry kind="lib" path="ext/j2objc-annotations-1.3.jar" sourcepath="ext/src/j2objc-annotations-1.3.jar" />
<classpathentry kind="lib" path="ext/checker-qual-3.37.0.jar" sourcepath="ext/src/checker-qual-3.37.0.jar" />
<classpathentry kind="lib" path="ext/error_prone_annotations-2.21.1.jar" sourcepath="ext/src/error_prone_annotations-2.21.1.jar" />
<classpathentry kind="lib" path="ext/j2objc-annotations-2.8.jar" sourcepath="ext/src/j2objc-annotations-2.8.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/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" />
@@ -72,7 +72,7 @@
<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/mina-core-2.0.25.jar" sourcepath="ext/src/mina-core-2.0.25.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.10.jar" sourcepath="ext/src/gson-2.10.jar" />
@@ -80,7 +80,7 @@
<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.22.jar" sourcepath="ext/src/commons-compress-1.22.jar" />
<classpathentry kind="lib" path="ext/commons-compress-1.24.0.jar" sourcepath="ext/src/commons-compress-1.24.0.jar" />
<classpathentry kind="lib" path="ext/commons-io-2.11.0.jar" sourcepath="ext/src/commons-io-2.11.0.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" />

+ 3
- 3
build.moxie View File

@@ -115,7 +115,7 @@ properties: {
selenium.version : 2.28.0
wikitext.version : 1.4
sshd.version: 1.7.0
mina.version: 2.0.21
mina.version: 2.0.25
guice.version : 5.1.0
# Gitblit maintains a fork of guice-servlet
guice-servlet.version : 5.1.0-gb2
@@ -135,7 +135,7 @@ properties: {
dependencies:
- compile 'com.google.inject:guice:${guice.version}' :war :fedclient
- compile 'com.google.inject.extensions:guice-servlet:${guice-servlet.version}' :war
- compile 'com.google.guava:guava:31.1-jre' :war :fedclient
- compile 'com.google.guava:guava:32.1.3-jre' :war :fedclient
- compile 'com.intellij:annotations:12.0' :war
- compile 'log4j:log4j:1.2.17' :war :fedclient :manager
- compile 'org.slf4j:slf4j-api:${slf4j.version}' :war :fedclient :manager
@@ -180,7 +180,7 @@ dependencies:
- 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.22' :war
- compile 'org.apache.commons:commons-compress:1.24.0' :war
- compile 'commons-io:commons-io:2.11.0' :war
- compile 'com.force.api:force-partner-api:24.0.0' :war
- compile 'org.freemarker:freemarker:2.3.22' :war

+ 18
- 18
gitblit.iml View File

@@ -48,13 +48,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="guava-31.1-jre.jar">
<library name="guava-32.1.3-jre.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/guava-31.1-jre.jar!/" />
<root url="jar://$MODULE_DIR$/ext/guava-32.1.3-jre.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/guava-31.1-jre.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/guava-32.1.3-jre.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -90,35 +90,35 @@
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="checker-qual-3.12.0.jar">
<library name="checker-qual-3.37.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/checker-qual-3.12.0.jar!/" />
<root url="jar://$MODULE_DIR$/ext/checker-qual-3.37.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/checker-qual-3.12.0.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/checker-qual-3.37.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="error_prone_annotations-2.11.0.jar">
<library name="error_prone_annotations-2.21.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/error_prone_annotations-2.11.0.jar!/" />
<root url="jar://$MODULE_DIR$/ext/error_prone_annotations-2.21.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/error_prone_annotations-2.11.0.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/error_prone_annotations-2.21.1.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="j2objc-annotations-1.3.jar">
<library name="j2objc-annotations-2.8.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/j2objc-annotations-1.3.jar!/" />
<root url="jar://$MODULE_DIR$/ext/j2objc-annotations-2.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/j2objc-annotations-1.3.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/j2objc-annotations-2.8.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -737,13 +737,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="mina-core-2.0.21.jar">
<library name="mina-core-2.0.25.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/mina-core-2.0.21.jar!/" />
<root url="jar://$MODULE_DIR$/ext/mina-core-2.0.25.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/mina-core-2.0.21.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/mina-core-2.0.25.jar!/" />
</SOURCES>
</library>
</orderEntry>
@@ -823,13 +823,13 @@
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="commons-compress-1.22.jar">
<library name="commons-compress-1.24.0.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/commons-compress-1.22.jar!/" />
<root url="jar://$MODULE_DIR$/ext/commons-compress-1.24.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.22.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.24.0.jar!/" />
</SOURCES>
</library>
</orderEntry>

Write Preview
Loading…
Cancel
Save