Paper 26.1.2 support, update Gradle to 9.5.1, migrate deprecated APIs

DynmapCore/build.gradle

@@ -8,7 +8,10 @@ eclipse {
     }
 }
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+} // Need this here so eclipse task generates correctly.
 
 dependencies {
     implementation project(':DynmapCoreAPI')
@@ -64,21 +67,27 @@ jar {
 }
 
 shadowJar {
+    configurations = [project.configurations.runtimeClasspath]
     dependencies {
         include(dependency('com.googlecode.json-simple:json-simple:'))
         include(dependency('org.yaml:snakeyaml:'))
         include(dependency('com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:'))
-        include(dependency('javax.servlet::'))
-        include(dependency('org.eclipse.jetty::'))
+        include(dependency('javax.servlet:javax.servlet-api:'))
+        include(dependency('org.eclipse.jetty:jetty-server:'))
+        include(dependency('org.eclipse.jetty:jetty-servlet:'))
+        include(dependency('org.eclipse.jetty:jetty-util:'))
+        include(dependency('org.eclipse.jetty:jetty-http:'))
+        include(dependency('org.eclipse.jetty:jetty-io:'))
+        include(dependency('org.eclipse.jetty:jetty-security:'))
         include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
         include(dependency('org.postgresql:postgresql:'))
         include(dependency('io.github.linktosriram.s3lite:core:'))
         include(dependency('io.github.linktosriram.s3lite:api:'))
         include(dependency('io.github.linktosriram.s3lite:http-client-url-connection:'))
         include(dependency('io.github.linktosriram.s3lite:http-client-spi:'))
         include(dependency('io.github.linktosriram.s3lite:util:'))
-        include(dependency('jakarta.xml.bind::'))
-        include(dependency('com.sun.xml.bind::'))
+        include(dependency('jakarta.xml.bind:jakarta.xml.bind-api:'))
+        include(dependency('com.sun.xml.bind:jaxb-impl:'))
         include(dependency(':DynmapCoreAPI'))
         exclude("META-INF/maven/**")
         exclude("META-INF/services/**")

DynmapCoreAPI/build.gradle

@@ -6,7 +6,10 @@ eclipse {
         name = "Dynmap(DynmapCoreAPI)"
     }
 }
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+} // Need this here so eclipse task generates correctly.
 
 description = "DynmapCoreAPI"
 

build.gradle

@@ -1,21 +1,8 @@
-// Workaround for Shadow not supporting Java 19 classes.
-// Remove this once Shadow updates.
-// See: https://github.com/johnrengelman/shadow/pull/770
-// See: https://discord.com/channels/722722769950998560/793019909055578113/978939925061857315
-buildscript {
-    configurations.all {
-        resolutionStrategy {
-            force("org.ow2.asm:asm:9.5")
-            force("org.ow2.asm:asm-commons:9.5")
-        }
-    }
-}
-
 plugins {
-    //id  "com.github.johnrengelman.shadow" version "7.1.0"
-    id  "io.github.goooler.shadow" version "8.1.7"
+    id  "com.gradleup.shadow" version "9.4.2"
     id  'java'
     id  'maven-publish'
+    id  'io.papermc.paperweight.userdev' version '2.0.0-beta.21' apply false
 }
 
 apply plugin: 'eclipse'
@@ -35,6 +22,7 @@ allprojects  {
      maven { url "https://repo.mikeprimm.com" }
      maven { url "https://repo.maven.apache.org/maven2" }
      maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
+     maven { url "https://repo.papermc.io/repository/maven-public/" }
      maven { url "https://repo.codemc.org/repository/maven-public/" }
   }
 
@@ -52,13 +40,17 @@ ext {
   globals = new Globals()
 }
 
-subprojects {  
-  apply plugin: "io.github.goooler.shadow"
+subprojects {
+  if (!it.name.startsWith('fabric-') && !it.name.startsWith('forge-')) {
+    apply plugin: "com.gradleup.shadow"
+  }
   apply plugin: 'java'
   apply plugin: 'maven-publish'
 
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
+  java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
   tasks.withType(JavaCompile) {
   	options.encoding = 'UTF-8'
   }

bukkit-helper-113-2/build.gradle

@@ -8,7 +8,10 @@ eclipse {
 
 description = 'bukkit-helper-1.13.2'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-114-1/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.14.1'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-115/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.15'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-116-2/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.16.2'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-116-3/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.16.3'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-116-4/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.16.4'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-116/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.16'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-117/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.17'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(16) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_16
+    targetCompatibility = JavaVersion.VERSION_16
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-118-2/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.18.2'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-118/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.18'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-119-3/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.19.3'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-119-4/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.19.4'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-119/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.19'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-120-2/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.20.2'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-120-4/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.20.4'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-120-5/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.20.5'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-120/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.20'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-121-10/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.21.10'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-121-11/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.21.11'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-121-3/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.21.3'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-121-4/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.21.4'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-121-5/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.21.5'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-121-6/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.21.7'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-121/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.21'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')