Skip to content

Support Jakata Pages in CompileJSPs #180

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

Merged
cherylking merged 1 commit into from
Aug 14, 2025
Merged

Support Jakata Pages in CompileJSPs #180

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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
os: [ubuntu-latest, windows-latest]
WLP_VERSION: [25.0.0_03]
WLP_VERSION: [25.0.0_06]
java: [21, 17, 11, 8]
include:
# match up licenses to WLP versions
# http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml
- WLP_VERSION: 25.0.0_03
WLP_LICENSE: L-LSHR-PGLCQA
- WLP_VERSION: 25.0.0_06
WLP_LICENSE: L-CSPS-5QXFQL

runs-on: ${{ matrix.os }}
name: WL ${{ matrix.WLP_VERSION }}, Java ${{ matrix.java }}, ${{ matrix.os }}
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/io/openliberty/tools/ant/jsp/CompileJSPs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* (C) Copyright IBM Corporation 2014, 2024.
* (C) Copyright IBM Corporation 2014, 2025.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -424,8 +424,10 @@ private void writeServerXML(File serverDir) throws FileNotFoundException {
ps.print(feature);
ps.println("</feature>");
}
ps.print("<feature>jsp-");
ps.print(featureVersion);
// add support for Jakarta Server Pages
String feature = featureVersion.startsWith("2.") ? "jsp-"+featureVersion : "pages-"+featureVersion;
ps.print("<feature>");
ps.print(feature);
ps.println("</feature>");
ps.println("</featureManager>");
if (war != null) {
Expand Down
Loading