Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrading base of ORB libs to support JDK from 11 to 23 and beyond #25110

Draft
wants to merge 3 commits into
base: 8.0
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 8 additions & 28 deletions appserver/distributions/glassfish/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<configuration>
<target xmlns:if="ant:if" xmlns:unless="ant:unless">
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />

<if>
<bool>
<isgreaterthan arg1="${ant.java.version}" arg2="16"/>
Expand All @@ -119,7 +119,7 @@
<property name="java17orGreater" value="true"/>
</then>
</if>

<macrodef name="jarupdate">
<attribute name="basedir"/>
<attribute name="includes"/>
Expand All @@ -130,15 +130,15 @@
<zipfileset src="@{destfile}" excludes="@{includes}"/>
</zip>
<move file="@{destfile}.tmp" tofile="@{destfile}" />

<loadfile property="message" srcFile="@{basedir}/@{includes}"/>

<echo>${message}</echo>

<zip update="true" basedir="@{basedir}" includes="@{includes}" destfile="@{destfile}" />
</sequential>
</macrodef>

<jarupdate if:set="java17orGreater"
basedir="${patches}/microprofile-jwt-auth-api" includes="META-INF/MANIFEST.MF"
destfile="${glassfish.modules}/microprofile-jwt-auth-api.jar"
Expand All @@ -147,14 +147,13 @@
basedir="${patches}/microprofile-rest-client-api" includes="META-INF/MANIFEST.MF"
destfile="${glassfish.modules}/microprofile-rest-client-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}/hibernate-validator-cdi" includes="META-INF/MANIFEST.MF"
destfile="${glassfish.modules}/hibernate-validator-cdi.jar"
Expand All @@ -163,25 +162,6 @@
basedir="${patches}/weld-osgi-bundle" includes="META-INF/MANIFEST.MF"
destfile="${glassfish.modules}/weld-osgi-bundle.jar"
/>

<!-- To support glassfish.pfl 5.0.0 -->

<!-- Patch for gmbal 4.0.3 -->

<jarupdate
basedir="${patches}/gmbal" includes="META-INF/MANIFEST.MF"
destfile="${glassfish.modules}/gmbal.jar"
/>

<!-- Patch for glassfish-corba 4.2.5 -->
<jarupdate
basedir="${patches}/glassfish-corba-internal-api" includes="META-INF/MANIFEST.MF"
destfile="${glassfish.modules}/glassfish-corba-internal-api.jar"
/>
<jarupdate
basedir="${patches}/glassfish-corba-orb" includes="META-INF/MANIFEST.MF"
destfile="${glassfish.modules}/glassfish-corba-orb.jar"
/>
</target>
</configuration>
</execution>
Expand Down

This file was deleted.

This file was deleted.

Loading