rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Merge pull request #11723 from cmaglie/log4j-2.16

Browse Source 
Upgrade Log4j to version 2.16
This commit is contained in:
Cristian Maglie 2021-12-14 14:25:59 +01:00 committed by GitHub
commit 6cf3a89d32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/.classpath
View File

@ -38,8 +38,8 @@
<classpathentry kind="lib" path="lib/jmdns-3.5.5.jar"/> <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-api-1.7.22.jar"/>
<classpathentry kind="lib" path="lib/slf4j-simple-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-api-2.16.0.jar"/>
<classpathentry kind="lib" path="lib/log4j-core-2.15.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/jsch-0.1.50.jar"/>
<classpathentry kind="lib" path="lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar"/> <classpathentry kind="lib" path="lib/rsyntaxtextarea-3.0.3-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/> <classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>

BIN
app/lib/log4j-api-2.15.0.jar → app/lib/log4j-api-2.16.0.jar
View File

Binary file not shown.

BIN
app/lib/log4j-core-2.15.0.jar → app/lib/log4j-core-2.16.0.jar
View File

Binary file not shown.

4
arduino-core/.classpath
View File

@ -8,8 +8,8 @@
<classpathentry kind="lib" path="lib/jmdns-3.5.5.jar"/> <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-api-1.7.22.jar"/>
<classpathentry kind="lib" path="lib/slf4j-simple-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-api-2.16.0.jar"/>
<classpathentry kind="lib" path="lib/log4j-core-2.15.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/jsch-0.1.50.jar"/>
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/> <classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
<classpathentry kind="lib" path="../app/lib/commons-httpclient-3.1.jar"/> <classpathentry kind="lib" path="../app/lib/commons-httpclient-3.1.jar"/>

BIN
arduino-core/lib/log4j-api-2.15.0.jar → arduino-core/lib/log4j-api-2.16.0.jar
View File

Binary file not shown.

BIN
arduino-core/lib/log4j-core-2.15.0.jar → arduino-core/lib/log4j-core-2.16.0.jar
View File

Binary file not shown.

4
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -41,9 +41,9 @@ import static processing.app.helpers.filefilters.OnlyDirs.ONLY_DIRS;
public class BaseNoGui { public class BaseNoGui {
/** Version string to be used for build */ /** 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 */ /** 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; public static final String VERSION_NAME_LONG;
// Current directory to use for relative paths specified on the // Current directory to use for relative paths specified on the

8
build/shared/revisions.txt
View File

@ -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] [ide]
* Upgrade log4j to 2.15.0 - CVE-2021-44228 (thanks @rhowe) * Upgrade log4j to 2.15.0 - CVE-2021-44228 (thanks @rhowe)