Issue #13447 use new artifactId with new names (#13510)

olamy · web-flow · commit c724f58d665c · 2025-09-05T09:06:34.000+10:00
* Issue #13447 use new artifactId with new names for mortbay-apache-jsp and mortbay-apache-el Signed-off-by: Olivier Lamy <olamy@apache.org>
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -58,7 +58,7 @@ The following dependencies are ASL2 licensed.
 The following dependencies are ASL2 licensed.  Based on selected classes from
 following Apache Tomcat jars, all ASL2 licensed.
 
- * org.mortbay.jasper:apache-jsp
+ * org.mortbay.jasper:mortbay-apache-jsp
  * org.apache.tomcat:tomcat-jasper
  * org.apache.tomcat:tomcat-juli
  * org.apache.tomcat:tomcat-jsp-api
@@ -67,7 +67,7 @@ following Apache Tomcat jars, all ASL2 licensed.
  * org.apache.tomcat:tomcat-api
  * org.apache.tomcat:tomcat-util-scan
  * org.apache.tomcat:tomcat-util
- * org.mortbay.jasper:apache-el
+ * org.mortbay.jasper:mortbay-apache-el
  * org.apache.tomcat:tomcat-jasper-el
  * org.apache.tomcat:tomcat-el-api
 
diff --git a/jetty-ee10/jetty-ee10-apache-jsp/pom.xml b/jetty-ee10/jetty-ee10-apache-jsp/pom.xml
@@ -26,7 +26,7 @@
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-jsp</artifactId>
+      <artifactId>mortbay-apache-jsp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
@@ -14,7 +14,7 @@ ee10-annotations
 lib/ee10-apache-jsp/@jakarta.el:jakarta.el-api@
 lib/ee10-apache-jsp/@jakarta.servlet.jsp:jakarta.servlet.jsp-api@
 lib/ee10-apache-jsp/@org.eclipse.jdt:ecj@
-lib/ee10-apache-jsp/@org.mortbay.jasper:apache-el@
-lib/ee10-apache-jsp/@org.mortbay.jasper:apache-jsp@
+lib/ee10-apache-jsp/@org.mortbay.jasper:mortbay-apache-el@
+lib/ee10-apache-jsp/@org.mortbay.jasper:mortbay-apache-jsp@
 lib/jetty-ee10-apache-jsp-${jetty.version}.jar
 
diff --git a/jetty-ee10/jetty-ee10-home/pom.xml b/jetty-ee10/jetty-ee10-home/pom.xml
@@ -256,7 +256,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <includeGroupIds>jakarta.servlet.jsp,jakarta.el,org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
-              <includeArtifactIds>jakarta.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj</includeArtifactIds>
+              <includeArtifactIds>jakarta.servlet.jsp-api,jakarta.el-api,mortbay-apache-el,mortbay-apache-jsp,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/ee10-apache-jsp</outputDirectory>
             </configuration>
@@ -269,7 +269,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <includeGroupIds>jakarta.servlet.jsp,jakart.el,org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
-              <includeArtifactIds>jakart.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj</includeArtifactIds>
+              <includeArtifactIds>jakart.servlet.jsp-api,jakarta.el-api,mortbay-apache-el,mortbay-apache-jsp,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib/ee10-apache-jsp</outputDirectory>
diff --git a/jetty-ee10/jetty-ee10-maven-plugin/pom.xml b/jetty-ee10/jetty-ee10-maven-plugin/pom.xml
@@ -15,7 +15,7 @@
     <bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
     <jetty.jvmArgs></jetty.jvmArgs>
     <jetty.stopKey>FREEBEER</jetty.stopKey>
-    <junit.jupiter.execution.parallel.enabled>false</junit.jupiter.execution.parallel.enabled>
+    <!--    <junit.jupiter.execution.parallel.enabled>false</junit.jupiter.execution.parallel.enabled>-->
   </properties>
   <dependencies>
     <dependency>
diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/pom.xml
@@ -78,11 +78,11 @@
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-el</artifactId>
+      <artifactId>mortbay-apache-el</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-jsp</artifactId>
+      <artifactId>mortbay-apache-jsp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.tinybundles</groupId>
diff --git a/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestOSGiUtil.java b/jetty-ee10/jetty-ee10-osgi/test-jetty-ee10-osgi/src/test/java/org/eclipse/jetty/ee10/osgi/test/TestOSGiUtil.java
@@ -268,8 +268,8 @@ public static void coreJspDependencies(List<Option> res)
         //jetty jsp bundles
         res.add(systemProperty("jakarta.el.ExpressionFactory").value("org.apache.el.ExpressionFactoryImpl"));
         res.add(mavenBundle().groupId("jakarta.servlet.jsp").artifactId("jakarta.servlet.jsp-api").versionAsInProject());
-        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("apache-el").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("apache-jsp").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("mortbay-apache-el").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("mortbay-apache-jsp").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-apache-jsp").versionAsInProject().start());
         res.add(mavenBundle().groupId("jakarta.servlet.jsp.jstl").artifactId("jakarta.servlet.jsp.jstl-api").versionAsInProject());
         res.add(mavenBundle().groupId("org.glassfish.web").artifactId("jakarta.servlet.jsp.jstl").versionAsInProject().start());
diff --git a/jetty-ee10/pom.xml b/jetty-ee10/pom.xml
@@ -49,7 +49,7 @@
     <ee10.jakarta.xml.bind.impl.version>4.0.5</ee10.jakarta.xml.bind.impl.version>
     <ee10.jakarta.xml.jaxws.impl.version>4.0.2</ee10.jakarta.xml.jaxws.impl.version>
     <ee10.jersey.version>3.1.10</ee10.jersey.version>
-    <ee10.jsp.impl.version>10.1.43</ee10.jsp.impl.version>
+    <ee10.jsp.impl.version>10.1.44.1</ee10.jsp.impl.version>
     <ee10.mail.impl.version>2.0.1</ee10.mail.impl.version>
     <ee10.weld.version>5.1.5.Final</ee10.weld.version>
   </properties>
@@ -263,13 +263,13 @@
       </dependency>
       <dependency>
         <groupId>org.mortbay.jasper</groupId>
-        <artifactId>apache-el</artifactId>
+        <artifactId>mortbay-apache-el</artifactId>
         <version>${ee10.jsp.impl.version}</version>
       </dependency>
       <!-- Jakarta EE10 Dependencies -->
       <dependency>
         <groupId>org.mortbay.jasper</groupId>
-        <artifactId>apache-jsp</artifactId>
+        <artifactId>mortbay-apache-jsp</artifactId>
         <version>${ee10.jsp.impl.version}</version>
       </dependency>
     </dependencies>
diff --git a/jetty-ee11/jetty-ee11-apache-jsp/pom.xml b/jetty-ee11/jetty-ee11-apache-jsp/pom.xml
@@ -26,7 +26,7 @@
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-jsp</artifactId>
+      <artifactId>mortbay-apache-jsp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/jetty-ee11/jetty-ee11-apache-jsp/src/main/config/modules/ee11-apache-jsp.mod b/jetty-ee11/jetty-ee11-apache-jsp/src/main/config/modules/ee11-apache-jsp.mod
@@ -14,7 +14,7 @@ ee11-annotations
 lib/ee11-apache-jsp/@jakarta.el:jakarta.el-api@
 lib/ee11-apache-jsp/@jakarta.servlet.jsp:jakarta.servlet.jsp-api@
 lib/ee11-apache-jsp/@org.eclipse.jdt:ecj@
-lib/ee11-apache-jsp/@org.mortbay.jasper:apache-el@
-lib/ee11-apache-jsp/@org.mortbay.jasper:apache-jsp@
+lib/ee11-apache-jsp/@org.mortbay.jasper:mortbay-apache-el@
+lib/ee11-apache-jsp/@org.mortbay.jasper:mortbay-apache-jsp@
 lib/jetty-ee11-apache-jsp-${jetty.version}.jar
 
diff --git a/jetty-ee11/jetty-ee11-home/pom.xml b/jetty-ee11/jetty-ee11-home/pom.xml
@@ -256,7 +256,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <includeGroupIds>jakarta.servlet.jsp,jakarta.el,org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
-              <includeArtifactIds>jakarta.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj</includeArtifactIds>
+              <includeArtifactIds>jakarta.servlet.jsp-api,jakarta.el-api,mortbay-apache-el,mortbay-apache-jsp,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/ee11-apache-jsp</outputDirectory>
             </configuration>
@@ -269,7 +269,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <includeGroupIds>jakarta.servlet.jsp,jakart.el,org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
-              <includeArtifactIds>jakart.servlet.jsp-api,jakarta.el-api,apache-el,apache-jsp,ecj</includeArtifactIds>
+              <includeArtifactIds>jakart.servlet.jsp-api,jakarta.el-api,mortbay-apache-el,mortbay-apache-jsp,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib/ee11-apache-jsp</outputDirectory>
diff --git a/jetty-ee11/jetty-ee11-maven-plugin/pom.xml b/jetty-ee11/jetty-ee11-maven-plugin/pom.xml
@@ -15,7 +15,6 @@
     <bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
     <jetty.jvmArgs></jetty.jvmArgs>
     <jetty.stopKey>FREEBEER</jetty.stopKey>
-    <junit.jupiter.execution.parallel.enabled>false</junit.jupiter.execution.parallel.enabled>
   </properties>
   <dependencies>
     <dependency>
diff --git a/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/pom.xml b/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/pom.xml
@@ -75,11 +75,11 @@
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-el</artifactId>
+      <artifactId>mortbay-apache-el</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-jsp</artifactId>
+      <artifactId>mortbay-apache-jsp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.tinybundles</groupId>
diff --git a/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestOSGiUtil.java b/jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestOSGiUtil.java
@@ -269,8 +269,8 @@ public static void coreJspDependencies(List<Option> res)
         //jetty jsp bundles
         res.add(systemProperty("jakarta.el.ExpressionFactory").value("org.apache.el.ExpressionFactoryImpl"));
         res.add(mavenBundle().groupId("jakarta.servlet.jsp").artifactId("jakarta.servlet.jsp-api").versionAsInProject());
-        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("apache-el").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("apache-jsp").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("mortbay-apache-el").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("mortbay-apache-jsp").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-apache-jsp").versionAsInProject().start());
         res.add(mavenBundle().groupId("jakarta.servlet.jsp.jstl").artifactId("jakarta.servlet.jsp.jstl-api").versionAsInProject());
         res.add(mavenBundle().groupId("org.glassfish.wasp").artifactId("wasp").versionAsInProject().start());
diff --git a/jetty-ee11/pom.xml b/jetty-ee11/pom.xml
@@ -47,7 +47,7 @@
     <ee11.jakarta.xml.bind.impl.version>4.0.5</ee11.jakarta.xml.bind.impl.version>
     <ee11.jakarta.xml.jaxws.impl.version>4.0.2</ee11.jakarta.xml.jaxws.impl.version>
     <ee11.jersey.version>4.0.0-M2</ee11.jersey.version>
-    <ee11.jsp.impl.version>11.0.7</ee11.jsp.impl.version>
+    <ee11.jsp.impl.version>11.0.10.1</ee11.jsp.impl.version>
     <ee11.mail.impl.version>2.0.1</ee11.mail.impl.version>
     <ee11.weld.version>6.0.1.Final</ee11.weld.version>
   </properties>
@@ -224,13 +224,13 @@
       </dependency>
       <dependency>
         <groupId>org.mortbay.jasper</groupId>
-        <artifactId>apache-el</artifactId>
+        <artifactId>mortbay-apache-el</artifactId>
         <version>${ee11.jsp.impl.version}</version>
       </dependency>
       <!-- Jakarta EE11 Dependencies -->
       <dependency>
         <groupId>org.mortbay.jasper</groupId>
-        <artifactId>apache-jsp</artifactId>
+        <artifactId>mortbay-apache-jsp</artifactId>
         <version>${ee11.jsp.impl.version}</version>
       </dependency>
     </dependencies>
diff --git a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml
@@ -27,7 +27,7 @@
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-jsp</artifactId>
+      <artifactId>mortbay-apache-jsp</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.eclipse.jetty.toolchain</groupId>
diff --git a/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod b/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod
@@ -12,6 +12,6 @@ ee8-annotations
 
 [lib]
 lib/ee8-apache-jsp/@org.eclipse.jdt:ecj@
-lib/ee8-apache-jsp/@org.mortbay.jasper:apache-el@
-lib/ee8-apache-jsp/@org.mortbay.jasper:apache-jsp@
+lib/ee8-apache-jsp/@org.mortbay.jasper:mortbay-apache-el@
+lib/ee8-apache-jsp/@org.mortbay.jasper:mortbay-apache-jsp@
 lib/jetty-ee8-apache-jsp-${jetty.version}.jar
diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml
@@ -224,7 +224,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
-              <includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
+              <includeArtifactIds>mortbay-apache-jsp,mortbay-apache-el,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/ee8-apache-jsp</outputDirectory>
             </configuration>
@@ -237,7 +237,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
-              <includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
+              <includeArtifactIds>mortbay-apache-jsp,mortbay-apache-el,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib/ee8-apache-jsp</outputDirectory>
diff --git a/jetty-ee8/jetty-ee8-maven-plugin/pom.xml b/jetty-ee8/jetty-ee8-maven-plugin/pom.xml
@@ -16,7 +16,7 @@
     <jacoco.skip>true</jacoco.skip>
     <jetty.jvmArgs></jetty.jvmArgs>
     <jetty.stopKey>FREEBEER</jetty.stopKey>
-    <junit.jupiter.execution.parallel.enabled>false</junit.jupiter.execution.parallel.enabled>
+    <!--    <junit.jupiter.execution.parallel.enabled>false</junit.jupiter.execution.parallel.enabled>-->
   </properties>
   <dependencies>
     <dependency>
diff --git a/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/pom.xml b/jetty-ee8/jetty-ee8-osgi/test-jetty-ee8-osgi/pom.xml
@@ -18,7 +18,7 @@
     <!-- too many duplicates with osgi jars... -->
     <duplicate-finder.skip>true</duplicate-finder.skip>
     <ee9.module>jetty-ee9-osgi/test-jetty-ee9-osgi</ee9.module>
-    <el.artifactId>apache-el</el.artifactId>
+    <el.artifactId>mortbay-apache-el</el.artifactId>
     <el.groupId>org.mortbay.jasper</el.groupId>
     <enterprise.artifactId>jakarta.enterprise.cdi-api</enterprise.artifactId>
     <enterprise.groupId>jakarta.enterprise</enterprise.groupId>
@@ -92,11 +92,11 @@
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-el</artifactId>
+      <artifactId>mortbay-apache-el</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-jsp</artifactId>
+      <artifactId>mortbay-apache-jsp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.tinybundles</groupId>
diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml
@@ -49,7 +49,7 @@
     <ee8.javax.security.auth.message>1.0.0.v201108011116</ee8.javax.security.auth.message>
     <ee8.javax.servlet.jsp.jstl.impl.version>1.2.5</ee8.javax.servlet.jsp.jstl.impl.version>
     <ee8.jetty.servlet.api.version>4.0.6</ee8.jetty.servlet.api.version>
-    <ee8.jsp.impl.version>9.0.107</ee8.jsp.impl.version>
+    <ee8.jsp.impl.version>9.0.108.1</ee8.jsp.impl.version>
     <ee8.weld.version>3.1.9.Final</ee8.weld.version>
     <ee9.module></ee9.module>
     <ee9.module.path>${maven.multiModuleProjectDirectory}/jetty-ee9/${ee9.module}</ee9.module.path>
@@ -272,12 +272,12 @@
       </dependency>
       <dependency>
         <groupId>org.mortbay.jasper</groupId>
-        <artifactId>apache-el</artifactId>
+        <artifactId>mortbay-apache-el</artifactId>
         <version>${ee8.jsp.impl.version}</version>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jasper</groupId>
-        <artifactId>apache-jsp</artifactId>
+        <artifactId>mortbay-apache-jsp</artifactId>
         <version>${ee8.jsp.impl.version}</version>
       </dependency>
     </dependencies>
@@ -541,7 +541,7 @@
                              ee10 starts with version 10.0.x
                              ee11 TODO -->
                         <groupId>org.mortbay.jasper</groupId>
-                        <artifactId>apache-jsp</artifactId>
+                        <artifactId>mortbay-apache-jsp</artifactId>
                         <ignoreVersions>
                           <ignoreVersion>
                             <type>regex</type>
@@ -682,7 +682,7 @@
                              ee10 starts with version 10.0.x
                              ee11 TODO -->
                         <groupId>org.mortbay.jasper</groupId>
-                        <artifactId>apache-jsp</artifactId>
+                        <artifactId>mortbay-apache-jsp</artifactId>
                         <ignoreVersions>
                           <ignoreVersion>
                             <type>regex</type>
diff --git a/jetty-ee9/jetty-ee9-apache-jsp/pom.xml b/jetty-ee9/jetty-ee9-apache-jsp/pom.xml
@@ -26,7 +26,7 @@
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-jsp</artifactId>
+      <artifactId>mortbay-apache-jsp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod b/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod
@@ -12,6 +12,6 @@ ee9-annotations
 
 [lib]
 lib/ee9-apache-jsp/@org.eclipse.jdt:ecj@
-lib/ee9-apache-jsp/@org.mortbay.jasper:apache-el@
-lib/ee9-apache-jsp/@org.mortbay.jasper:apache-jsp@
+lib/ee9-apache-jsp/@org.mortbay.jasper:mortbay-apache-el@
+lib/ee9-apache-jsp/@org.mortbay.jasper:mortbay-apache-jsp@
 lib/jetty-ee9-apache-jsp-${jetty.version}.jar
diff --git a/jetty-ee9/jetty-ee9-home/pom.xml b/jetty-ee9/jetty-ee9-home/pom.xml
@@ -258,7 +258,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
-              <includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
+              <includeArtifactIds>mortbay-apache-jsp,mortbay-apache-el,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/ee9-apache-jsp</outputDirectory>
             </configuration>
@@ -271,7 +271,7 @@
             <phase>generate-resources</phase>
             <configuration>
               <includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
-              <includeArtifactIds>apache-jsp,apache-el,ecj</includeArtifactIds>
+              <includeArtifactIds>mortbay-apache-jsp,mortbay-apache-el,ecj</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <classifier>sources</classifier>
               <outputDirectory>${source-assembly-directory}/lib/ee9-apache-jsp</outputDirectory>
diff --git a/jetty-ee9/jetty-ee9-maven-plugin/pom.xml b/jetty-ee9/jetty-ee9-maven-plugin/pom.xml
@@ -14,7 +14,7 @@
     <bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
     <jetty.jvmArgs></jetty.jvmArgs>
     <jetty.stopKey>FREEBEER</jetty.stopKey>
-    <junit.jupiter.execution.parallel.enabled>false</junit.jupiter.execution.parallel.enabled>
+    <!--    <junit.jupiter.execution.parallel.enabled>false</junit.jupiter.execution.parallel.enabled>-->
   </properties>
   <dependencies>
     <dependency>
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/pom.xml
@@ -75,11 +75,11 @@
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-el</artifactId>
+      <artifactId>mortbay-apache-el</artifactId>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-jsp</artifactId>
+      <artifactId>mortbay-apache-jsp</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.tinybundles</groupId>
diff --git a/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java b/jetty-ee9/jetty-ee9-osgi/test-jetty-ee9-osgi/src/test/java/org/eclipse/jetty/ee9/osgi/test/TestOSGiUtil.java
@@ -285,8 +285,8 @@ public static void coreJspDependencies(List<Option> res)
             }
         }
 
-        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("apache-el").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("apache-jsp").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("mortbay-apache-el").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("mortbay-apache-jsp").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.ee9").artifactId("jetty-ee9-apache-jsp").versionAsInProject().start());
         String jstlGroupId = System.getProperty("jstl.groupId", "jakarta.servlet.jsp.jstl");
         String jstlArtifactId = System.getProperty("jstl.artifactId", "jakarta.servlet.jsp.jstl-api");
diff --git a/jetty-ee9/pom.xml b/jetty-ee9/pom.xml
diff --git a/pom.xml b/pom.xml
