From e0be6c37aa9a557385ffc20e104648708a002a30 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 14 Dec 2021 13:59:16 +0100 Subject: starting 1.8.18 --- arduino-core/src/processing/app/BaseNoGui.java | 4 ++-- build/shared/revisions.txt | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java index f648d87da..e1fe0de98 100644 --- a/arduino-core/src/processing/app/BaseNoGui.java +++ b/arduino-core/src/processing/app/BaseNoGui.java @@ -41,9 +41,9 @@ import static processing.app.helpers.filefilters.OnlyDirs.ONLY_DIRS; 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 diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index 1ac685396..f09eefaaa 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -1,4 +1,7 @@ -ARDUINO 1.8.17 2021.12.14 SECURITY HOTFIX RELEASE +ARDUINO 1.8.18 2021.12.14 SECURITY HOTFIX RELEASE + + +ARDUINO 1.8.17 (not released superseded by 1.8.18) [ide] * Upgrade log4j to 2.15.0 - CVE-2021-44228 (thanks @rhowe) -- cgit v1.2.3 From 1005ab11fe2d4f1d38c32d4923435cb1674e5d16 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 14 Dec 2021 13:55:59 +0100 Subject: Updated log4j to version 2.16.0 --- app/.classpath | 4 ++-- app/lib/log4j-api-2.15.0.jar | Bin 301805 -> 0 bytes app/lib/log4j-api-2.16.0.jar | Bin 0 -> 301892 bytes app/lib/log4j-core-2.15.0.jar | Bin 1789769 -> 0 bytes app/lib/log4j-core-2.16.0.jar | Bin 0 -> 1789565 bytes arduino-core/.classpath | 4 ++-- arduino-core/lib/log4j-api-2.15.0.jar | Bin 301805 -> 0 bytes arduino-core/lib/log4j-api-2.16.0.jar | Bin 0 -> 301892 bytes arduino-core/lib/log4j-core-2.15.0.jar | Bin 1789769 -> 0 bytes arduino-core/lib/log4j-core-2.16.0.jar | Bin 0 -> 1789565 bytes build/shared/revisions.txt | 3 +++ 11 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 app/lib/log4j-api-2.15.0.jar create mode 100644 app/lib/log4j-api-2.16.0.jar delete mode 100644 app/lib/log4j-core-2.15.0.jar create mode 100644 app/lib/log4j-core-2.16.0.jar delete mode 100644 arduino-core/lib/log4j-api-2.15.0.jar create mode 100644 arduino-core/lib/log4j-api-2.16.0.jar delete mode 100644 arduino-core/lib/log4j-core-2.15.0.jar create mode 100644 arduino-core/lib/log4j-core-2.16.0.jar diff --git a/app/.classpath b/app/.classpath index 4ed362202..9b920b1bb 100644 --- a/app/.classpath +++ b/app/.classpath @@ -38,8 +38,8 @@ - - + + diff --git a/app/lib/log4j-api-2.15.0.jar b/app/lib/log4j-api-2.15.0.jar deleted file mode 100644 index 77f6b2bef..000000000 Binary files a/app/lib/log4j-api-2.15.0.jar and /dev/null differ diff --git a/app/lib/log4j-api-2.16.0.jar b/app/lib/log4j-api-2.16.0.jar new file mode 100644 index 000000000..2cdcc4b07 Binary files /dev/null and b/app/lib/log4j-api-2.16.0.jar differ diff --git a/app/lib/log4j-core-2.15.0.jar b/app/lib/log4j-core-2.15.0.jar deleted file mode 100644 index 5d6a73a65..000000000 Binary files a/app/lib/log4j-core-2.15.0.jar and /dev/null differ diff --git a/app/lib/log4j-core-2.16.0.jar b/app/lib/log4j-core-2.16.0.jar new file mode 100644 index 000000000..bc913bc53 Binary files /dev/null and b/app/lib/log4j-core-2.16.0.jar differ diff --git a/arduino-core/.classpath b/arduino-core/.classpath index 1b3e5a9b1..42c399786 100644 --- a/arduino-core/.classpath +++ b/arduino-core/.classpath @@ -8,8 +8,8 @@ - - + + diff --git a/arduino-core/lib/log4j-api-2.15.0.jar b/arduino-core/lib/log4j-api-2.15.0.jar deleted file mode 100644 index 77f6b2bef..000000000 Binary files a/arduino-core/lib/log4j-api-2.15.0.jar and /dev/null differ diff --git a/arduino-core/lib/log4j-api-2.16.0.jar b/arduino-core/lib/log4j-api-2.16.0.jar new file mode 100644 index 000000000..2cdcc4b07 Binary files /dev/null and b/arduino-core/lib/log4j-api-2.16.0.jar differ diff --git a/arduino-core/lib/log4j-core-2.15.0.jar b/arduino-core/lib/log4j-core-2.15.0.jar deleted file mode 100644 index 5d6a73a65..000000000 Binary files a/arduino-core/lib/log4j-core-2.15.0.jar and /dev/null differ diff --git a/arduino-core/lib/log4j-core-2.16.0.jar b/arduino-core/lib/log4j-core-2.16.0.jar new file mode 100644 index 000000000..bc913bc53 Binary files /dev/null and b/arduino-core/lib/log4j-core-2.16.0.jar differ diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index f09eefaaa..b41e1b44f 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -1,5 +1,8 @@ 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) -- cgit v1.2.3