Skip to content

Commit d2a3322

Browse files
committed
dep: Update slf4j to 1.7.36 and switch from log4j1 to reload4j
Replace log4j 1.2.17 with reload4j 1.2.25. log4j 1.x was caught in the fire of the Log4Shell vulnerability, even though the 1.x line was not affected by the vulnerability. Still, this looks bad when it shows up in security scanners even though it doesn't mean it has the Log4Shell vulnerability. Switch to reload4j instead. This is a drop-in replacement of log4j. Actually, it is log4j rebooted by the same author. The reload4j 1.x line fixes security issues that have since surfaced. At the same time we update to the latest slf4j version, which also switched to reload4j for the log4j12 line.
1 parent f124dfc commit d2a3322

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.classpath

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<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" />
21-
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17.jar" />
22-
<classpathentry kind="lib" path="ext/slf4j-api-1.7.29.jar" sourcepath="ext/src/slf4j-api-1.7.29.jar" />
23-
<classpathentry kind="lib" path="ext/slf4j-log4j12-1.7.29.jar" sourcepath="ext/src/slf4j-log4j12-1.7.29.jar" />
21+
<classpathentry kind="lib" path="ext/reload4j-1.2.25.jar" sourcepath="ext/src/reload4j-1.2.25.jar" />
22+
<classpathentry kind="lib" path="ext/slf4j-api-1.7.36.jar" sourcepath="ext/src/slf4j-api-1.7.36.jar" />
23+
<classpathentry kind="lib" path="ext/slf4j-reload4j-1.7.36.jar" sourcepath="ext/src/slf4j-reload4j-1.7.36.jar" />
2424
<classpathentry kind="lib" path="ext/javax.mail-1.5.6.jar" sourcepath="ext/src/javax.mail-1.5.6.jar" />
2525
<classpathentry kind="lib" path="ext/activation-1.1.jar" sourcepath="ext/src/activation-1.1.jar" />
2626
<classpathentry kind="lib" path="ext/javax.servlet-api-3.1.0.jar" sourcepath="ext/src/javax.servlet-api-3.1.0.jar" />

build.moxie

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ repositories: central, eclipse-snapshots, eclipse, gitblit
106106
# Convenience properties for dependencies
107107
properties: {
108108
jetty.version : 9.4.49.v20220914
109-
slf4j.version : 1.7.29
109+
slf4j.version : 1.7.36
110110
wicket.version : 1.4.22
111111
lucene.version : 5.5.2
112112
jgit.version : 4.11.9.201909030838-r
@@ -137,9 +137,9 @@ dependencies:
137137
- compile 'com.google.inject.extensions:guice-servlet:${guice-servlet.version}' :war
138138
- compile 'com.google.guava:guava:32.1.3-jre' :war :fedclient
139139
- compile 'com.intellij:annotations:12.0' :war
140-
- compile 'log4j:log4j:1.2.17' :war :fedclient :manager
140+
- compile 'ch.qos.reload4j:reload4j:1.2.25' :war :fedclient :manager
141141
- compile 'org.slf4j:slf4j-api:${slf4j.version}' :war :fedclient :manager
142-
- compile 'org.slf4j:slf4j-log4j12:${slf4j.version}' :war :fedclient :manager
142+
- compile 'org.slf4j:slf4j-reload4j:${slf4j.version}' :war :fedclient :manager
143143
- compile 'com.sun.mail:javax.mail:1.5.6' :war
144144
- compile 'javax.servlet:javax.servlet-api:3.1.0' :fedclient
145145
- compile 'org.eclipse.jetty:jetty-servlet:${jetty.version}' @jar

gitblit.iml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,35 +145,35 @@
145145
</library>
146146
</orderEntry>
147147
<orderEntry type="module-library">
148-
<library name="log4j-1.2.17.jar">
148+
<library name="reload4j-1.2.25.jar">
149149
<CLASSES>
150-
<root url="jar://$MODULE_DIR$/ext/log4j-1.2.17.jar!/" />
150+
<root url="jar://$MODULE_DIR$/ext/reload4j-1.2.25.jar!/" />
151151
</CLASSES>
152152
<JAVADOC />
153153
<SOURCES>
154-
<root url="jar://$MODULE_DIR$/ext/src/log4j-1.2.17.jar!/" />
154+
<root url="jar://$MODULE_DIR$/ext/src/reload4j-1.2.25.jar!/" />
155155
</SOURCES>
156156
</library>
157157
</orderEntry>
158158
<orderEntry type="module-library">
159-
<library name="slf4j-api-1.7.29.jar">
159+
<library name="slf4j-api-1.7.36.jar">
160160
<CLASSES>
161-
<root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.29.jar!/" />
161+
<root url="jar://$MODULE_DIR$/ext/slf4j-api-1.7.36.jar!/" />
162162
</CLASSES>
163163
<JAVADOC />
164164
<SOURCES>
165-
<root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.29.jar!/" />
165+
<root url="jar://$MODULE_DIR$/ext/src/slf4j-api-1.7.36.jar!/" />
166166
</SOURCES>
167167
</library>
168168
</orderEntry>
169169
<orderEntry type="module-library">
170-
<library name="slf4j-log4j12-1.7.29.jar">
170+
<library name="slf4j-reload4j-1.7.36.jar">
171171
<CLASSES>
172-
<root url="jar://$MODULE_DIR$/ext/slf4j-log4j12-1.7.29.jar!/" />
172+
<root url="jar://$MODULE_DIR$/ext/slf4j-reload4j-1.7.36.jar!/" />
173173
</CLASSES>
174174
<JAVADOC />
175175
<SOURCES>
176-
<root url="jar://$MODULE_DIR$/ext/src/slf4j-log4j12-1.7.29.jar!/" />
176+
<root url="jar://$MODULE_DIR$/ext/src/slf4j-reload4j-1.7.36.jar!/" />
177177
</SOURCES>
178178
</library>
179179
</orderEntry>

0 commit comments

Comments
 (0)