Skip to content

Commit b8ec5dd

Browse files
hs536hs536
authored
Merge pull request #25627 from dmatej/java17min
Minimal JDK version updated from 11 to 17
2 parents b5cc593 + f5e802c commit b8ec5dd

File tree

48 files changed

+83
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+83
-157
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ sponsored by the Eclipse Foundation.
77

88
### Compatibility
99

10+
* Eclipse GlassFish 8.0.0 is Jakarta EE 11 compatible, requires Java 21, experimentally also higher versions.
11+
* Eclipse GlassFish 7.1.0 is Jakarta EE 10 compatible, requires Java 17 or 21, experimentally also higher versions.
1012
* Eclipse GlassFish 7.0.25 is Jakarta EE 10 compatible, requires Java 11, 17 or 21, experimentally also higher versions.
1113
* Eclipse GlassFish 6.2.5 is Jakarta EE 9.1 compatible, requires Java 11 or 17
1214
* Eclipse GlassFish 6.1.0 is Jakarta EE 9.1 compatible, requires Java 11

‎appserver/admin/template/src/main/resources/config/default-web.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@
286286
</init-param>
287287
<init-param>
288288
<param-name>compilerSourceVM</param-name>
289-
<param-value>11</param-value>
289+
<param-value>17</param-value>
290290
</init-param>
291291
<init-param>
292292
<param-name>compilerTargetVM</param-name>
293-
<param-value>11</param-value>
293+
<param-value>17</param-value>
294294
</init-param>
295295
<init-param>
296296
<param-name>system-jar-includes</param-name>

‎appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/AppClientContainerHolder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
2+
* Copyright (c) 2023, 2025 Contributors to the Eclipse Foundation
33
* Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
44
*
55
* This program and the accompanying materials are made available under the
@@ -124,9 +124,9 @@ public static synchronized AppClientContainerHolder getInstance() {
124124
*/
125125
public static synchronized void init(String agentArgsText, Instrumentation inst) throws UserError, Exception {
126126
int version = Runtime.version().feature();
127-
if (version < 11) {
128-
throw new UserError(MessageFormat.format("Current Java version {0} is too low; {1} or later required",
129-
System.getProperty("java.version"), "11"));
127+
if (version < 17) {
128+
throw new UserError(
129+
MessageFormat.format("Current Java version {0} is too low; {1} or later required", version, "17"));
130130
}
131131

132132
// Analyze the agent argument string.

‎appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation
2+
* Copyright (c) 2022, 2025 Contributors to the Eclipse Foundation
33
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
44
*
55
* This program and the accompanying materials are made available under the
@@ -22,7 +22,6 @@
2222
import com.sun.enterprise.deployment.EjbBundleDescriptor;
2323
import com.sun.enterprise.deployment.EjbDescriptor;
2424
import com.sun.enterprise.deployment.util.TypeUtil;
25-
import com.sun.enterprise.util.OS;
2625
import com.sun.enterprise.util.i18n.StringManager;
2726
import com.sun.logging.LogDomains;
2827

@@ -233,11 +232,6 @@ private void rmic(String classPath, Set<String> stubClasses, File destDir,
233232
return;
234233
}
235234

236-
if( toolsJarPath == null && !OS.isDarwin() && Runtime.version().feature() < 11) {
237-
_logger.log(Level.INFO, "[RMIC] tools.jar location was not found");
238-
return;
239-
}
240-
241235
progress(localStrings.getStringWithDefault(
242236
"generator.compiling_rmi_iiop",
243237
"Compiling RMI-IIOP code."));

‎appserver/microprofile/config/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@
6363

6464
<build>
6565
<plugins>
66-
<plugin>
67-
<artifactId>maven-compiler-plugin</artifactId>
68-
<configuration>
69-
<release>17</release>
70-
</configuration>
71-
</plugin>
7266
<plugin>
7367
<groupId>org.apache.felix</groupId>
7468
<artifactId>maven-bundle-plugin</artifactId>

‎appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-extension-alternative/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<!-- create WEB-INF/lib/bean-lib.jar -->
4747
<mkdir dir="${build.classes.dir}"/>
4848
<mkdir dir="${build.classes.dir}/META-INF"/>
49-
<javac srcdir="servlet" includes="TestBean.java" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11"/>
50-
<javac srcdir="util" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11"/>
49+
<javac srcdir="servlet" includes="TestBean.java" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17"/>
50+
<javac srcdir="util" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17"/>
5151
<copy file="descriptor/beans-alternative.xml" tofile="${build.classes.dir}/META-INF/beans.xml"/>
5252
<mkdir dir="${build.classes.dir}/META-INF/services"/>
5353
<copy file="services/jakarta.enterprise.inject.spi.Extension" tofile="${build.classes.dir}/META-INF/services/jakarta.enterprise.inject.spi.Extension"/>

‎appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-javaee-injection/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<!-- create WEB-INF/lib/bean-lib.jar -->
4747
<mkdir dir="${build.classes.dir}"/>
4848
<mkdir dir="${build.classes.dir}/META-INF"/>
49-
<javac srcdir="servlet" includes="TestBean.java" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11"/>
50-
<javac srcdir="util" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11"/>
49+
<javac srcdir="servlet" includes="TestBean.java" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17"/>
50+
<javac srcdir="util" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17"/>
5151
<copy file="descriptor/beans.xml" tofile="${build.classes.dir}/META-INF/beans.xml"/>
5252
<delete file="${build.classes.dir}/TestBean.class" /> <!-- This is included in the WAR below -->
5353

‎appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering-reversed/build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<!-- create WEB-INF/lib/bravo.jar -->
4848
<mkdir dir="${build.classes.dir}" />
4949
<mkdir dir="${build.classes.dir}/META-INF" />
50-
<javac srcdir="util1" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11" />
50+
<javac srcdir="util1" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17" />
5151
<copy file="descriptor/beans.xml" tofile="${build.classes.dir}/META-INF/beans.xml" />
5252
<jar destfile="lib/bravo.jar">
5353
<fileset dir="${build.classes.dir}" />
@@ -57,8 +57,8 @@
5757
<!-- create WEB-INF/lib/alpha.jar -->
5858
<mkdir dir="${build.classes.dir}" />
5959
<mkdir dir="${build.classes.dir}/META-INF" />
60-
<javac srcdir="util1" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11" />
61-
<javac srcdir="util2" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11" />
60+
<javac srcdir="util1" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17" />
61+
<javac srcdir="util2" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17" />
6262
<delete file="${build.classes.dir}/test1/Foo.class" />
6363
<copy file="descriptor/beans.xml" tofile="${build.classes.dir}/META-INF/beans.xml" />
6464
<jar destfile="lib/alpha.jar">

‎appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib-ordering/build.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<!-- create WEB-INF/lib/alpha.jar -->
4848
<mkdir dir="${build.classes.dir}" />
4949
<mkdir dir="${build.classes.dir}/META-INF" />
50-
<javac srcdir="util1" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11" />
50+
<javac srcdir="util1" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17" />
5151
<copy file="descriptor/beans.xml" tofile="${build.classes.dir}/META-INF/beans.xml" />
5252
<jar destfile="lib/alpha.jar">
5353
<fileset dir="${build.classes.dir}" />
@@ -57,8 +57,8 @@
5757
<!-- create WEB-INF/lib/bravo.jar -->
5858
<mkdir dir="${build.classes.dir}" />
5959
<mkdir dir="${build.classes.dir}/META-INF" />
60-
<javac srcdir="util1" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11" />
61-
<javac srcdir="util2" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11" />
60+
<javac srcdir="util1" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17" />
61+
<javac srcdir="util2" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17" />
6262
<delete file="${build.classes.dir}/test1/Foo.class" />
6363
<copy file="descriptor/beans.xml" tofile="${build.classes.dir}/META-INF/beans.xml" />
6464
<jar destfile="lib/bravo.jar">

‎appserver/tests/appserv-tests/devtests/cdi/javaee-integration/cdi-servlet-3.0-annotation-with-web-inf-lib/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<!-- create WEB-INF/lib/bean-lib.jar -->
4747
<mkdir dir="${build.classes.dir}"/>
4848
<mkdir dir="${build.classes.dir}/META-INF"/>
49-
<javac srcdir="servlet" includes="TestBean.java" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11"/>
50-
<javac srcdir="util" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="11"/>
49+
<javac srcdir="servlet" includes="TestBean.java" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17"/>
50+
<javac srcdir="util" destdir="${build.classes.dir}" classpath="${s1astest.classpath}" debug="on" source="17"/>
5151
<copy file="descriptor/beans.xml" tofile="${build.classes.dir}/META-INF/beans.xml"/>
5252
<delete file="${build.classes.dir}/TestBean.class" /> <!-- This is included in the WAR below -->
5353

0 commit comments

Comments
 (0)