Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 jakarta-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<!-- Last Java 17-compatible line; 13+ requires Java 21. -->
<version>12.3.1</version>
<version>14.1.0</version>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same issue as in the root pom.xml: the existing comment <!-- Last Java 17-compatible line; 13+ requires Java 21. --> explicitly signals that this version must not advance past 12.x without a Java 21 toolchain. Bumping to 14.1.0 here will fail for the same reason.

</dependency>
</dependencies>
<configuration>
Expand Down
10 changes: 5 additions & 5 deletions jakarta/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,19 @@
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<version>3.0.0</version>
<version>4.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<version>4.0.0</version>
<version>6.0.1</version>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jakarta.el-api jumps from 4.0.0 (Jakarta EE 9 / EL 4) directly to 6.0.1 (Jakarta EE 11 / EL 6), skipping 5.0 (Jakarta EE 10). This aligns with the Tomcat 10.1 → 11.0 upgrade in this same module, so the versions are internally consistent. Just worth confirming that the test suite does not need to demonstrate EL 5.0 compatibility, since that generation was never exercised here.

<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<version>6.1.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -107,12 +107,12 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>10.1.60</version>
<version>11.0.26</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
<version>10.1.60</version>
<version>11.0.26</version>
</dependency>
</dependencies>
</plugin>
Expand Down
10 changes: 5 additions & 5 deletions jsp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,19 @@
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<version>2.2.1</version>
<version>2.3.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>2.2.5</version>
<version>3.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>4.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -107,12 +107,12 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId>
<version>9.0.122</version>
<version>11.0.26</version>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a breaking change. The jsp module compiles and tests against javax.* namespace APIs (javax.servlet.jsp-api, javax.el-api, javax.servlet-api). Tomcat 9 was the last major line to serve the javax.* namespace; Tomcat 10 migrated to jakarta.*, and Tomcat 11 is jakarta.*-only with no javax.* support at all. Running the embedded Tomcat 11 jasper engine against javax-namespace JSPs will fail at test time with ClassNotFoundException or NoClassDefFoundError. The correct fix is to keep the jsp module's Tomcat at 9.x (e.g., latest 9.0.x) while the jakarta module correctly advances to 11.x.

</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-annotations-api</artifactId>
<version>9.0.122</version>
<version>11.0.26</version>
</dependency>
</dependencies>
</plugin>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,13 @@
<dependency><groupId>org.bouncycastle</groupId><artifactId>bcpg-jdk18on</artifactId><version>1.86</version></dependency>
<dependency><groupId>org.bouncycastle</groupId><artifactId>bcprov-jdk18on</artifactId><version>1.86</version></dependency>
<dependency><groupId>org.bouncycastle</groupId><artifactId>bcutil-jdk18on</artifactId><version>1.86</version></dependency>
<dependency><groupId>org.codehaus.plexus</groupId><artifactId>plexus-utils</artifactId><version>3.6.2</version></dependency>
<dependency><groupId>org.codehaus.plexus</groupId><artifactId>plexus-utils</artifactId><version>4.1.0</version></dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>6.1.2</version>
<version>6.2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -330,7 +330,7 @@
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<!-- Last Java 17-compatible line; 13+ requires Java 21. -->
<version>12.3.1</version>
<version>14.1.0</version>

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment on the line immediately above this one says <!-- Last Java 17-compatible line; 13+ requires Java 21. -->. This was placed deliberately to pin checkstyle at 12.x because the project's build enforcer only requires Java [17,). Bumping to 14.1.0 will break any CI build running on Java 17, since checkstyle 13+ requires Java 21. Either update the Java requirement to 21 first and update the comment, or pin checkstyle to the latest 12.x release.

</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -602,7 +602,7 @@
<extensions>true</extensions>
<!-- Mitigate reviewed upstream publisher dependencies; isolated plugin realm only. -->
<dependencies>
<dependency><groupId>org.codehaus.plexus</groupId><artifactId>plexus-utils</artifactId><version>3.6.2</version></dependency>
<dependency><groupId>org.codehaus.plexus</groupId><artifactId>plexus-utils</artifactId><version>4.1.0</version></dependency>
<dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-databind</artifactId><version>2.22.3</version></dependency>
<dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-core</artifactId><version>2.22.3</version></dependency>
<dependency><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-annotations</artifactId><version>2.22</version></dependency>
Expand Down
Loading