Picked some other changes from upstream

CrucibleMC · Mar 21, 2024 · 1f40fa2 · 1f40fa2
1 parent ab8c31e
commit 1f40fa2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -90,9 +90,9 @@ dependencies {
     libraries 'org.ow2.asm:asm-util:9.5'
     libraries 'org.ow2.asm:asm-deprecated:7.1'
     libraries 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
-    libraries 'jakarta.servlet:jakarta.servlet-api:6.0.0'
+    libraries "javax.servlet:javax.servlet-api:4.0.1"
     libraries 'com.sun.xml.bind:jaxb-impl:3.0.2'
-    libraries 'org.mozilla:rhino-engine:1.7.14'
+    libraries 'org.openjdk.nashorn:nashorn-core:15.4'
 
     // Other libs
     libraries 'pw.prok:Damask:0.1.2@jar'

diff --git a/java9args.txt b/java9args.txt
@@ -25,6 +25,8 @@ java.base/sun.nio.ch=ALL-UNNAMED
 --add-opens
 jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming
 --add-opens
+java.desktop/sun.awt=ALL-UNNAMED
+--add-opens
 java.desktop/sun.awt.image=ALL-UNNAMED
 --add-opens
 java.desktop/com.sun.imageio.plugins.png=ALL-UNNAMED