Skip to content

Commit

Permalink
Jetty 12.1.x ee11 change to glassfish wasp (#12676)
Browse files Browse the repository at this point in the history 
* Update to Eclipse Wasp for latest JSTL

* Update to wasp 4.0.0 which supports ee11

* Do not explicitly name all servlets to be found, as this will differ
between ee10,11 etc
  • Loading branch information
@janbartel
janbartel authored Jan 15, 2025
1 parent 4b3dd73 commit fa83880
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 27 deletions.
5 changes: 1 addition & 4 deletions ...o-spec/jetty-servlet5-demo-spec-webapp/src/main/java/org/example/test/AnnotationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
classNames.add(c.getName());
out.print(c.getName() + " ");
}

if (classNames.size() != __HandlesTypes.size())
out.println("<br/><span class=\"fail\">FAIL</span>");
else if (!classNames.containsAll(__HandlesTypes))
if (!classNames.containsAll(__HandlesTypes))
out.println("<br/><span class=\"fail\">FAIL</span>");
else
out.println("<br/><span class=\"pass\">PASS</span>");
Expand Down
4 changes: 2 additions & 2 deletions jetty-ee11/jetty-ee11-glassfish-jstl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</dependency>

<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<groupId>org.glassfish.wasp</groupId>
<artifactId>wasp</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jetty-ee11/jetty-ee11-glassfish-jstl/src/main/config/modules/ee11-glassfish-jstl.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ ee11.jakarta.servlet.jsp.jstl.impl.version?=@jakarta.servlet.jsp.jstl.impl.versi

[lib]
lib/ee11-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee11.jakarta.servlet.jsp.jstl.api.version}.jar
lib/ee11-glassfish-jstl/org.glassfish.web.jakarta.servlet.jsp.jstl-${ee11.jakarta.servlet.jsp.jstl.impl.version}.jar
lib/ee11-glassfish-jstl/org.glassfish.wasp.wasp-${ee11.jakarta.servlet.jsp.jstl.impl.version}.jar
2 changes: 1 addition & 1 deletion ...y-ee11/jetty-ee11-glassfish-jstl/src/test/java/org/eclipse/jetty/ee11/jstl/JspConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public static void init(WebAppContext context, URI baseUri, File scratchDir)
{
context.setAttribute(ServletContext.TEMPDIR, scratchDir);
context.setAttribute("org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern",
".*/jetty-jakarta-servlet-api-[^/]*\\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard.*\\.jar");
".*/jetty-jakarta-servlet-api-[^/]*\\.jar$|.*/wasp-[^/]*\\.jar|.*jakarta.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard.*\\.jar");
context.setWar(baseUri.toASCIIString());
context.setBaseResourceAsPath(Path.of(baseUri));
}
Expand Down
8 changes: 4 additions & 4 deletions jetty-ee11/jetty-ee11-home/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@
<phase>generate-resources</phase>
<configuration>
<prependGroupId>true</prependGroupId>
<includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>
<includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
<includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.wasp</includeGroupIds>
<includeArtifactIds>jakarta.servlet.jsp.jstl-api,wasp</includeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib/ee11-glassfish-jstl</outputDirectory>
</configuration>
Expand All @@ -299,8 +299,8 @@
<phase>generate-resources</phase>
<configuration>
<prependGroupId>true</prependGroupId>
<includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>
<includeArtifactIds>jakarta.servlet.jsp.jstl-api,jakarta.servlet.jsp.jstl</includeArtifactIds>
<includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.wasp</includeGroupIds>
<includeArtifactIds>jakarta.servlet.jsp.jstl-api,wasp</includeArtifactIds>
<includeTypes>jar</includeTypes>
<classifier>sources</classifier>
<outputDirectory>${source-assembly-directory}/lib/ee11-glassfish-jstl</outputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion ...11-maven-plugin/src/main/java/org/eclipse/jetty/ee11/maven/plugin/MavenWebAppContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class MavenWebAppContext extends WebAppContext
{
private static final Logger LOG = LoggerFactory.getLogger(MavenWebAppContext.class);

private static final String DEFAULT_CONTAINER_INCLUDE_JAR_PATTERN = ".*/jakarta.servlet-[^/]*\\.jar$|.*/jetty-jakarta-servlet-api-[^/]*\\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-[^/]*\\.jar$";
private static final String DEFAULT_CONTAINER_INCLUDE_JAR_PATTERN = ".*/jakarta.servlet-[^/]*\\.jar$|.*wasp-.*\\.jar$|.*/jetty-jakarta-servlet-api-[^/]*\\.jar$|.*jakarta.servlet.jsp.jstl-[^/]*\\.jar|.*taglibs-standard-[^/]*\\.jar$";

private static final String WEB_INF_CLASSES_PREFIX = "/WEB-INF/classes";

Expand Down
4 changes: 2 additions & 2 deletions jetty-ee11/jetty-ee11-osgi/test-jetty-ee11-osgi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<artifactId>jetty-http2-server</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<groupId>org.glassfish.wasp</groupId>
<artifactId>wasp</artifactId>
</dependency>
<dependency>
<groupId>org.mortbay.jasper</groupId>
Expand Down
1 change: 0 additions & 1 deletion ...ty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestJettyOSGiBootWithJsp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public static Option[] configure()
}

@Test
@Disabled("TODO servlet6.1 jstl not ported to servlet 6 jars yet")
public void testJspDump() throws Exception
{
if (Boolean.getBoolean(TestOSGiUtil.BUNDLE_DEBUG))
Expand Down
2 changes: 1 addition & 1 deletion ...sgi/test-jetty-ee11-osgi/src/test/java/org/eclipse/jetty/ee11/osgi/test/TestOSGiUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public static void coreJspDependencies(List<Option> res)
res.add(mavenBundle().groupId("org.mortbay.jasper").artifactId("apache-jsp").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-apache-jsp").versionAsInProject().start());
res.add(mavenBundle().groupId("jakarta.servlet.jsp.jstl").artifactId("jakarta.servlet.jsp.jstl-api").versionAsInProject());
res.add(mavenBundle().groupId("org.glassfish.web").artifactId("jakarta.servlet.jsp.jstl").versionAsInProject().start());
res.add(mavenBundle().groupId("org.glassfish.wasp").artifactId("wasp").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jdt").artifactId("ecj").versionAsInProject().start());
res.add(mavenBundle().groupId("org.eclipse.jetty.ee11.osgi").artifactId("jetty-ee11-osgi-boot-jsp").versionAsInProject().noStart());
}
Expand Down
2 changes: 1 addition & 1 deletion jetty-ee11/jetty-ee11-webapp/src/main/config/etc/jetty-ee11-deploy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<Get name="properties">
<Put name="jetty.deploy.containerScanJarPattern">
<Property name="jetty.deploy.containerScanJarPattern">
<Default>.*/jakarta.servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$</Default>
<Default>.*/jakarta.servlet-api-[^/]*\.jar$|.*wasp-.*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$</Default>
</Property>
</Put>
<Put name="jetty.deploy.webInfScanJarPattern">
Expand Down
2 changes: 1 addition & 1 deletion jetty-ee11/jetty-ee11-webapp/src/main/config/modules/ee11-deploy.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ etc/jetty-ee11-deploy.xml
# jetty.deploy.configurationClasses=

## Pattern to select jars from the container classloader to be scanned (or null to scan no jars)
# jetty.deploy.containerScanJarPattern=.*/jakarta.servlet-api-[^/]*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$
# jetty.deploy.containerScanJarPattern=.*/jakarta.servlet-api-[^/]*\.jar$|.*wasp-.*\.jar$|.*jakarta.servlet.jsp.jstl-.*\.jar$

## Pattern to select jars from the container classloader to be scanned (or null to scan all jars).
# jetty.deploy.webInfScanJarPattern=
Expand Down
12 changes: 6 additions & 6 deletions jetty-ee11/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,8 @@
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<groupId>org.glassfish.wasp</groupId>
<artifactId>wasp</artifactId>
<version>${jakarta.servlet.jsp.jstl.impl.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -672,13 +672,13 @@
</ignoreVersions>
</rule>
<rule>
<!-- for ee11, we need to stay on 3.0.x of jsp-jstl impl -->
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<!-- for ee11, we need to be on 4.0.x of jsp-jstl impl -->
<groupId>org.glassfish.wasp</groupId>
<artifactId>wasp</artifactId>
<ignoreVersions>
<ignoreVersion>
<type>regex</type>
<version>^(?!3.0.).+</version>
<version>^(?!4.0.).+</version>
</ignoreVersion>
</ignoreVersions>
</rule>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@
<ee11.jakarta.mail.api.version>2.1.3</ee11.jakarta.mail.api.version>
<ee11.jakarta.servlet.api.version>6.1.0</ee11.jakarta.servlet.api.version>
<ee11.jakarta.servlet.jsp.api.version>4.0.0</ee11.jakarta.servlet.jsp.api.version>
<ee11.jakarta.servlet.jsp.jstl.api.version>3.0.0</ee11.jakarta.servlet.jsp.jstl.api.version>
<ee11.jakarta.servlet.jsp.jstl.impl.version>3.0.1</ee11.jakarta.servlet.jsp.jstl.impl.version>
<ee11.jakarta.servlet.jsp.jstl.api.version>3.0.2</ee11.jakarta.servlet.jsp.jstl.api.version>
<ee11.jakarta.servlet.jsp.jstl.impl.version>4.0.0</ee11.jakarta.servlet.jsp.jstl.impl.version>
<ee11.jakarta.transaction-api.version>2.0.1</ee11.jakarta.transaction-api.version>
<ee11.jakarta.websocket.api.version>2.2.0-M1</ee11.jakarta.websocket.api.version>
<ee11.jakarta.ws.rs.api.version>4.0.0</ee11.jakarta.ws.rs.api.version>
Expand Down

0 comments on commit fa83880

Please sign in to comment.