Revert "Add patch for jaxb-osgi.jar that fixes imports"

This reverts commit 254e408. # Conflicts: # appserver/distributions/glassfish/pom.xml
eclipse-ee4j · Jun 22, 2023 · 0540471 · 0540471
1 parent 805c934
commit 0540471
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 886 deletions.
diff --git a/appserver/distributions/glassfish/pom.xml b/appserver/distributions/glassfish/pom.xml
@@ -82,7 +82,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
@@ -95,7 +95,7 @@
                         <configuration>
                             <target>
                                 <macrodef name="jarupdate">
-                                    <attribute name="basedir"/> 
+                                    <attribute name="basedir"/>
                                     <attribute name="includes"/>
                                     <attribute name="destfile"/>
                                     <sequential>
@@ -106,23 +106,19 @@
                                         <zip update="true" basedir="@{basedir}" includes="@{includes}" destfile="@{destfile}" />
                                     </sequential>
                                 </macrodef>
-                                
-                                <jarupdate 
+
+                                <jarupdate
                                     basedir="${patches}/xmlsec" includes="META-INF/MANIFEST.MF"
                                     destfile="${glassfish.modules}/xmlsec.jar"
                                 />
-                                <jarupdate 
+                                <jarupdate
                                     basedir="${patches}/microprofile-jwt-auth-api" includes="META-INF/MANIFEST.MF"
                                     destfile="${glassfish.modules}/microprofile-jwt-auth-api.jar"
                                 />
                                 <jarupdate
                                     basedir="${patches}/microprofile-rest-client-api" includes="META-INF/MANIFEST.MF"
                                     destfile="${glassfish.modules}/microprofile-rest-client-api.jar"
                                 />
-                                <jarupdate 
-                                    basedir="${patches}/jaxb-osgi" includes="META-INF/MANIFEST.MF"
-                                    destfile="${glassfish.modules}/jaxb-osgi.jar"
-                                />
                             </target>
                         </configuration>
                     </execution>