From 791c862a07e0896671b31d155af076c81caf8c0a Mon Sep 17 00:00:00 2001
From: Niek Vincent <apocalypsjenl@gmail.com>
Date: Thu, 18 Apr 2024 16:29:46 +0200
Subject: [PATCH] Upgrade Jose4j version because of CVE-2023-51775

Upgrade Jose4j version and make gradlew executable again on unix systems
---
 .gitattributes            | 7 +++++++
 gradle/libs.versions.toml | 2 +-
 gradlew                   | 6 ------
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..29bde31dd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+* text=auto
+
+*.sh text eol=lf
+gradlew text eol=lf
+*.bat text eol=crlf
+
+*.jar binary
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1f1eaab45..dff7e240d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ fastutil-object-int-maps = { group = "org.cloudburstmc.fastutil.maps", name = "o
 netty-buffer = { group = "io.netty", name = "netty-buffer", version.ref = "netty" }
 netty-transport-raknet = { group = "org.cloudburstmc.netty", name = "netty-transport-raknet", version = "1.0.0.CR1-SNAPSHOT" }
 
-jose4j = { group = "org.bitbucket.b_c", name = "jose4j", version = "0.9.3" }
+jose4j = { group = "org.bitbucket.b_c", name = "jose4j", version = "0.9.6" }
 natives = { group = "com.nukkitx", name = "natives", version = "1.0.3" }
 math = { group = "org.cloudburstmc.math", name = "immutable", version = "2.0-SNAPSHOT" }
 nbt = { group = "org.cloudburstmc", name = "nbt", version = "3.0.2.Final" }
diff --git a/gradlew b/gradlew
index a69d9cb6c..1b6c78733 100755
--- a/gradlew
+++ b/gradlew
@@ -205,12 +205,6 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.