Add patches to web profile distribution

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
eclipse-ee4j · Jan 3, 2024 · de56d15 · de56d15
1 parent e10ab7a
commit de56d15
Show file tree

Hide file tree

Showing 22 changed files with 3,510 additions and 19 deletions.
diff --git a/appserver/distributions/web/pom.xml b/appserver/distributions/web/pom.xml
@@ -33,6 +33,7 @@
     <name>Glassfish Web Profile Distribution</name>
 
     <properties>
+        <patch.classes>${project.build.directory}/dependency</patch.classes>
         <glassfish.modules>${project.build.directory}/stage/glassfish7/glassfish/modules</glassfish.modules>
         <patches>${basedir}/src/main/patches</patches>
     </properties>
@@ -109,13 +110,99 @@
                                     </sequential>
                                 </macrodef>
 
+
+
+                                 <!-- To support Expression Language 6  -->
+                                <jarupdate
+                                    basedir="${patches}/jakarta.servlet.jsp.jstl-api" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jakarta.servlet.jsp.jstl-api.jar"
+                                />
+
+                                <!-- To support Expression Language 6 and Expressly 6-->
+                                <jarupdate
+                                    basedir="${patches}/hibernate-validator" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/hibernate-validator.jar"
+                                />
+
+                                <jarupdate
+                                    basedir="${patches}/jakarta.enterprise.cdi-el-api" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jakarta.enterprise.cdi-el-api.jar"
+                                />
+
+
+
+
+                                <!-- To support Pages 5 -->
+                                <jarupdate
+                                    basedir="${patches}/jersey-mvc-jsp" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-mvc-jsp.jar"
+                                />
+
+
+                                <!-- To support Jakarta Annotations 3 -->
+                                <jarupdate
+                                    basedir="${patches}/jersey-client" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-client.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/jersey-common" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-common.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/jersey-server" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-server.jar"
+                                />
                                 <jarupdate
                                     basedir="${patches}/jersey-hk2" includes="META-INF/MANIFEST.MF"
                                     destfile="${glassfish.modules}/jersey-hk2.jar"
                                 />
                                 <jarupdate
-                                    basedir="${patches}/jakarta.servlet.jsp.jstl-api" includes="META-INF/MANIFEST.MF"
-                                    destfile="${glassfish.modules}/jakarta.servlet.jsp.jstl-api.jar"
+                                    basedir="${patches}/jersey-media-json-jackson" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-media-json-jackson.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/jersey-entity-filtering" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-entity-filtering.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/jersey-media-sse" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-media-sse.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/jersey-media-json-processing" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-media-json-processing.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/parsson-media" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/parsson-media.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/jersey-cdi1x" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-cdi1x.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/jersey-cdi1x-transaction" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-cdi1x-transaction.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/jersey-mvc" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jersey-mvc.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patch.classes}" includes="org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider.class"
+                                    destfile="${glassfish.modules}/jersey-cdi1x.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patch.classes}" includes="org/glassfish/jersey/ext/cdi1x/internal/CdiComponentProvider$*"
+                                    destfile="${glassfish.modules}/jersey-cdi1x.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/hibernate-validator-cdi" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/hibernate-validator-cdi.jar"
+                                />
+                                <jarupdate
+                                    basedir="${patches}/jakarta.enterprise.concurrent" includes="META-INF/MANIFEST.MF"
+                                    destfile="${glassfish.modules}/jakarta.enterprise.concurrent.jar"
                                 />
                             </target>
                         </configuration>