Build: Gradle fixes for Jetty 12

Gitea #537

apps/jetty/build.gradle

@@ -13,24 +13,24 @@ sourceSets {
 }
 
 dependencies {
-    ext.jettyVersion = '9.3.30.v20211001'
+    ext.jettyVersion = "${jettyVersion}"
     ext.tomcatVersion = "${tomcatVersion}"
     api project(':core')
     api 'org.eclipse.jetty:jetty-http:' + ext.jettyVersion
     api 'org.eclipse.jetty:jetty-io:' + ext.jettyVersion
-    api 'org.eclipse.jetty:jetty-security:' + ext.jettyVersion
+    api 'org.eclipse.jetty.ee8:jetty-ee8-security:' + ext.jettyVersion
     api 'org.eclipse.jetty:jetty-server:' + ext.jettyVersion
-    api 'org.eclipse.jetty:jetty-servlet:' + ext.jettyVersion
+    api 'org.eclipse.jetty.ee8:jetty-ee8-servlet:' + ext.jettyVersion
     api 'org.eclipse.jetty:jetty-util:' + ext.jettyVersion
     api 'org.eclipse.jetty:jetty-xml:' + ext.jettyVersion
-    api 'org.eclipse.jetty:apache-jsp:' + ext.jettyVersion
-    api 'org.eclipse.jetty:jetty-continuation:' + ext.jettyVersion
+    api 'org.eclipse.jetty.ee8:jetty-ee8-apache-jsp:' + ext.jettyVersion
     api 'org.eclipse.jetty:jetty-deploy:' + ext.jettyVersion
     api 'org.eclipse.jetty:jetty-jmx:' + ext.jettyVersion
+    api 'org.eclipse.jetty.ee8:jetty-ee8-nested:' + ext.jettyVersion
     api 'org.eclipse.jetty:jetty-rewrite:' + ext.jettyVersion
-    api 'org.eclipse.jetty:jetty-servlets:' + ext.jettyVersion
+    api 'org.eclipse.jetty.ee8:jetty-ee8-servlets:' + ext.jettyVersion
     api 'org.eclipse.jetty:jetty-start:' + ext.jettyVersion
-    api 'org.eclipse.jetty:jetty-webapp:' + ext.jettyVersion
+    api 'org.eclipse.jetty.ee8:jetty-ee8-webapp:' + ext.jettyVersion
     api 'org.apache.tomcat:tomcat-api:' + ext.tomcatVersion
     api 'org.apache.tomcat:tomcat-el-api:' + ext.tomcatVersion
     api 'org.apache.tomcat:tomcat-jasper:' + ext.tomcatVersion

build.gradle

@@ -79,8 +79,8 @@ subprojects {
 
 
 
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+    sourceCompatibility = 17
+    targetCompatibility = 17
 
     jar {
         // Empty attributes are set by each project. They are initialized

build.xml

@@ -14,7 +14,7 @@
     <property file="build.properties"/>
     <!--  When changing, also change javadoc URL in build.properties,
           and checksum in apps/jetty/build.xml
-          and versions in gradle.properties and apps/jetty/build.gradle
+          and versions in gradle.properties
      -->
     <property name="jetty.ver" value="12.0.28" />
     <property name="jetty.ver.debian" value="12.0.32" />

gradle.properties

@@ -1,7 +1,7 @@
 # Override these in ~/.gradle/gradle.properties if necessary
 java7BootClasspath=
-tomcatVersion=9.0.62
-jettyVersion = '9.3.30.v20211001'
+tomcatVersion=9.0.107
+jettyVersion = 12.0.32
 org.gradle.caching = true
 org.gradle.parallel = true
 org.gradle.configureondemand = true