From 5d49bed4b481d06fc5db139a30d1b61bcf6b690b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 3 May 2024 09:56:44 -0400
Subject: [PATCH] Using jetty-parent to reduce number of dependabot

---
 apache-el/pom.xml  | 221 +++++++++++++--------------
 apache-jsp/pom.xml | 371 ++++++++++++++++++++++-----------------------
 pom.xml            | 216 +++++++-------------------
 3 files changed, 346 insertions(+), 462 deletions(-)

diff --git a/apache-el/pom.xml b/apache-el/pom.xml
index a2c54b7b..7707116e 100644
--- a/apache-el/pom.xml
+++ b/apache-el/pom.xml
@@ -1,29 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.mortbay.jasper</groupId>
     <artifactId>jasper-jsp</artifactId>
     <version>10.0.27-SNAPSHOT</version>
   </parent>
-
-  <modelVersion>4.0.0</modelVersion>
   <artifactId>apache-el</artifactId>
   <packaging>jar</packaging>
   <name>MortBay :: Apache EL :: API and Implementation</name>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jasper</artifactId>
+      <version>${tomcat.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>${servlet.api.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.10.14</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
   <build>
-    <sourceDirectory>${project.build.directory}/sources</sourceDirectory>
     <plugins>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Automatic-Module-Name>org.mortbay.apache.el</Automatic-Module-Name>
+            <Bundle-Name>Mortbay Apache EL API and Implementation</Bundle-Name>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+            <Bundle-Classpath>.</Bundle-Classpath>
+            <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+            <Specification-Version>3.0</Specification-Version>
+            <Implementation-Version>${tomcat.version}</Implementation-Version>
+            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+            <Export-Package>!jakarta.servlet.*,
+              jakarta.el;version="4.0.0",
+              org.apache.el;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+              org.apache.el.lang;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+              org.apache.el.stream;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+              org.apache.el.parser;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+              org.apache.el.util;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"</Export-Package>
+            <Import-Package>jakarta.servlet.jsp;version="3.0",
+                jakarta.servlet.jsp.el;version="3.0",
+                jakarta.servlet.jsp.tagext;version="3.0"</Import-Package>
+            <_nouses>true</_nouses>
+            <_contract />
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <phase>process-classes</phase>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
             <id>unpack-source</id>
-            <phase>generate-sources</phase>
             <goals>
               <goal>unpack-dependencies</goal>
             </goals>
+            <phase>generate-sources</phase>
             <configuration>
               <excludeArtifactIds>jakarta.servlet-api,ecj,ant,ant-launcher</excludeArtifactIds>
               <classifier>sources</classifier>
@@ -33,42 +92,58 @@
           </execution>
         </executions>
       </plugin>
-
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
+            <id>sources-jar</id>
             <goals>
-              <goal>add-source</goal>
+              <goal>jar</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
-              <sources>
-                <source>${project.build.directory}/sources</source>
-              </sources>
+              <classifier>sources</classifier>
+              <classesDirectory>${project.build.directory}/sources</classesDirectory>
+              <forceCreation>true</forceCreation>
+              <useDefaultManifestFile>false</useDefaultManifestFile>
+              <excludes>
+                <exclude>*.java</exclude>
+              </excludes>
+              <archive>
+                <manifestEntries>
+                  <Automatic-Module-Name>org.mortbay.apache.el.sources</Automatic-Module-Name>
+                  <Bundle-Name>Mortbay Apache EL API and Implementation Sources</Bundle-Name>
+                </manifestEntries>
+              </archive>
             </configuration>
           </execution>
-          <execution>
-            <id>set-osgi-version</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>parse-version</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <source>8</source>
+          <additionalDependencies>
+            <additionalDependency>
+              <groupId>biz.aQute.bnd</groupId>
+              <artifactId>biz.aQute.bnd</artifactId>
+              <version>5.2.0</version>
+            </additionalDependency>
+          </additionalDependencies>
+        </configuration>
+      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <createSourcesJar>false</createSourcesJar>
               <shadeSourcesContent>false</shadeSourcesContent>
@@ -101,113 +176,33 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
+            <id>set-osgi-version</id>
             <goals>
-              <goal>manifest</goal>
+              <goal>parse-version</goal>
             </goals>
+            <phase>validate</phase>
           </execution>
-        </executions>
-        <configuration>
-          <instructions>
-            <Automatic-Module-Name>org.mortbay.apache.el</Automatic-Module-Name>
-            <Bundle-Name>Mortbay Apache EL API and Implementation</Bundle-Name>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
-            <Bundle-Classpath>.</Bundle-Classpath>
-            <Bundle-Version>
-              ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}
-            </Bundle-Version>
-            <Specification-Version>3.0</Specification-Version>
-            <Implementation-Version>${tomcat.version}</Implementation-Version>
-            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-            <Export-Package>!jakarta.servlet.*,
-              jakarta.el;version="4.0.0",
-              org.apache.el;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-              org.apache.el.lang;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-              org.apache.el.stream;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-              org.apache.el.parser;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-              org.apache.el.util;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
-            </Export-Package>
-            <Import-Package>
-                jakarta.servlet.jsp;version="3.0",
-                jakarta.servlet.jsp.el;version="3.0",
-                jakarta.servlet.jsp.tagext;version="3.0"
-            </Import-Package>
-            <_nouses>true</_nouses>
-            <_contract />
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
           <execution>
-            <id>sources-jar</id>
-            <phase>package</phase>
+            <id>add-source</id>
             <goals>
-              <goal>jar</goal>
+              <goal>add-source</goal>
             </goals>
+            <phase>generate-sources</phase>
             <configuration>
-              <classifier>sources</classifier>
-              <classesDirectory>${project.build.directory}/sources</classesDirectory>
-              <forceCreation>true</forceCreation>
-              <useDefaultManifestFile>false</useDefaultManifestFile>
-              <excludes>
-                <exclude>*.java</exclude>
-              </excludes>
-              <archive>
-                <manifestEntries>
-                  <Automatic-Module-Name>org.mortbay.apache.el.sources</Automatic-Module-Name>
-                  <Bundle-Name>Mortbay Apache EL API and Implementation Sources</Bundle-Name>
-                </manifestEntries>
-              </archive>
+              <sources>
+                <source>${project.build.directory}/sources</source>
+              </sources>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <source>8</source>
-          <additionalDependencies>
-            <additionalDependency>
-              <groupId>biz.aQute.bnd</groupId>
-              <artifactId>biz.aQute.bnd</artifactId>
-              <version>5.2.0</version>
-            </additionalDependency>
-          </additionalDependencies>
-        </configuration>
-      </plugin>
 
     </plugins>
+    <sourceDirectory>${project.build.directory}/sources</sourceDirectory>
   </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
-      <version>${servlet.api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-jasper</artifactId>
-      <version>${tomcat.version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.10.14</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
 </project>
diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml
index deeb216b..7f8501ec 100644
--- a/apache-jsp/pom.xml
+++ b/apache-jsp/pom.xml
@@ -1,30 +1,159 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.mortbay.jasper</groupId>
     <artifactId>jasper-jsp</artifactId>
     <version>10.0.27-SNAPSHOT</version>
   </parent>
-
-  <modelVersion>4.0.0</modelVersion>
   <artifactId>apache-jsp</artifactId>
   <packaging>jar</packaging>
   <name>MortBay :: Apache Jasper :: JSP Implementation</name>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-jasper</artifactId>
+      <version>${tomcat.version}</version>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.tomcat</groupId>
+          <artifactId>tomcat-el-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.tomcat</groupId>
+          <artifactId>tomcat-jasper-el</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.tomcat</groupId>
+          <artifactId>tomcat-servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jdt</groupId>
+          <artifactId>ecj</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>ecj</artifactId>
+      <version>${ecj.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-schemas</artifactId>
+      <version>5.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mortbay.jasper</groupId>
+      <artifactId>apache-el</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
   <build>
-    <sourceDirectory>${project.build.directory}/sources</sourceDirectory>
     <plugins>
 
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <!-- common part -->
+        <configuration>
+          <instructions>
+            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
+            <Bundle-Classpath>.</Bundle-Classpath>
+            <Bundle-Version>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</Bundle-Version>
+            <Specification-Version>2.3</Specification-Version>
+            <Implementation-Version>${tomcat.version}</Implementation-Version>
+            <Require-Capability>osgi.serviceloader;
+              filter:="(osgi.serviceloader=org.apache.juli.logging.Log)";resolution:=optional;cardinality:=multiple,
+              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability>
+            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+            <_nouses>true</_nouses>
+          </instructions>
+        </configuration>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <phase>process-classes</phase>
+            <configuration>
+              <instructions>
+                <Automatic-Module-Name>org.mortbay.apache.jasper</Automatic-Module-Name>
+                <Bundle-Name>Mortbay Jasper</Bundle-Name>
+                <Export-Package>!org.mortbay.*,
+                  org.apache.juli.logging;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util.compat;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util.scan;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util.file;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util.digester;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util.descriptor.tagplugin;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util.descriptor.tld;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util.descriptor.web;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util.buf;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util.res;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.tomcat.util.security;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  jakarta.servlet.jsp;version="3.0",
+                  jakarta.servlet.jsp.el;version="3.0",
+                  jakarta.servlet.jsp.tagext;version="3.0",
+                  jakarta.servlet.jsp.resources;version="3.0",
+                  org.apache.jasper;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.compiler;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.compiler.tagplugin;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.el;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.resources;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.runtime;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.security;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.servlet;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.tagplugins.jstl;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.tagplugins.jstl.core;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.util;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
+                  org.apache.jasper.xmlparser;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",</Export-Package>
+                <Import-Package>!org.apache.tools.ant.*,
+                  jakarta.el;version="4.0",
+                  javax.naming,
+                  javax.net.ssl,
+                  jakarta.servlet;version="5.0",
+                  jakarta.servlet.annotation;version="5.0",
+                  jakarta.servlet.descriptor;version="5.0",
+                  jakarta.servlet.http;version="5.0",
+                  jakarta.servlet.resources;version="5.0",
+                  javax.xml.parsers,
+                  org.apache.el.util,
+                  org.apache.tomcat.util.descriptor;version="10.0.0";resolution:=optional,
+                  org.apache.tomcat.util.descriptor.tagplugin;version="10.0.0";resolution:=optional,
+                  org.eclipse.jdt.core.compiler,
+                  org.eclipse.jdt.internal.compiler,
+                  org.eclipse.jdt.internal.compiler.classfmt,
+                  org.eclipse.jdt.internal.compiler.env,
+                  org.eclipse.jdt.internal.compiler.impl,
+                  org.eclipse.jdt.internal.compiler.problem,
+                  org.xml.sax,
+                  org.xml.sax.ext,
+                  org.xml.sax.helpers</Import-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
             <id>unpack-source</id>
-            <phase>generate-sources</phase>
             <goals>
               <goal>unpack-dependencies</goal>
             </goals>
+            <phase>generate-sources</phase>
             <configuration>
               <classifier>sources</classifier>
               <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
@@ -35,33 +164,54 @@
           </execution>
         </executions>
       </plugin>
-
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
         <executions>
           <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
+            <id>sources-jar</id>
             <goals>
-              <goal>add-source</goal>
+              <goal>jar</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
-              <sources>
-                <source>${project.build.directory}/sources</source>
-              </sources>
+              <classifier>sources</classifier>
+              <classesDirectory>${project.build.directory}/sources</classesDirectory>
+              <forceCreation>true</forceCreation>
+              <useDefaultManifestFile>false</useDefaultManifestFile>
+              <excludes>
+                <exclude>*.java</exclude>
+              </excludes>
+              <archive>
+                <manifestEntries>
+                  <Automatic-Module-Name>org.mortbay.apache.jasper.sources</Automatic-Module-Name>
+                  <Bundle-Name>Mortbay Jasper Sources</Bundle-Name>
+                </manifestEntries>
+              </archive>
             </configuration>
           </execution>
-          <execution>
-            <id>set-osgi-version</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>parse-version</goal>
-            </goals>
-          </execution>
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <source>8</source>
+          <additionalDependencies>
+            <additionalDependency>
+              <groupId>biz.aQute.bnd</groupId>
+              <artifactId>biz.aQute.bnd</artifactId>
+              <version>5.2.0</version>
+            </additionalDependency>
+            <additionalDependency>
+              <groupId>org.apache.ant</groupId>
+              <artifactId>ant</artifactId>
+              <version>1.10.9</version>
+            </additionalDependency>
+          </additionalDependencies>
+        </configuration>
+      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -149,197 +299,42 @@
         <executions>
           <execution>
             <id>shaded-jar-binaries</id>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
 
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <!-- common part -->
-        <configuration>
-          <instructions>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.7</Bundle-RequiredExecutionEnvironment>
-            <Bundle-Classpath>.</Bundle-Classpath>
-            <Bundle-Version>
-              ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}
-            </Bundle-Version>
-            <Specification-Version>2.3</Specification-Version>
-            <Implementation-Version>${tomcat.version}</Implementation-Version>
-            <Require-Capability>osgi.serviceloader;
-              filter:="(osgi.serviceloader=org.apache.juli.logging.Log)";resolution:=optional;cardinality:=multiple,
-              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"
-            </Require-Capability>
-            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-            <_nouses>true</_nouses>
-          </instructions>
-        </configuration>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
+            <id>set-osgi-version</id>
             <goals>
-              <goal>manifest</goal>
+              <goal>parse-version</goal>
             </goals>
-            <configuration>
-              <instructions>
-                <Automatic-Module-Name>org.mortbay.apache.jasper</Automatic-Module-Name>
-                <Bundle-Name>Mortbay Jasper</Bundle-Name>
-                <Export-Package>!org.mortbay.*,
-                  org.apache.juli.logging;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util.compat;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util.scan;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util.file;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util.digester;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util.descriptor.tagplugin;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util.descriptor.tld;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util.descriptor.web;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util.buf;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util.res;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.tomcat.util.security;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  jakarta.servlet.jsp;version="3.0",
-                  jakarta.servlet.jsp.el;version="3.0",
-                  jakarta.servlet.jsp.tagext;version="3.0",
-                  jakarta.servlet.jsp.resources;version="3.0",
-                  org.apache.jasper;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.compiler;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.compiler.tagplugin;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.el;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.resources;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.runtime;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.security;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.servlet;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.tagplugins.jstl;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.tagplugins.jstl.core;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.util;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                  org.apache.jasper.xmlparser;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-                </Export-Package>
-                <Import-Package>!org.apache.tools.ant.*,
-                  jakarta.el;version="4.0",
-                  javax.naming,
-                  javax.net.ssl,
-                  jakarta.servlet;version="5.0",
-                  jakarta.servlet.annotation;version="5.0",
-                  jakarta.servlet.descriptor;version="5.0",
-                  jakarta.servlet.http;version="5.0",
-                  jakarta.servlet.resources;version="5.0",
-                  javax.xml.parsers,
-                  org.apache.el.util,
-                  org.apache.tomcat.util.descriptor;version="10.0.0";resolution:=optional,
-                  org.apache.tomcat.util.descriptor.tagplugin;version="10.0.0";resolution:=optional,
-                  org.eclipse.jdt.core.compiler,
-                  org.eclipse.jdt.internal.compiler,
-                  org.eclipse.jdt.internal.compiler.classfmt,
-                  org.eclipse.jdt.internal.compiler.env,
-                  org.eclipse.jdt.internal.compiler.impl,
-                  org.eclipse.jdt.internal.compiler.problem,
-                  org.xml.sax,
-                  org.xml.sax.ext,
-                  org.xml.sax.helpers
-                </Import-Package>
-              </instructions>
-            </configuration>
+            <phase>validate</phase>
           </execution>
-        </executions> </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
           <execution>
-            <id>sources-jar</id>
-            <phase>package</phase>
+            <id>add-source</id>
             <goals>
-              <goal>jar</goal>
+              <goal>add-source</goal>
             </goals>
+            <phase>generate-sources</phase>
             <configuration>
-              <classifier>sources</classifier>
-              <classesDirectory>${project.build.directory}/sources</classesDirectory>
-              <forceCreation>true</forceCreation>
-              <useDefaultManifestFile>false</useDefaultManifestFile>
-              <excludes>
-                <exclude>*.java</exclude>
-              </excludes>
-              <archive>
-                <manifestEntries>
-                  <Automatic-Module-Name>org.mortbay.apache.jasper.sources</Automatic-Module-Name>
-                  <Bundle-Name>Mortbay Jasper Sources</Bundle-Name>
-                </manifestEntries>
-              </archive>
+              <sources>
+                <source>${project.build.directory}/sources</source>
+              </sources>
             </configuration>
           </execution>
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <source>8</source>
-          <additionalDependencies>
-            <additionalDependency>
-              <groupId>biz.aQute.bnd</groupId>
-              <artifactId>biz.aQute.bnd</artifactId>
-              <version>5.2.0</version>
-            </additionalDependency>
-            <additionalDependency>
-              <groupId>org.apache.ant</groupId>
-              <artifactId>ant</artifactId>
-              <version>1.10.9</version>
-            </additionalDependency>
-          </additionalDependencies>
-        </configuration>
-      </plugin>
-
     </plugins>
+    <sourceDirectory>${project.build.directory}/sources</sourceDirectory>
   </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-schemas</artifactId>
-      <version>5.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-el</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-jasper</artifactId>
-      <version>${tomcat.version}</version>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.tomcat</groupId>
-          <artifactId>tomcat-servlet-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.eclipse.jdt</groupId>
-          <artifactId>ecj</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.tomcat</groupId>
-          <artifactId>tomcat-el-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.tomcat</groupId>
-          <artifactId>tomcat-jasper-el</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jdt</groupId>
-      <artifactId>ecj</artifactId>
-      <version>${ecj.version}</version>
-    </dependency>
-  </dependencies>
-
 </project>
diff --git a/pom.xml b/pom.xml
index 135c5222..7eb3d8c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,26 +2,24 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.jetty</groupId>
+    <artifactId>jetty-parent</artifactId>
+    <version>26</version>
+  </parent>
   <groupId>org.mortbay.jasper</groupId>
   <artifactId>jasper-jsp</artifactId>
   <version>10.0.27-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Jetty :: Jasper :: Project</name>
 
-  <description>
-    A rebundling of Apache Tomcat Jasper to remove the tomcat server dependencies,
-    so that the JSP engine can be used by the Eclipse Jetty project.
-  </description>
+  <description>A rebundling of Apache Tomcat Jasper to remove the tomcat server dependencies,
+    so that the JSP engine can be used by the Eclipse Jetty project.</description>
 
   <url>https://github.com/jetty-project/jasper-jsp</url>
 
   <inceptionYear>2014</inceptionYear>
 
-  <issueManagement>
-    <system>github</system>
-    <url>https://github.com/jetty-project/jasper-jsp/issues</url>
-  </issueManagement>
-
   <licenses>
     <license>
       <name>Apache License Version 2.0</name>
@@ -29,15 +27,8 @@
     </license>
   </licenses>
 
-  <scm>
-    <connection>scm:git:git://github.com/jetty-project/jasper-jsp.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/jetty-project/jasper-jsp.git</developerConnection>
-    <url>https://github.com/jetty-project/jasper-jsp</url>
-    <tag>HEAD</tag>
-  </scm>
-
   <developers>
-      <developer>
+    <developer>
       <id>janb</id>
       <name>Jan Bartel</name>
       <email>janb@webtide.com</email>
@@ -55,73 +46,62 @@
     </developer>
   </developers>
 
+  <modules>
+    <module>apache-el</module>
+    <module>apache-jsp</module>
+  </modules>
+
+  <scm>
+    <connection>scm:git:git://github.com/jetty-project/jasper-jsp.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/jetty-project/jasper-jsp.git</developerConnection>
+    <url>https://github.com/jetty-project/jasper-jsp</url>
+  </scm>
+
+  <issueManagement>
+    <system>github</system>
+    <url>https://github.com/jetty-project/jasper-jsp/issues</url>
+  </issueManagement>
+
   <properties>
+    <ecj.version>3.33.0</ecj.version>
     <servlet.api.version>5.0.0</servlet.api.version>
     <!-- must update both versions together -->
     <tomcat.version>10.0.27</tomcat.version>
-    <ecj.version>3.33.0</ecj.version>
   </properties>
 
   <repositories>
     <repository>
-      <id>sonatype-snapshots</id>
-      <name>Sonatype Jetty Snapshots</name>
-      <url>https://oss.sonatype.org/content/groups/jetty</url>
       <snapshots>
         <enabled>true</enabled>
       </snapshots>
+      <id>sonatype-snapshots</id>
+      <name>Sonatype Jetty Snapshots</name>
+      <url>https://oss.sonatype.org/content/groups/jetty</url>
     </repository>
     <repository>
-      <id>jetty-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
       <releases>
         <enabled>false</enabled>
       </releases>
       <snapshots>
         <enabled>true</enabled>
       </snapshots>
+      <id>jetty-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
     </repository>
   </repositories>
 
-  <modules>
-    <module>apache-el</module>
-    <module>apache-jsp</module>
-  </modules>
-
   <build>
     <defaultGoal>install</defaultGoal>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>require-jdk11</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireJavaVersion>
-                  <version>11</version>
-                </requireJavaVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>3.3.2</version>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>5.1.9</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.13.0</version>
           <configuration>
             <source>11</source>
             <target>11</target>
@@ -129,55 +109,10 @@
             <skip>true</skip>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.6.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.1.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.4.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>3.1.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.2.5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-gpg-plugin</artifactId>
-          <version>3.2.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.4.1</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.6.3</version>
           <configuration>
-<!--            <includeDependencySources>true</includeDependencySources>-->
-<!--            <dependencySourceIncludes>-->
-<!--              <dependencySourceInclude>org.apache.tomcat:*</dependencySourceInclude>-->
-<!--            </dependencySourceIncludes>-->
             <additionalDependencies>
               <additionalDependency>
                 <groupId>jakarta.servlet</groupId>
@@ -259,21 +194,14 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>3.0.1</version>
           <configuration>
             <autoVersionSubmodules>true</autoVersionSubmodules>
             <releaseProfiles>eclipse-release</releaseProfiles>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>3.5.2</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.3.1</version>
           <executions>
             <execution>
               <id>attach-sources</id>
@@ -293,78 +221,44 @@
           <artifactId>build-helper-maven-plugin</artifactId>
           <version>3.5.0</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>5.1.9</version>
-        </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>require-jdk11</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>11</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 
-  <distributionManagement>
-    <repository>
-      <id>oss.sonatype.org</id>
-      <name>Jetty Staging Repository</name>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-    <snapshotRepository>
-      <id>oss.sonatype.org</id>
-      <name>Jetty Snapshot Repository</name>
-      <url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
-
   <profiles>
     <profile>
       <id>eclipse-release</id>
       <build>
         <plugins>
           <plugin>
-            <inherited>true</inherited>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-deploy-plugin</artifactId>
+            <inherited>true</inherited>
             <configuration>
               <updateReleaseInfo>true</updateReleaseInfo>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>