diff options
| author | Russell Howe <rhowe@siksai.co.uk> | 2021-12-11 13:26:57 +0300 |
|---|---|---|
| committer | Russell Howe <rhowe@siksai.co.uk> | 2021-12-11 13:32:01 +0300 |
| commit | 8ae1f94553a9e8bb229c32c4a4f6bd068762b53e (patch) | |
| tree | ba2f2665af65d683b2f3afe21e416cd5a291add0 | |
| parent | c33fb9fde3cdd6c5d6629fa2a672ef19c110902a (diff) | |
Upgrade log4j to 2.15.0 - CVE-2021-44228
| -rw-r--r-- | app/.classpath | 4 | ||||
| -rw-r--r-- | app/lib/log4j-api-2.12.0.jar | bin | 273454 -> 0 bytes | |||
| -rw-r--r-- | app/lib/log4j-api-2.15.0.jar | bin | 0 -> 301805 bytes | |||
| -rw-r--r-- | app/lib/log4j-core-2.12.0.jar | bin | 1667269 -> 0 bytes | |||
| -rw-r--r-- | app/lib/log4j-core-2.15.0.jar | bin | 0 -> 1789769 bytes | |||
| -rw-r--r-- | arduino-core/.classpath | 4 | ||||
| -rw-r--r-- | build/windows/launcher/config.xml | 4 | ||||
| -rw-r--r-- | build/windows/launcher/config_debug.xml | 4 |
8 files changed, 8 insertions, 8 deletions
diff --git a/app/.classpath b/app/.classpath index bb2bf7417..4ed362202 100644 --- a/app/.classpath +++ b/app/.classpath @@ -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.12.0.jar"/> - <classpathentry kind="lib" path="lib/log4j-core-2.12.0.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/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"/> diff --git a/app/lib/log4j-api-2.12.0.jar b/app/lib/log4j-api-2.12.0.jar Binary files differdeleted file mode 100644 index 93f770d64..000000000 --- a/app/lib/log4j-api-2.12.0.jar +++ /dev/null diff --git a/app/lib/log4j-api-2.15.0.jar b/app/lib/log4j-api-2.15.0.jar Binary files differnew file mode 100644 index 000000000..77f6b2bef --- /dev/null +++ b/app/lib/log4j-api-2.15.0.jar diff --git a/app/lib/log4j-core-2.12.0.jar b/app/lib/log4j-core-2.12.0.jar Binary files differdeleted file mode 100644 index fbab72063..000000000 --- a/app/lib/log4j-core-2.12.0.jar +++ /dev/null diff --git a/app/lib/log4j-core-2.15.0.jar b/app/lib/log4j-core-2.15.0.jar Binary files differnew file mode 100644 index 000000000..5d6a73a65 --- /dev/null +++ b/app/lib/log4j-core-2.15.0.jar diff --git a/arduino-core/.classpath b/arduino-core/.classpath index fd2e5d190..1b3e5a9b1 100644 --- a/arduino-core/.classpath +++ b/arduino-core/.classpath @@ -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.12.0.jar"/> - <classpathentry kind="lib" path="lib/log4j-core-2.12.0.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/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"/> diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml index c82f783dd..65bc22e66 100644 --- a/build/windows/launcher/config.xml +++ b/build/windows/launcher/config.xml @@ -43,8 +43,8 @@ <cp>%EXEDIR%/lib/java-semver-0.8.0.jar</cp> <cp>%EXEDIR%/lib/jmdns-3.5.5.jar</cp> <cp>%EXEDIR%/lib/jtouchbar-1.0.0.jar</cp> - <cp>%EXEDIR%/lib/log4j-api-2.12.0.jar</cp> - <cp>%EXEDIR%/lib/log4j-core-2.12.0.jar</cp> + <cp>%EXEDIR%/lib/log4j-api-2.15.0.jar</cp> + <cp>%EXEDIR%/lib/log4j-core-2.15.0.jar</cp> <cp>%EXEDIR%/lib/slf4j-simple-1.7.22.jar</cp> <cp>%EXEDIR%/lib/slf4j-api-1.7.22.jar</cp> <cp>%EXEDIR%/lib/jna-4.2.2.jar</cp> diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml index 5413313c1..2e896e495 100644 --- a/build/windows/launcher/config_debug.xml +++ b/build/windows/launcher/config_debug.xml @@ -43,8 +43,8 @@ <cp>%EXEDIR%/lib/java-semver-0.8.0.jar</cp> <cp>%EXEDIR%/lib/jmdns-3.5.5.jar</cp> <cp>%EXEDIR%/lib/jtouchbar-1.0.0.jar</cp> - <cp>%EXEDIR%/lib/log4j-api-2.12.0.jar</cp> - <cp>%EXEDIR%/lib/log4j-core-2.12.0.jar</cp> + <cp>%EXEDIR%/lib/log4j-api-2.15.0.jar</cp> + <cp>%EXEDIR%/lib/log4j-core-2.15.0.jar</cp> <cp>%EXEDIR%/lib/slf4j-simple-1.7.22.jar</cp> <cp>%EXEDIR%/lib/slf4j-api-1.7.22.jar</cp> <cp>%EXEDIR%/lib/jna-4.2.2.jar</cp> |