[FEAT] Implement spigot compatibility for 26.1.2

DynmapCore/build.gradle

@@ -3,8 +3,11 @@ description = "DynmapCore"
 dependencies {
     implementation project(':DynmapCoreAPI')
     implementation 'javax.servlet:javax.servlet-api:3.1'
-    implementation'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
+    implementation 'org.eclipse.jetty:jetty-server:9.4.26.v20200117'
     implementation 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117'
+    implementation 'org.eclipse.jetty:jetty-util:9.4.26.v20200117'
+    implementation 'org.eclipse.jetty:jetty-http:9.4.26.v20200117'
+    implementation 'org.eclipse.jetty:jetty-io:9.4.26.v20200117'
     implementation 'com.googlecode.json-simple:json-simple:1.1.1'
     implementation 'org.yaml:snakeyaml:1.23'	// DON'T UPDATE - NEWER ONE TRIPS ON WINDOWS ENCODED FILES
     implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1'
@@ -46,17 +49,21 @@ shadowJar {
         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.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/**")

build.gradle

@@ -1,19 +1,5 @@
-// 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.1"
     id  'java'
     id  'maven-publish'
 }
@@ -46,7 +32,6 @@ allprojects  {
 
   group = 'us.dynmap'
   version = '3.7-beta-11'
-
 }
 
 class Globals {
@@ -57,17 +42,20 @@ ext {
 }
 
 subprojects {  
-  apply plugin: "io.github.goooler.shadow"
+  apply plugin: "com.gradleup.shadow"
   apply plugin: 'java'
   apply plugin: 'maven-publish'
 
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
   tasks.withType(JavaCompile) {
   	options.encoding = 'UTF-8'
   }
 }
 
+java {
+  sourceCompatibility = 25
+  targetCompatibility = 25
+}
+
 clean {
   delete "target" 
 }

bukkit-helper-121-11/build.gradle

@@ -1,10 +1,6 @@
 
 description = 'bukkit-helper-1.21.11'
 
-// Ensure application is buildable using java 17 or above. 
-sourceCompatibility = 17
-targetCompatibility = 17
-
 dependencies {
   implementation project(':bukkit-helper')
   implementation project(':dynmap-api')
@@ -13,4 +9,4 @@ dependencies {
   compileOnly ('org.spigotmc:spigot:1.21.11-R0.1-SNAPSHOT') {
     exclude group: "com.mojang", module: "jtracy"
   }
-}
+}

bukkit-helper-26-1-2/.gitignore

@@ -0,0 +1 @@
+build/

bukkit-helper-26-1-2/build.gradle

@@ -0,0 +1,13 @@
+
+description = 'bukkit-helper-26-1-2'
+
+dependencies {
+  implementation project(':bukkit-helper')
+  implementation project(':dynmap-api')
+  implementation project(path: ':DynmapCore', configuration: 'shadow')
+  implementation project(path: ':DynmapCoreAPI', configuration: 'shadow')
+  compileOnly group: 'org.spigotmc', name: 'spigot-api', version:'26.1.2-R0.1-SNAPSHOT'
+  compileOnly ('org.spigotmc:spigot:26.1.2-R0.1-SNAPSHOT') {
+    exclude group: "com.mojang", module: "jtracy"
+  }
+}