Skip to content

Commit c706290

Browse files
flaixflaix
committed
dep: Update mina-core, commons-compress and guava
Update dependencies: Mina Core, Guava and commons-compress. These don't need any other adjustments.
1 parent 251d99e commit c706290

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎.classpath

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<classpathentry kind="lib" path="ext/guice-5.1.0.jar" sourcepath="ext/src/guice-5.1.0.jar" />
1010
<classpathentry kind="lib" path="ext/javax.inject-1.jar" sourcepath="ext/src/javax.inject-1.jar" />
1111
<classpathentry kind="lib" path="ext/aopalliance-1.0.jar" sourcepath="ext/src/aopalliance-1.0.jar" />
12-
<classpathentry kind="lib" path="ext/guava-31.1-jre.jar" sourcepath="ext/src/guava-31.1-jre.jar" />
12+
<classpathentry kind="lib" path="ext/guava-32.1.3-jre.jar" sourcepath="ext/src/guava-32.1.3-jre.jar" />
1313
<classpathentry kind="lib" path="ext/failureaccess-1.0.1.jar" sourcepath="ext/src/failureaccess-1.0.1.jar" />
1414
<classpathentry kind="lib" path="ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
1515
<classpathentry kind="lib" path="ext/jsr305-3.0.2.jar" sourcepath="ext/src/jsr305-3.0.2.jar" />
16-
<classpathentry kind="lib" path="ext/checker-qual-3.12.0.jar" sourcepath="ext/src/checker-qual-3.12.0.jar" />
17-
<classpathentry kind="lib" path="ext/error_prone_annotations-2.11.0.jar" sourcepath="ext/src/error_prone_annotations-2.11.0.jar" />
18-
<classpathentry kind="lib" path="ext/j2objc-annotations-1.3.jar" sourcepath="ext/src/j2objc-annotations-1.3.jar" />
16+
<classpathentry kind="lib" path="ext/checker-qual-3.37.0.jar" sourcepath="ext/src/checker-qual-3.37.0.jar" />
17+
<classpathentry kind="lib" path="ext/error_prone_annotations-2.21.1.jar" sourcepath="ext/src/error_prone_annotations-2.21.1.jar" />
18+
<classpathentry kind="lib" path="ext/j2objc-annotations-2.8.jar" sourcepath="ext/src/j2objc-annotations-2.8.jar" />
1919
<classpathentry kind="lib" path="ext/guice-servlet-5.1.0-gb2.jar" sourcepath="ext/src/guice-servlet-5.1.0-gb2.jar" />
2020
<classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
2121
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
@@ -72,15 +72,15 @@
7272
<classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.69.jar" sourcepath="ext/src/bcpkix-jdk15on-1.69.jar" />
7373
<classpathentry kind="lib" path="ext/eddsa-0.2.0.jar" sourcepath="ext/src/eddsa-0.2.0.jar" />
7474
<classpathentry kind="lib" path="ext/sshd-core-1.7.0.jar" sourcepath="ext/src/sshd-core-1.7.0.jar" />
75-
<classpathentry kind="lib" path="ext/mina-core-2.0.21.jar" sourcepath="ext/src/mina-core-2.0.21.jar" />
75+
<classpathentry kind="lib" path="ext/mina-core-2.0.25.jar" sourcepath="ext/src/mina-core-2.0.25.jar" />
7676
<classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
7777
<classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
7878
<classpathentry kind="lib" path="ext/gson-2.10.jar" sourcepath="ext/src/gson-2.10.jar" />
7979
<classpathentry kind="lib" path="ext/groovy-all-2.4.4.jar" sourcepath="ext/src/groovy-all-2.4.4.jar" />
8080
<classpathentry kind="lib" path="ext/unboundid-ldapsdk-2.3.8.jar" sourcepath="ext/src/unboundid-ldapsdk-2.3.8.jar" />
8181
<classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0.jar" />
8282
<classpathentry kind="lib" path="ext/jcalendar-1.3.2.jar" />
83-
<classpathentry kind="lib" path="ext/commons-compress-1.22.jar" sourcepath="ext/src/commons-compress-1.22.jar" />
83+
<classpathentry kind="lib" path="ext/commons-compress-1.24.0.jar" sourcepath="ext/src/commons-compress-1.24.0.jar" />
8484
<classpathentry kind="lib" path="ext/commons-io-2.11.0.jar" sourcepath="ext/src/commons-io-2.11.0.jar" />
8585
<classpathentry kind="lib" path="ext/force-partner-api-24.0.0.jar" sourcepath="ext/src/force-partner-api-24.0.0.jar" />
8686
<classpathentry kind="lib" path="ext/force-wsc-24.0.0.jar" sourcepath="ext/src/force-wsc-24.0.0.jar" />

‎build.moxie

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ properties: {
115115
selenium.version : 2.28.0
116116
wikitext.version : 1.4
117117
sshd.version: 1.7.0
118-
mina.version: 2.0.21
118+
mina.version: 2.0.25
119119
guice.version : 5.1.0
120120
# Gitblit maintains a fork of guice-servlet
121121
guice-servlet.version : 5.1.0-gb2
@@ -135,7 +135,7 @@ properties: {
135135
dependencies:
136136
- compile 'com.google.inject:guice:${guice.version}' :war :fedclient
137137
- compile 'com.google.inject.extensions:guice-servlet:${guice-servlet.version}' :war
138-
- compile 'com.google.guava:guava:31.1-jre' :war :fedclient
138+
- compile 'com.google.guava:guava:32.1.3-jre' :war :fedclient
139139
- compile 'com.intellij:annotations:12.0' :war
140140
- compile 'log4j:log4j:1.2.17' :war :fedclient :manager
141141
- compile 'org.slf4j:slf4j-api:${slf4j.version}' :war :fedclient :manager
@@ -180,7 +180,7 @@ dependencies:
180180
- compile 'com.unboundid:unboundid-ldapsdk:2.3.8' :war
181181
- compile 'org.apache.ivy:ivy:2.2.0' :war
182182
- compile 'com.toedter:jcalendar:1.3.2' :authority
183-
- compile 'org.apache.commons:commons-compress:1.22' :war
183+
- compile 'org.apache.commons:commons-compress:1.24.0' :war
184184
- compile 'commons-io:commons-io:2.11.0' :war
185185
- compile 'com.force.api:force-partner-api:24.0.0' :war
186186
- compile 'org.freemarker:freemarker:2.3.22' :war

‎gitblit.iml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
</library>
4949
</orderEntry>
5050
<orderEntry type="module-library">
51-
<library name="guava-31.1-jre.jar">
51+
<library name="guava-32.1.3-jre.jar">
5252
<CLASSES>
53-
<root url="jar://$MODULE_DIR$/ext/guava-31.1-jre.jar!/" />
53+
<root url="jar://$MODULE_DIR$/ext/guava-32.1.3-jre.jar!/" />
5454
</CLASSES>
5555
<JAVADOC />
5656
<SOURCES>
57-
<root url="jar://$MODULE_DIR$/ext/src/guava-31.1-jre.jar!/" />
57+
<root url="jar://$MODULE_DIR$/ext/src/guava-32.1.3-jre.jar!/" />
5858
</SOURCES>
5959
</library>
6060
</orderEntry>
@@ -90,35 +90,35 @@
9090
</library>
9191
</orderEntry>
9292
<orderEntry type="module-library">
93-
<library name="checker-qual-3.12.0.jar">
93+
<library name="checker-qual-3.37.0.jar">
9494
<CLASSES>
95-
<root url="jar://$MODULE_DIR$/ext/checker-qual-3.12.0.jar!/" />
95+
<root url="jar://$MODULE_DIR$/ext/checker-qual-3.37.0.jar!/" />
9696
</CLASSES>
9797
<JAVADOC />
9898
<SOURCES>
99-
<root url="jar://$MODULE_DIR$/ext/src/checker-qual-3.12.0.jar!/" />
99+
<root url="jar://$MODULE_DIR$/ext/src/checker-qual-3.37.0.jar!/" />
100100
</SOURCES>
101101
</library>
102102
</orderEntry>
103103
<orderEntry type="module-library">
104-
<library name="error_prone_annotations-2.11.0.jar">
104+
<library name="error_prone_annotations-2.21.1.jar">
105105
<CLASSES>
106-
<root url="jar://$MODULE_DIR$/ext/error_prone_annotations-2.11.0.jar!/" />
106+
<root url="jar://$MODULE_DIR$/ext/error_prone_annotations-2.21.1.jar!/" />
107107
</CLASSES>
108108
<JAVADOC />
109109
<SOURCES>
110-
<root url="jar://$MODULE_DIR$/ext/src/error_prone_annotations-2.11.0.jar!/" />
110+
<root url="jar://$MODULE_DIR$/ext/src/error_prone_annotations-2.21.1.jar!/" />
111111
</SOURCES>
112112
</library>
113113
</orderEntry>
114114
<orderEntry type="module-library">
115-
<library name="j2objc-annotations-1.3.jar">
115+
<library name="j2objc-annotations-2.8.jar">
116116
<CLASSES>
117-
<root url="jar://$MODULE_DIR$/ext/j2objc-annotations-1.3.jar!/" />
117+
<root url="jar://$MODULE_DIR$/ext/j2objc-annotations-2.8.jar!/" />
118118
</CLASSES>
119119
<JAVADOC />
120120
<SOURCES>
121-
<root url="jar://$MODULE_DIR$/ext/src/j2objc-annotations-1.3.jar!/" />
121+
<root url="jar://$MODULE_DIR$/ext/src/j2objc-annotations-2.8.jar!/" />
122122
</SOURCES>
123123
</library>
124124
</orderEntry>
@@ -737,13 +737,13 @@
737737
</library>
738738
</orderEntry>
739739
<orderEntry type="module-library">
740-
<library name="mina-core-2.0.21.jar">
740+
<library name="mina-core-2.0.25.jar">
741741
<CLASSES>
742-
<root url="jar://$MODULE_DIR$/ext/mina-core-2.0.21.jar!/" />
742+
<root url="jar://$MODULE_DIR$/ext/mina-core-2.0.25.jar!/" />
743743
</CLASSES>
744744
<JAVADOC />
745745
<SOURCES>
746-
<root url="jar://$MODULE_DIR$/ext/src/mina-core-2.0.21.jar!/" />
746+
<root url="jar://$MODULE_DIR$/ext/src/mina-core-2.0.25.jar!/" />
747747
</SOURCES>
748748
</library>
749749
</orderEntry>
@@ -823,13 +823,13 @@
823823
</library>
824824
</orderEntry>
825825
<orderEntry type="module-library">
826-
<library name="commons-compress-1.22.jar">
826+
<library name="commons-compress-1.24.0.jar">
827827
<CLASSES>
828-
<root url="jar://$MODULE_DIR$/ext/commons-compress-1.22.jar!/" />
828+
<root url="jar://$MODULE_DIR$/ext/commons-compress-1.24.0.jar!/" />
829829
</CLASSES>
830830
<JAVADOC />
831831
<SOURCES>
832-
<root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.22.jar!/" />
832+
<root url="jar://$MODULE_DIR$/ext/src/commons-compress-1.24.0.jar!/" />
833833
</SOURCES>
834834
</library>
835835
</orderEntry>

0 commit comments

Comments
 (0)