Fixes piranhacloud#4536 - Remove Glassfish 7.x compatibility extension (

piranhacloud#4537)
mnriem · Jan 17, 2025 · fedb1cf · fedb1cf
1 parent b4ad95d
commit fedb1cf
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 253 deletions.
diff --git a/debug/pom.xml b/debug/pom.xml
@@ -88,12 +88,6 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-compat-glassfish7x</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-compat-tomcat10x</artifactId>

diff --git a/extension/compat-glassfish7x/pom.xml b/extension/compat-glassfish7x/pom.xml
diff --git a/...t-glassfish7x/src/main/java/cloud/piranha/extension/glassfish7x/Glassfish7xExtension.java b/...t-glassfish7x/src/main/java/cloud/piranha/extension/glassfish7x/Glassfish7xExtension.java
diff --git a/extension/compat-glassfish7x/src/main/java/module-info.java b/extension/compat-glassfish7x/src/main/java/module-info.java
diff --git a/extension/compat-glassfish7x/src/test/glassfish/contextpath/WEB-INF/glassfish-web.xml b/extension/compat-glassfish7x/src/test/glassfish/contextpath/WEB-INF/glassfish-web.xml
diff --git a/...h7x/src/test/java/cloud/piranha/extension/glassfish7x/tests/Glassfish7xExtensionTest.java b/...h7x/src/test/java/cloud/piranha/extension/glassfish7x/tests/Glassfish7xExtensionTest.java
diff --git a/extension/pom.xml b/extension/pom.xml
@@ -20,7 +20,6 @@
         <module>annotationscan-classfile</module>
         <module>angus</module>
         <module>bytesstreamhandler</module>
-        <module>compat-glassfish7x</module>
         <module>compat-tomcat10x</module>
         <module>concurro</module>
         <module>coreprofile</module>

diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml
@@ -50,12 +50,6 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-compat-glassfish7x</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-default-datasource</artifactId>

diff --git a/...sion/webprofile/src/main/java/cloud/piranha/extension/webprofile/WebProfileExtension.java b/...sion/webprofile/src/main/java/cloud/piranha/extension/webprofile/WebProfileExtension.java
@@ -35,7 +35,6 @@
 import cloud.piranha.extension.declared.DeclaredExtension;
 import cloud.piranha.extension.eclipselink.EclipseLinkExtension;
 import cloud.piranha.extension.fileupload.FileUploadExtension;
-import cloud.piranha.extension.glassfish7x.Glassfish7xExtension;
 import cloud.piranha.extension.herring.HerringExtension;
 import cloud.piranha.extension.policy.PolicyExtension;
 import cloud.piranha.extension.scinitializer.ServletContainerInitializerExtension;
@@ -77,7 +76,6 @@ public void extend(WebApplicationExtensionContext context) {
         context.add(WaspExtension.class);                           // WaSP
         context.add(EclipseLinkExtension.class);                    // Jakarta Persistence
         context.add(ServletContainerInitializerExtension.class);    // ServletContainerInitializer
-        context.add(Glassfish7xExtension.class);                    // Glassfish 7.x compatbility
     }
 
     private static Class<? extends WebApplicationExtension> getAnnotationScanExtensionClass() {

diff --git a/extension/webprofile/src/main/java/module-info.java b/extension/webprofile/src/main/java/module-info.java
@@ -63,7 +63,6 @@
     requires cloud.piranha.extension.expressly;
     requires cloud.piranha.extension.datasource;
     requires cloud.piranha.extension.eclipselink;
-    requires cloud.piranha.extension.glassfish7x;
     requires cloud.piranha.extension.herring;
     requires cloud.piranha.extension.jersey;
     requires cloud.piranha.extension.policy;