Skip to content

Permit running Payara on JDK 25 #9521

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

Open
mbien wants to merge 1 commit into
base: delivery
Choose a base branch
from
+32 −19
Open

Permit running Payara on JDK 25 #9521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion enterprise/payara.tooling/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
javac.source=1.8
javac.release=21
javac.compilerargs=-Xlint -Xlint:-serial
38 changes: 20 additions & 18 deletions .../payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/JavaSEPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ public enum JavaSEPlatform {
/** JavaSE 17. */
v17,
/** JavaSE 21. */
v21;
v21,
/** JavaSE 25. */
v25;

// Class attributes //
/** Payara JavaEE platform enumeration length. */
Expand Down Expand Up @@ -92,6 +94,9 @@ public enum JavaSEPlatform {
/** A <code>String</code> representation of v21 value. */
static final String V21_STR = "21";

/** A <code>String</code> representation of v25 value. */
static final String V25_STR = "25";

/**
* Stored <code>String</code> values for backward <code>String</code>
* conversion.
Expand Down Expand Up @@ -136,22 +141,19 @@ public static JavaSEPlatform toValue(final String platformName) {
*/
@Override
public String toString() {
switch (this) {
case v1_1: return V1_1_STR;
case v1_2: return V1_2_STR;
case v1_3: return V1_3_STR;
case v1_4: return V1_4_STR;
case v1_5: return V1_5_STR;
case v1_6: return V1_6_STR;
case v1_7: return V1_7_STR;
case v1_8: return V1_8_STR;
case v11: return V11_STR;
case v17: return V17_STR;
case v21: return V21_STR;
// This is unrecheable. Being here means this class does not handle
// all possible values correctly.
default: throw new ServerConfigException(
ServerConfigException.INVALID_SE_PLATFORM_VERSION);
}
return switch (this) {
case v1_1 -> V1_1_STR;
case v1_2 -> V1_2_STR;
case v1_3 -> V1_3_STR;
case v1_4 -> V1_4_STR;
case v1_5 -> V1_5_STR;
case v1_6 -> V1_6_STR;
case v1_7 -> V1_7_STR;
case v1_8 -> V1_8_STR;
case v11 -> V11_STR;
case v17 -> V17_STR;
case v21 -> V21_STR;
case v25 -> V25_STR;
};
}
}
4 changes: 4 additions & 0 deletions enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ under the License.
<platform version="19"/>
<platform version="20"/>
<platform version="21"/>
<platform version="25"/>
<!-- optimistic -->
<platform version="26"/>
<platform version="27"/>
</java>
<javaee version="10.0.0">
<profile version="9.0.0" type="web"/>
Expand Down
7 changes: 7 additions & 0 deletions enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV7.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ under the License.
</tools>
<java version="21">
<platform version="21"/>
<platform version="22"/>
<platform version="23"/>
<platform version="24"/>
<platform version="25"/>
<!-- optimistic -->
<platform version="26"/>
<platform version="27"/>
</java>
<javaee version="11.0.0">
<profile version="9.0.0" type="web"/>
Expand Down
Loading