Merge pull request #12675 from jetty/fix/12.0.x/ee8-exclude-xalan

Issue #12674 - Exclude Xalan from ee8 dependencies
jetty · Jan 7, 2025 · d477ef8 · d477ef8
2 parents 2d9dab6 + f847998
commit d477ef8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 44 deletions.
diff --git a/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml b/jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml
@@ -32,20 +32,6 @@
     <dependency>
       <groupId>org.glassfish.web</groupId>
       <artifactId>javax.servlet.jsp.jstl</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet.jsp</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet.jsp.jstl</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>

diff --git a/jetty-ee8/jetty-ee8-home/pom.xml b/jetty-ee8/jetty-ee8-home/pom.xml
@@ -17,11 +17,6 @@
   </properties>
 
   <dependencies>
-    <!--    <dependency>-->
-    <!--      <groupId>org.eclipse.jetty.ee8</groupId>-->
-    <!--      <artifactId>jetty-ee8-cdi</artifactId>-->
-    <!--      <optional>true</optional>-->
-    <!--    </dependency>-->
     <dependency>
       <groupId>org.eclipse.jetty.ee8</groupId>
       <artifactId>jetty-ee8-annotations</artifactId>
@@ -48,11 +43,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <!--    <dependency>-->
-    <!--      <groupId>org.eclipse.jetty.ee8</groupId>-->
-    <!--      <artifactId>jetty-ee8-jaspi</artifactId>-->
-    <!--      <optional>true</optional>-->
-    <!--    </dependency>-->
     <dependency>
       <groupId>org.eclipse.jetty.ee8</groupId>
       <artifactId>jetty-ee8-jndi</artifactId>
@@ -71,7 +61,6 @@
       <groupId>org.eclipse.jetty.ee8</groupId>
       <artifactId>jetty-ee8-proxy</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty.ee8</groupId>
       <artifactId>jetty-ee8-quickstart</artifactId>
@@ -199,10 +188,6 @@
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-tree</artifactId>
     </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

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
@@ -84,16 +84,6 @@
     <dependency>
       <groupId>org.glassfish.web</groupId>
       <artifactId>javax.servlet.jsp.jstl</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>javax.servlet.jsp</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jasper</groupId>

diff --git a/jetty-ee8/pom.xml b/jetty-ee8/pom.xml
@@ -244,6 +244,24 @@
         <groupId>org.glassfish.web</groupId>
         <artifactId>javax.servlet.jsp.jstl</artifactId>
         <version>${javax.servlet.jsp.jstl.impl.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.servlet.jsp.jstl</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xalan</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jasper</groupId>
@@ -255,11 +273,6 @@
         <artifactId>apache-jsp</artifactId>
         <version>${jsp.impl.version}</version>
       </dependency>
-      <dependency>
-        <groupId>xalan</groupId>
-        <artifactId>xalan</artifactId>
-        <version>2.7.3</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>