diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c56bb3..fcdceb4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 }} diff --git a/src/main/java/io/openliberty/tools/ant/jsp/CompileJSPs.java b/src/main/java/io/openliberty/tools/ant/jsp/CompileJSPs.java index 205191a..3179c29 100644 --- a/src/main/java/io/openliberty/tools/ant/jsp/CompileJSPs.java +++ b/src/main/java/io/openliberty/tools/ant/jsp/CompileJSPs.java @@ -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. @@ -424,8 +424,10 @@ private void writeServerXML(File serverDir) throws FileNotFoundException { ps.print(feature); ps.println(""); } - ps.print("jsp-"); - ps.print(featureVersion); + // add support for Jakarta Server Pages + String feature = featureVersion.startsWith("2.") ? "jsp-"+featureVersion : "pages-"+featureVersion; + ps.print(""); + ps.print(feature); ps.println(""); ps.println(""); if (war != null) {