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 6cf3a89

Browse files
authored
Merge pull request #11723 from cmaglie/log4j-2.16
Upgrade Log4j to version 2.16
2 parents d7116ee + 1005ab1 commit 6cf3a89

File tree

8 files changed

+13
-7
lines changed

8 files changed

+13
-7
lines changed

‎app/.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
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.15.0.jar"/>
42-
<classpathentry kind="lib" path="lib/log4j-core-2.15.0.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"/>
4343
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
4444
<classpathentry kind="lib" path="lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar"/>
4545
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>

‎arduino-core/.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
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.15.0.jar"/>
12-
<classpathentry kind="lib" path="lib/log4j-core-2.15.0.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"/>
1313
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
1414
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
1515
<classpathentry kind="lib" path="../app/lib/commons-httpclient-3.1.jar"/>

‎arduino-core/src/processing/app/BaseNoGui.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
public class BaseNoGui {
4242

4343
/** Version string to be used for build */
44-
public static final int REVISION = 10817;
44+
public static final int REVISION = 10818;
4545
/** Extended version string displayed on GUI */
46-
public static final String VERSION_NAME = "1.8.17";
46+
public static final String VERSION_NAME = "1.8.18";
4747
public static final String VERSION_NAME_LONG;
4848

4949
// Current directory to use for relative paths specified on the

‎build/shared/revisions.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
ARDUINO 1.8.17 2021年12月14日 SECURITY HOTFIX RELEASE
1+
ARDUINO 1.8.18 2021年12月14日 SECURITY HOTFIX RELEASE
2+
3+
[ide]
4+
* Upgrade log4j to 2.16.0 - Extra hardening for CVE-2021-44228
5+
6+
7+
ARDUINO 1.8.17 (not released superseded by 1.8.18)
28

39
[ide]
410
* Upgrade log4j to 2.15.0 - CVE-2021-44228 (thanks @rhowe)

0 commit comments

Comments
(0)

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