From 858f7bda1eeb81e812161e58fa4012fd14ee5667 Mon Sep 17 00:00:00 2001
From: ~keith <keith@keithhacks.cyou>
Date: Mon, 17 Jan 2022 20:50:10 +0000
Subject: [PATCH] Fix build script & use Log4j 2.17.1 as per CVE-2021-44228 and
 CVE-2021-44832

---
 .gitignore        |  2 +-
 build.gradle      | 11 ++++++++---
 gradle.properties |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 gradle.properties

diff --git a/.gitignore b/.gitignore
index 86327bac2..e966bee6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,7 +39,7 @@ changelog.txt
 *.7z
 /logs/
 
-gradle.properties
+#gradle.properties
 !/mdk/gradle.properties
 /projects/forge/rejects/
 
diff --git a/build.gradle b/build.gradle
index bec7d283f..5f02ed958 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,8 @@
 buildscript {
     repositories {
         mavenLocal()
-        maven { url = 'https://files.minecraftforge.net/maven' }
+        maven { url = 'https://files.minecraftforge.net/maven/' }
+        maven { url = 'https://libraries.minecraft.net/' }
         jcenter()
         //mavenCentral() //TODO: Update Gradle to use HTTPS by default
         maven {
@@ -77,6 +78,8 @@ project(':clean') {
     
     repositories {
         mavenLocal()
+        maven { url = 'https://files.minecraftforge.net/maven/' }
+        maven { url = 'https://libraries.minecraft.net/' }
         //mavenCentral() //TODO: Update Gradle to use HTTPS by default
         maven {
             name 'maven_central'
@@ -189,6 +192,8 @@ project(':forge') {
 
     repositories {
         mavenLocal()
+        maven { url = 'https://files.minecraftforge.net/maven/' }
+        maven { url = 'https://libraries.minecraft.net/' }
         //mavenCentral() //TODO: Update Gradle to use HTTPS by default
         maven {
             name 'maven_central'
@@ -449,8 +454,8 @@ project(':forge') {
         installer 'org.jline:jline:3.12.+'
         installer 'org.apache.maven:maven-artifact:3.6.0'
         installer 'net.jodah:typetools:0.8.+'
-        installer 'org.apache.logging.log4j:log4j-api:2.11.2'
-        installer 'org.apache.logging.log4j:log4j-core:2.11.2'
+        installer 'org.apache.logging.log4j:log4j-api:2.17.1'
+        installer 'org.apache.logging.log4j:log4j-core:2.17.1'
         installer 'net.minecrell:terminalconsoleappender:1.2.+'
         installer 'net.sf.jopt-simple:jopt-simple:5.0.4'
         installer 'org.spongepowered:mixin:0.8.2'
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 000000000..8cd3ac0c8
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError