Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c4078e7

Browse files
authored
Merge pull request #11730 from cmaglie/remove_log4j
Remove log4j, to fix current and future CVEs.
2 parents dfeff7d + c16b9f5 commit c4078e7

File tree

20 files changed

+31
-188
lines changed

20 files changed

+31
-188
lines changed

‎app/.classpath

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
<classpathentry kind="lib" path="lib/jmdns-3.5.5.jar"/>
3939
<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
4040
<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
41-
<classpathentry kind="lib" path="lib/log4j-api-2.16.0.jar"/>
42-
<classpathentry kind="lib" path="lib/log4j-core-2.16.0.jar"/>
4341
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
4442
<classpathentry kind="lib" path="lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar"/>
4543
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>

‎app/build.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@
8080
includeAntRuntime="false"
8181
debug="true"
8282
classpathref="class.path" />
83-
<!-- If you want to add files in the jars -->
84-
<copy todir="bin" overwrite="true" verbose="true">
85-
<fileset dir="src" includes="log4j2.xml" />
86-
</copy>
8783
</target>
8884

8985
<target name="test" depends="compile" description="Runs the test">

‎app/lib/log4j-api-2.16.0.jar

-295 KB
Binary file not shown.

‎app/lib/log4j-core-2.16.0.jar

-1.71 MB
Binary file not shown.

‎app/src/cc/arduino/contributions/ContributionsSelfCheck.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import cc.arduino.contributions.packages.ContributionInstaller;
3636
import cc.arduino.contributions.packages.filters.UpdatablePlatformPredicate;
3737
import cc.arduino.view.NotificationPopup;
38-
import org.apache.logging.log4j.LogManager;
3938
import processing.app.*;
4039

4140
import javax.swing.*;
@@ -160,12 +159,14 @@ public void windowGainedFocus(WindowEvent evt) {
160159

161160
private void goToManager(String link) {
162161
try {
163-
((UpdatableBoardsLibsFakeURLsHandler) hyperlinkListener).openBoardLibManager(new URL(link));
164-
}
165-
catch (Exception e){
166-
LogManager.getLogger(ContributionsSelfCheck.class).warn("Exception while attempting to go to board manager", e);
162+
((UpdatableBoardsLibsFakeURLsHandler) hyperlinkListener)
163+
.openBoardLibManager(new URL(link));
164+
} catch (Exception e) {
165+
System.err.println("Error while attempting to open board manager: "
166+
+ e.getMessage());
167167
}
168168
}
169+
169170
// callback for boards button
170171
public void onOptionalButton1Callback() {
171172
goToManager(boardsManagerURL);

‎app/src/log4j2.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎app/src/processing/app/Base.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,6 @@ public Base(String[] args) throws Exception {
220220
parser.parseArgumentsPhase1();
221221
commandLine = !parser.isGuiMode();
222222

223-
// This configure the logs root folder
224-
if (parser.isGuiMode()) {
225-
System.out.println("Set log4j store directory " + BaseNoGui.getSettingsFolder().getAbsolutePath());
226-
}
227-
System.setProperty("log4j.dir", BaseNoGui.getSettingsFolder().getAbsolutePath());
228-
229223
BaseNoGui.checkInstallationFolder();
230224

231225
// If no path is set, get the default sketchbook folder for this platform

‎arduino-core/.classpath

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
<classpathentry kind="lib" path="lib/jmdns-3.5.5.jar"/>
99
<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
1010
<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
11-
<classpathentry kind="lib" path="lib/log4j-api-2.16.0.jar"/>
12-
<classpathentry kind="lib" path="lib/log4j-core-2.16.0.jar"/>
1311
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
1412
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
1513
<classpathentry kind="lib" path="../app/lib/commons-httpclient-3.1.jar"/>

‎arduino-core/lib/log4j-api-2.16.0.jar

-295 KB
Binary file not shown.

‎arduino-core/lib/log4j-core-2.16.0.jar

-1.71 MB
Binary file not shown.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /