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.

Sign up for GitHub

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

PAYARA-3577 Build Payara Server & Payara Micro using JDK8 and get them to pass the Test Suite #3905

Merged
merged 5 commits into from
Apr 23, 2019
Merged

PAYARA-3577 Build Payara Server & Payara Micro using JDK8 and get them to pass the Test Suite #3905

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47ea8c7
PAYARA-3577 Build Payara Server & Payara Micro using JDK8 and get the…
jGauravGupta Apr 17, 2019
942a7d5
PAYARA-3577 Update copyright
jGauravGupta Apr 17, 2019
7c965f7
PAYARA-3577 tools_jar profile added
jGauravGupta Apr 17, 2019
a20fd4a
PAYARA-3577 add grizzly-npn-api for JDK 11
jGauravGupta Apr 18, 2019
a1fd20b
PAYARA-3577 Hazelcast internal package access requirement to get the …
jGauravGupta Apr 18, 2019
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
22 changes: 8 additions & 14 deletions appserver/admin/gf_template/src/main/resources/config/domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,10 @@
</message-security-config>
<property value="SHA-256" name="default-digest-algorithm" />
</security-service>
<java-config classpath-suffix="" system-classpath="" debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:%%%JAVA_DEBUGGER_PORT%%%">
<java-config classpath-suffix="" system-classpath="" debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%%%JAVA_DEBUGGER_PORT%%%">
<jvm-options>-client</jvm-options>
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
<jvm-options>--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--illegal-access=permit</jvm-options>
<jvm-options>-XX:+IgnoreUnrecognizedVMOptions</jvm-options>
<jvm-options>-XX:+UnlockExperimentalVMOptions</jvm-options>
<jvm-options>[9|]--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>[9|]--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>-Djava.awt.headless=true</jvm-options>
<jvm-options>-Djdk.corba.allowOutputStreamSubclass=true</jvm-options>
<jvm-options>-Djavax.xml.accessExternalSchema=all</jvm-options>
Expand Down Expand Up @@ -261,6 +257,7 @@
<jvm-options>[1.8.0u121|1.8.0u160]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.7.jar</jvm-options>
<jvm-options>[1.8.0u161|1.8.0u190]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.jar</jvm-options>
<jvm-options>[1.8.0u191|1.8.0u500]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.1.jar</jvm-options>
<jvm-options>[9|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
jGauravGupta marked this conversation as resolved.
Show resolved Hide resolved
</java-config>
<availability-service>
<web-container-availability/>
Expand Down Expand Up @@ -409,14 +406,10 @@
<monitoring-service-configuration></monitoring-service-configuration>
<microprofile-metrics-configuration></microprofile-metrics-configuration>
<diagnostic-service />
<java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
<java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
<jvm-options>-server</jvm-options>
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
<jvm-options>--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>-add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--illegal-access=permit</jvm-options>
<jvm-options>-XX:+IgnoreUnrecognizedVMOptions</jvm-options>
<jvm-options>-XX:+UnlockExperimentalVMOptions</jvm-options>
<jvm-options>[9|]--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>[9|]--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>-Djava.awt.headless=true</jvm-options>
<jvm-options>-Djdk.corba.allowOutputStreamSubclass=true</jvm-options>
<jvm-options>-XX:+UnlockDiagnosticVMOptions</jvm-options>
Expand Down Expand Up @@ -470,6 +463,7 @@
<jvm-options>[1.8.0u121|1.8.0u160]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.7.jar</jvm-options>
<jvm-options>[1.8.0u161|1.8.0u190]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.jar</jvm-options>
<jvm-options>[1.8.0u191|1.8.0u500]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.1.jar</jvm-options>
<jvm-options>[9|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
</java-config>
<availability-service>
<web-container-availability/>
Expand Down
22 changes: 8 additions & 14 deletions appserver/admin/gf_template_web/src/main/resources/config/domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,10 @@
</message-security-config>
<property value="SHA-256" name="default-digest-algorithm" />
</security-service>
<java-config classpath-suffix="" system-classpath="" debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:%%%JAVA_DEBUGGER_PORT%%%">
<java-config classpath-suffix="" system-classpath="" debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%%%JAVA_DEBUGGER_PORT%%%">
<jvm-options>-client</jvm-options>
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
<jvm-options>--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--illegal-access=permit</jvm-options>
<jvm-options>-XX:+IgnoreUnrecognizedVMOptions</jvm-options>
<jvm-options>-XX:+UnlockExperimentalVMOptions</jvm-options>
<jvm-options>[9|]--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>[9|]--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>-Djava.awt.headless=true</jvm-options>
<jvm-options>-Djdk.corba.allowOutputStreamSubclass=true</jvm-options>
<jvm-options>-Djavax.xml.accessExternalSchema=all</jvm-options>
Expand Down Expand Up @@ -255,6 +251,7 @@
<jvm-options>[1.8.0u121|1.8.0u160]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.7.jar</jvm-options>
<jvm-options>[1.8.0u161|1.8.0u190]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.jar</jvm-options>
<jvm-options>[1.8.0u191|1.8.0u500]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.1.jar</jvm-options>
<jvm-options>[9|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
</java-config>
<availability-service>
<web-container-availability/>
Expand Down Expand Up @@ -399,14 +396,10 @@
<monitoring-service-configuration></monitoring-service-configuration>
<microprofile-metrics-configuration></microprofile-metrics-configuration>
<diagnostic-service />
<java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
<java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
<jvm-options>-server</jvm-options>
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
<jvm-options>--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>-add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--illegal-access=permit</jvm-options>
<jvm-options>-XX:+IgnoreUnrecognizedVMOptions</jvm-options>
<jvm-options>-XX:+UnlockExperimentalVMOptions</jvm-options>
<jvm-options>[9|]--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>[9|]--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>-Djava.awt.headless=true</jvm-options>
<jvm-options>-Djdk.corba.allowOutputStreamSubclass=true</jvm-options>
<jvm-options>-XX:+UnlockDiagnosticVMOptions</jvm-options>
Expand Down Expand Up @@ -460,6 +453,7 @@
<jvm-options>[1.8.0u121|1.8.0u160]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.7.jar</jvm-options>
<jvm-options>[1.8.0u161|1.8.0u190]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.jar</jvm-options>
<jvm-options>[1.8.0u191|1.8.0u500]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.1.jar</jvm-options>
<jvm-options>[9|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
</java-config>
<availability-service>
<web-container-availability/>
Expand Down
20 changes: 7 additions & 13 deletions appserver/admin/production_domain_template/src/main/resources/config/domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,9 @@
</message-security-config>
<property value="SHA-256" name="default-digest-algorithm" />
</security-service>
<java-config classpath-suffix="" system-classpath="" debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:%%%JAVA_DEBUGGER_PORT%%%">
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
<jvm-options>--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--illegal-access=permit</jvm-options>
<jvm-options>-XX:+IgnoreUnrecognizedVMOptions</jvm-options>
<jvm-options>-XX:+UnlockExperimentalVMOptions</jvm-options>
<java-config classpath-suffix="" system-classpath="" debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%%%JAVA_DEBUGGER_PORT%%%">
<jvm-options>[9|]--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>[9|]--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>-Xmx2g</jvm-options>
<jvm-options>-Xms2g</jvm-options>
<jvm-options>-XX:+UseG1GC</jvm-options>
Expand Down Expand Up @@ -209,6 +205,7 @@
<jvm-options>[1.8.0u121|1.8.0u160]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.7.jar</jvm-options>
<jvm-options>[1.8.0u161|1.8.0u190]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.jar</jvm-options>
<jvm-options>[1.8.0u191|1.8.0u500]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.1.jar</jvm-options>
<jvm-options>[9|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
</java-config>
<availability-service>
<web-container-availability/>
Expand Down Expand Up @@ -369,12 +366,8 @@
<microprofile-metrics-configuration></microprofile-metrics-configuration>
<diagnostic-service />
<java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
<jvm-options>--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>-add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--illegal-access=permit</jvm-options>
<jvm-options>-XX:+IgnoreUnrecognizedVMOptions</jvm-options>
<jvm-options>-XX:+UnlockExperimentalVMOptions</jvm-options>
<jvm-options>[9|]--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>[9|]--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>-Xmx2g</jvm-options>
<jvm-options>-Xms2g</jvm-options>
<jvm-options>-XX:+UseG1GC</jvm-options>
Expand All @@ -401,6 +394,7 @@
<jvm-options>[1.8.0u121|1.8.0u160]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.7.jar</jvm-options>
<jvm-options>[1.8.0u161|1.8.0u190]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.jar</jvm-options>
<jvm-options>[1.8.0u191|1.8.0u500]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.1.jar</jvm-options>
<jvm-options>[9|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
</java-config>
<availability-service>
<web-container-availability/>
Expand Down
22 changes: 8 additions & 14 deletions appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,13 +197,9 @@
</message-security-config>
<property value="SHA-256" name="default-digest-algorithm" />
</security-service>
<java-config classpath-suffix="" system-classpath="" debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:%%%JAVA_DEBUGGER_PORT%%%">
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
<jvm-options>--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--illegal-access=permit</jvm-options>
<jvm-options>-XX:+IgnoreUnrecognizedVMOptions</jvm-options>
<jvm-options>-XX:+UnlockExperimentalVMOptions</jvm-options>
<java-config classpath-suffix="" system-classpath="" debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=%%%JAVA_DEBUGGER_PORT%%%">
<jvm-options>[9|]--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>[9|]--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>-XX:+UseG1GC</jvm-options>
<jvm-options>-XX:+UseStringDeduplication</jvm-options>
<jvm-options>-XX:MetaspaceSize=256m</jvm-options>
Expand Down Expand Up @@ -231,6 +227,7 @@
<jvm-options>[1.8.0u121|1.8.0u160]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.7.jar</jvm-options>
<jvm-options>[1.8.0u161|1.8.0u190]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.jar</jvm-options>
<jvm-options>[1.8.0u191|1.8.0u500]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.1.jar</jvm-options>
<jvm-options>[9|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
</java-config>
<availability-service>
<web-container-availability/>
Expand Down Expand Up @@ -384,13 +381,9 @@
<monitoring-service-configuration></monitoring-service-configuration>
<microprofile-metrics-configuration></microprofile-metrics-configuration>
<diagnostic-service />
<java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
<jvm-options>--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--illegal-access=permit</jvm-options>
<jvm-options>-XX:+IgnoreUnrecognizedVMOptions</jvm-options>
<jvm-options>-XX:+UnlockExperimentalVMOptions</jvm-options>
<java-config debug-options="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUGGER_PORT}" system-classpath="" classpath-suffix="">
<jvm-options>[9|]--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED</jvm-options>
<jvm-options>[9|]--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>-XX:+UseG1GC</jvm-options>
<jvm-options>-XX:+UseStringDeduplication</jvm-options>
<jvm-options>-XX:MetaspaceSize=256m</jvm-options>
Expand All @@ -417,6 +410,7 @@
<jvm-options>[1.8.0u121|1.8.0u160]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.7.jar</jvm-options>
<jvm-options>[1.8.0u161|1.8.0u190]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.jar</jvm-options>
<jvm-options>[1.8.0u191|1.8.0u500]-Xbootclasspath/p:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap-1.8.1.jar</jvm-options>
<jvm-options>[9|]-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-bootstrap.jar</jvm-options>
</java-config>
<availability-service>
<web-container-availability/>
Expand Down
1 change: 0 additions & 1 deletion appserver/admingui/reference-manual/src/main/help/en/help/reference/list-jvm-options.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ <h2 id="_list_jvm_options">list-jvm-options</h2>
/lib/ext${path.separator}${com.sun.aas.derbyRoot}/lib
-Xmx512m
-XX:MaxPermSize=192m
-Djava.endorsed.dirs=${com.sun.aas.installRoot}/lib/endorsed
-XX:LogFile=${com.sun.aas.instanceRoot}/logs/jvm.log
Command list-jvm-options executed successfully.</code></pre>
</div>
Expand Down
15 changes: 6 additions & 9 deletions appserver/batch/glassfish-batch-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
holder.

-->
<!-- Portions Copyright [2016] [Payara Foundation and/or its affiliates.] -->
<!-- Portions Copyright [2016-2019] [Payara Foundation and/or its affiliates.] -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
Expand All @@ -60,29 +60,26 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.batch</groupId>
<artifactId>javax.batch-api</artifactId>
<version>${javax.batch-api.version}</version>
</dependency>
<groupId>javax.batch</groupId>
<artifactId>javax.batch-api</artifactId>
</dependency>
<dependency>
<groupId>com.ibm.jbatch</groupId>
<artifactId>com.ibm.jbatch.spi</artifactId>
<version>${com.ibm.jbatch.spi.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.persistence</groupId>
<artifactId>persistence-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<dependency>
<groupId>org.glassfish.main.concurrent</groupId>
<artifactId>concurrent-connector</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ibm.jbatch</groupId>
<artifactId>com.ibm.jbatch.container</artifactId>
<version>${com.ibm.jbatch.container.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.weld.se</groupId>
Expand All @@ -94,6 +91,6 @@
<groupId>fish.payara.payara-modules</groupId>
<artifactId>requesttracing-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependency>
</dependencies>
</project>
7 changes: 4 additions & 3 deletions appserver/common/glassfish-ee-api/src/main/java/com/sun/appserv/ClassLoaderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
// Portions Copyright [2017-2019] Payara Foundation and/or affiliates.
package com.sun.appserv;

import com.sun.enterprise.util.JDK;
import static java.util.logging.Level.WARNING;

import java.io.IOException;
Expand All @@ -54,7 +55,7 @@
import java.util.logging.Logger;

import com.sun.logging.LogDomains;
import java.util.ArrayDeque;
import java.util.Collection;


/**
Expand All @@ -77,7 +78,7 @@ public class ClassLoaderUtil {
private static final String URLCLASSPATH_JDK9_CLASS_NAME = "jdk.internal.loader.URLClassPath";

private static final String URLCLASSPATH_LOADERS_FIELD_NAME = "loaders"; // ArrayList of URLClassPath.Loader
private static final String URLCLASSPATH_URLS_FIELD_NAME = "unopenedUrls"; // The deque of unopened URLs
private static final String URLCLASSPATH_URLS_FIELD_NAME = JDK.getMajor() < 11 ? "urls" : "unopenedUrls";
private static final String URLCLASSPATH_LMAP_FIELD_NAME = "lmap"; // HashMap of String -> URLClassPath.Loader

private static final String URLCLASSPATH_JARLOADER_INNER_CLASS_NAME = "$JarLoader";
Expand Down Expand Up @@ -146,7 +147,7 @@ public static void releaseLoader(URLClassLoader classLoader) {

Object ucp = ucpField.get(classLoader);
List<?> loaders = (List<?>) loadersField.get(ucp);
ArrayDeque<?> unopenedUrls = (ArrayDeque<?>) unopenedUrlsField.get(ucp);
Collection<?> unopenedUrls = (Collection<?>) unopenedUrlsField.get(ucp);
Map<String, Object> lmap = (Map<String, Object>) lmapField.get(ucp);

/*
Expand Down
Loading