Skip to content

Commit 413ed11

Browse files
flaixflaix
committed
deps: Update Guice version to 5.1.0
Update Guice to 5.1.0. This version is compatible with Java 17. The gitblit patch of the servlet extension was ported to Guice 5.1.0, too. The update of Guice requires an update of the Guava version, too. Thus Guava is updated to 27.0.1-jar.
1 parent 5333c5a commit 413ed11

File tree

4 files changed

+99
-15
lines changed

4 files changed

+99
-15
lines changed

Diff for: ‎.classpath

+10-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@
66
<classpathentry kind="src" path="src/test/bugtraq" output="bin/test-classes" />
77
<classpathentry kind="src" path="src/main/resources" />
88
<classpathentry kind="src" path="src/test/resources" output="bin/test-classes" />
9-
<classpathentry kind="lib" path="ext/guice-4.0.jar" sourcepath="ext/src/guice-4.0.jar" />
9+
<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-18.0.jar" sourcepath="ext/src/guava-18.0.jar" />
13-
<classpathentry kind="lib" path="ext/guice-servlet-4.0-gb2.jar" sourcepath="ext/src/guice-servlet-4.0-gb2.jar" />
12+
<classpathentry kind="lib" path="ext/guava-27.0.1-jre.jar" sourcepath="ext/src/guava-27.0.1-jre.jar" />
13+
<classpathentry kind="lib" path="ext/failureaccess-1.0.1.jar" sourcepath="ext/src/failureaccess-1.0.1.jar" />
14+
<classpathentry kind="lib" path="ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
15+
<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-2.5.2.jar" sourcepath="ext/src/checker-qual-2.5.2.jar" />
17+
<classpathentry kind="lib" path="ext/error_prone_annotations-2.2.0.jar" sourcepath="ext/src/error_prone_annotations-2.2.0.jar" />
18+
<classpathentry kind="lib" path="ext/j2objc-annotations-1.1.jar" sourcepath="ext/src/j2objc-annotations-1.1.jar" />
19+
<classpathentry kind="lib" path="ext/guice-servlet-5.1.0-gb2.jar" sourcepath="ext/src/guice-servlet-5.1.0-gb2.jar" />
20+
<classpathentry kind="lib" path="ext/animal-sniffer-annotations-1.17.jar" sourcepath="ext/src/animal-sniffer-annotations-1.17.jar" />
1421
<classpathentry kind="lib" path="ext/annotations-12.0.jar" sourcepath="ext/src/annotations-12.0.jar" />
1522
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
1623
<classpathentry kind="lib" path="ext/slf4j-api-1.7.29.jar" sourcepath="ext/src/slf4j-api-1.7.29.jar" />

Diff for: ‎build.moxie

+3-3
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ properties: {
116116
wikitext.version : 1.4
117117
sshd.version: 1.7.0
118118
mina.version: 2.0.21
119-
guice.version : 4.0
119+
guice.version : 5.1.0
120120
# Gitblit maintains a fork of guice-servlet
121-
guice-servlet.version : 4.0-gb2
121+
guice-servlet.version : 5.1.0-gb2
122122
}
123123

124124
# Dependencies
@@ -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:18.0' :war :fedclient
138+
- compile 'com.google.guava:guava:27.0.1-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

Diff for: ‎gitblit.iml

+84-9
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
</content>
1616
<orderEntry type="sourceFolder" forTests="false" />
1717
<orderEntry type="module-library">
18-
<library name="guice-4.0.jar">
18+
<library name="guice-5.1.0.jar">
1919
<CLASSES>
20-
<root url="jar://$MODULE_DIR$/ext/guice-4.0.jar!/" />
20+
<root url="jar://$MODULE_DIR$/ext/guice-5.1.0.jar!/" />
2121
</CLASSES>
2222
<JAVADOC />
2323
<SOURCES>
24-
<root url="jar://$MODULE_DIR$/ext/src/guice-4.0.jar!/" />
24+
<root url="jar://$MODULE_DIR$/ext/src/guice-5.1.0.jar!/" />
2525
</SOURCES>
2626
</library>
2727
</orderEntry>
@@ -48,24 +48,99 @@
4848
</library>
4949
</orderEntry>
5050
<orderEntry type="module-library">
51-
<library name="guava-18.0.jar">
51+
<library name="guava-27.0.1-jre.jar">
5252
<CLASSES>
53-
<root url="jar://$MODULE_DIR$/ext/guava-18.0.jar!/" />
53+
<root url="jar://$MODULE_DIR$/ext/guava-27.0.1-jre.jar!/" />
5454
</CLASSES>
5555
<JAVADOC />
5656
<SOURCES>
57-
<root url="jar://$MODULE_DIR$/ext/src/guava-18.0.jar!/" />
57+
<root url="jar://$MODULE_DIR$/ext/src/guava-27.0.1-jre.jar!/" />
5858
</SOURCES>
5959
</library>
6060
</orderEntry>
6161
<orderEntry type="module-library">
62-
<library name="guice-servlet-4.0-gb2.jar">
62+
<library name="failureaccess-1.0.1.jar">
6363
<CLASSES>
64-
<root url="jar://$MODULE_DIR$/ext/guice-servlet-4.0-gb2.jar!/" />
64+
<root url="jar://$MODULE_DIR$/ext/failureaccess-1.0.1.jar!/" />
6565
</CLASSES>
6666
<JAVADOC />
6767
<SOURCES>
68-
<root url="jar://$MODULE_DIR$/ext/src/guice-servlet-4.0-gb2.jar!/" />
68+
<root url="jar://$MODULE_DIR$/ext/src/failureaccess-1.0.1.jar!/" />
69+
</SOURCES>
70+
</library>
71+
</orderEntry>
72+
<orderEntry type="module-library">
73+
<library name="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar">
74+
<CLASSES>
75+
<root url="jar://$MODULE_DIR$/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar!/" />
76+
</CLASSES>
77+
<JAVADOC />
78+
<SOURCES />
79+
</library>
80+
</orderEntry>
81+
<orderEntry type="module-library">
82+
<library name="jsr305-3.0.2.jar">
83+
<CLASSES>
84+
<root url="jar://$MODULE_DIR$/ext/jsr305-3.0.2.jar!/" />
85+
</CLASSES>
86+
<JAVADOC />
87+
<SOURCES>
88+
<root url="jar://$MODULE_DIR$/ext/src/jsr305-3.0.2.jar!/" />
89+
</SOURCES>
90+
</library>
91+
</orderEntry>
92+
<orderEntry type="module-library">
93+
<library name="checker-qual-2.5.2.jar">
94+
<CLASSES>
95+
<root url="jar://$MODULE_DIR$/ext/checker-qual-2.5.2.jar!/" />
96+
</CLASSES>
97+
<JAVADOC />
98+
<SOURCES>
99+
<root url="jar://$MODULE_DIR$/ext/src/checker-qual-2.5.2.jar!/" />
100+
</SOURCES>
101+
</library>
102+
</orderEntry>
103+
<orderEntry type="module-library">
104+
<library name="error_prone_annotations-2.2.0.jar">
105+
<CLASSES>
106+
<root url="jar://$MODULE_DIR$/ext/error_prone_annotations-2.2.0.jar!/" />
107+
</CLASSES>
108+
<JAVADOC />
109+
<SOURCES>
110+
<root url="jar://$MODULE_DIR$/ext/src/error_prone_annotations-2.2.0.jar!/" />
111+
</SOURCES>
112+
</library>
113+
</orderEntry>
114+
<orderEntry type="module-library">
115+
<library name="j2objc-annotations-1.1.jar">
116+
<CLASSES>
117+
<root url="jar://$MODULE_DIR$/ext/j2objc-annotations-1.1.jar!/" />
118+
</CLASSES>
119+
<JAVADOC />
120+
<SOURCES>
121+
<root url="jar://$MODULE_DIR$/ext/src/j2objc-annotations-1.1.jar!/" />
122+
</SOURCES>
123+
</library>
124+
</orderEntry>
125+
<orderEntry type="module-library">
126+
<library name="guice-servlet-5.1.0-gb2.jar">
127+
<CLASSES>
128+
<root url="jar://$MODULE_DIR$/ext/guice-servlet-5.1.0-gb2.jar!/" />
129+
</CLASSES>
130+
<JAVADOC />
131+
<SOURCES>
132+
<root url="jar://$MODULE_DIR$/ext/src/guice-servlet-5.1.0-gb2.jar!/" />
133+
</SOURCES>
134+
</library>
135+
</orderEntry>
136+
<orderEntry type="module-library">
137+
<library name="animal-sniffer-annotations-1.17.jar">
138+
<CLASSES>
139+
<root url="jar://$MODULE_DIR$/ext/animal-sniffer-annotations-1.17.jar!/" />
140+
</CLASSES>
141+
<JAVADOC />
142+
<SOURCES>
143+
<root url="jar://$MODULE_DIR$/ext/src/animal-sniffer-annotations-1.17.jar!/" />
69144
</SOURCES>
70145
</library>
71146
</orderEntry>

Diff for: ‎releases.moxie

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ r34: {
1717
additions: ~
1818
dependencyChanges:
1919
- update to JavaMail 1.5.6 (pr-1217 by @paladox)
20+
- update Google Guice to 5.1.0
21+
- update Google Guava to 27.0.1-jre
2022
contributors:
2123
- paladox
2224
}

0 commit comments

Comments
 (0)