Skip to content

Upgrade Log4j to version 2.16 #11723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<classpathentry kind="lib" path="lib/jmdns-3.5.5.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
<classpathentry kind="lib" path="lib/log4j-api-2.15.0.jar"/>
<classpathentry kind="lib" path="lib/log4j-core-2.15.0.jar"/>
<classpathentry kind="lib" path="lib/log4j-api-2.16.0.jar"/>
<classpathentry kind="lib" path="lib/log4j-core-2.16.0.jar"/>
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
Expand Down
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions arduino-core/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<classpathentry kind="lib" path="lib/jmdns-3.5.5.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
<classpathentry kind="lib" path="lib/log4j-api-2.15.0.jar"/>
<classpathentry kind="lib" path="lib/log4j-core-2.15.0.jar"/>
<classpathentry kind="lib" path="lib/log4j-api-2.16.0.jar"/>
<classpathentry kind="lib" path="lib/log4j-core-2.16.0.jar"/>
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
<classpathentry kind="lib" path="../app/lib/commons-httpclient-3.1.jar"/>
Expand Down
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions arduino-core/src/processing/app/BaseNoGui.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
public class BaseNoGui {

/** Version string to be used for build */
public static final int REVISION = 10817;
public static final int REVISION = 10818;
/** Extended version string displayed on GUI */
public static final String VERSION_NAME = "1.8.17";
public static final String VERSION_NAME = "1.8.18";
public static final String VERSION_NAME_LONG;

// Current directory to use for relative paths specified on the
Expand Down
8 changes: 7 additions & 1 deletion build/shared/revisions.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
ARDUINO 1.8.17 2021.12.14 SECURITY HOTFIX RELEASE
ARDUINO 1.8.18 2021.12.14 SECURITY HOTFIX RELEASE

[ide]
* Upgrade log4j to 2.16.0 - Extra hardening for CVE-2021-44228


ARDUINO 1.8.17 (not released superseded by 1.8.18)

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