Update log4j to 2.17.0 (Fixes CVE-2021-45105)

BlueberryMC · Dec 20, 2021 · aff704e · aff704e
1 parent 8d20ba4
commit aff704e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/MagmaCube-Patches/0001-POM-Changes.patch b/MagmaCube-Patches/0001-POM-Changes.patch
@@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..65e6bdbaa3a38354f7bc205526355cc3
 +*.iml
 +build/
 diff --git a/pom.xml b/pom.xml
-index 6600788fb4994a12190c78161e44d0b0ebbdee0f..18294de815061e3b9cb514d56be8ed98d14e9bbb 100644
+index 6600788fb4994a12190c78161e44d0b0ebbdee0f..59a7ba0eb1483282041671e1a7c7f46913959f31 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,9 +3,11 @@
@@ -32,7 +32,12 @@ index 6600788fb4994a12190c78161e44d0b0ebbdee0f..18294de815061e3b9cb514d56be8ed98
      </parent>
      <modelVersion>4.0.0</modelVersion>
 
-@@ -17,21 +19,31 @@
+@@ -13,25 +15,35 @@
+         <text2speech.version>1.11.3</text2speech.version>
+         <maven.compiler.source>17</maven.compiler.source>
+         <maven.compiler.target>17</maven.compiler.target>
+-        <log4j.version>2.14.1</log4j.version>
++        <log4j.version>2.17.0</log4j.version>
          <lwjgl.version>3.2.2</lwjgl.version>
      </properties>
 

diff --git a/buildSrc/src/main/kotlin/net/blueberrymc/gradle/buildSrc/constants/MagicConstants.kt b/buildSrc/src/main/kotlin/net/blueberrymc/gradle/buildSrc/constants/MagicConstants.kt
@@ -1,7 +1,7 @@
 package net.blueberrymc.gradle.buildSrc.constants
 
-const val apiVersion = "0.2.1-SNAPSHOT"
+const val apiVersion = "0.2.2-SNAPSHOT"
 const val minecraftVersion = "1.18.1"
 const val text2speechVersion = "1.11.3"
-const val log4jVersion = "2.14.1"
+const val log4jVersion = "2.17.0" // log4j sucks
 const val lwjglVersion = "3.2.2"
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     </modules>
     <name>Blueberry-Parent</name>
     <properties>
-        <api.version>0.2.1-SNAPSHOT</api.version>
+        <api.version>0.2.2-SNAPSHOT</api.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/scripts/files/version.json b/scripts/files/version.json
@@ -1132,24 +1132,24 @@
     {
       "downloads": {
         "artifact": {
-          "path": "org/apache/logging/log4j/log4j-core/2.14.1/log4j-core-2.14.1.jar",
-          "sha1": "9141212b8507ab50a45525b545b39d224614528b",
-          "size": 1745700,
-          "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-core/2.14.1/log4j-core-2.14.1.jar"
+          "path": "org/apache/logging/log4j/log4j-core/2.17.0/log4j-core-2.17.0.jar",
+          "sha1": "fe6e7a32c1228884b9691a744f953a55d0dd8ead",
+          "size": 1789339,
+          "url": "https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-core/2.17.0/log4j-core-2.17.0.jar"
         }
       },
-      "name": "org.apache.logging.log4j:log4j-core:2.14.1"
+      "name": "org.apache.logging.log4j:log4j-core:2.17.0"
     },
     {
       "downloads": {
         "artifact": {
-          "path": "org/apache/logging/log4j/log4j-api/2.14.1/log4j-api-2.14.1.jar",
-          "sha1": "cd8858fbbde69f46bce8db1152c18a43328aae78",
-          "size": 300365,
-          "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-api/2.14.1/log4j-api-2.14.1.jar"
+          "path": "org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar",
+          "sha1": "bbd791e9c8c9421e45337c4fe0a10851c086e36c",
+          "size": 301776,
+          "url": "https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar"
         }
       },
-      "name": "org.apache.logging.log4j:log4j-api:2.14.1"
+      "name": "org.apache.logging.log4j:log4j-api:2.17.0"
     },
     {
       "downloads": {
@@ -1352,13 +1352,13 @@
     {
       "downloads": {
         "artifact": {
-          "path": "org/apache/logging/log4j/log4j-slf4j18-impl/2.14.1/log4j-slf4j18-impl-2.14.1.jar",
-          "sha1": "312b4d91b21160b9fab43600fa787f31e8cab930",
-          "size": 20688,
-          "url": "https://libraries.minecraft.net/org/apache/logging/log4j/log4j-slf4j18-impl/2.14.1/log4j-slf4j18-impl-2.14.1.jar"
+          "path": "org/apache/logging/log4j/log4j-slf4j18-impl/2.17.0/log4j-slf4j18-impl-2.17.0.jar",
+          "sha1": "bd7f6c0b9224dd214afb4e684957e2349b529a8d",
+          "size": 21244,
+          "url": "https://repo.maven.apache.org/maven2/org/apache/logging/log4j/log4j-slf4j18-impl/2.17.0/log4j-slf4j18-impl-2.17.0.jar"
         }
       },
-      "name": "org.apache.logging.log4j:log4j-slf4j18-impl:2.14.1"
+      "name": "org.apache.logging.log4j:log4j-slf4j18-impl:2.17.0"
     },
     {
       "downloads": {