Use Jetty 12.1.1/EE10 for NiFi Registry

Author: pvillard31

nifi-registry/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/handler/StandardHandlerProvider.java

@@ -172,7 +172,6 @@ private File getApplicationFile(final File directory, final Pattern filenamePatt
 
     private ErrorPageErrorHandler getErrorHandler() {
         final ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler();
-        errorHandler.setShowServlet(false);
         errorHandler.setShowStacks(false);
         errorHandler.setShowMessageInTitle(false);
         return errorHandler;

nifi-registry/nifi-registry-core/pom.xml

@@ -54,37 +54,37 @@
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.http2</groupId>
                 <artifactId>jetty-http2-server</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.ee10</groupId>
                 <artifactId>jetty-ee10-servlet</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.ee10</groupId>
                 <artifactId>jetty-ee10-webapp</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.ee10</groupId>
                 <artifactId>jetty-ee10-servlets</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.ee10</groupId>
                 <artifactId>jetty-ee10-annotations</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.ee10</groupId>
                 <artifactId>jetty-ee10-apache-jsp</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.servlet</groupId>

nifi-registry/pom.xml

@@ -35,7 +35,6 @@
         <module>nifi-registry-docker-maven</module>
     </modules>
     <properties>
-        <nifi.registry.jetty.version>12.0.25</nifi.registry.jetty.version>
         <servlet-api.version>6.0.0</servlet-api.version>
         <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
         <jersey.bom.version>3.1.11</jersey.bom.version>
@@ -51,14 +50,14 @@
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-bom</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.ee10</groupId>
                 <artifactId>jetty-ee10-bom</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -88,25 +87,25 @@
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-alpn-server</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-alpn-java-server</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.ee10</groupId>
                 <artifactId>jetty-ee10-glassfish-jstl</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.ee10</groupId>
                 <artifactId>jetty-ee10-annotations</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
                 <scope>compile</scope>
             </dependency>
             <dependency>
@@ -165,7 +164,7 @@
             <dependency>
                 <groupId>org.eclipse.jetty.http2</groupId>
                 <artifactId>jetty-http2-server</artifactId>
-                <version>${nifi.registry.jetty.version}</version>
+                <version>${jetty.version}</version>
                 <scope>compile</scope>
             </dependency>
 	    <!-- NiFi Registry Modules -->