-
Notifications
You must be signed in to change notification settings - Fork 374
Upgrade tomcat version to 9.0.115 #1327
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.
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
manodyaSenevirathne
wants to merge
4
commits into
wso2:master
Choose a base branch
from
manodyaSenevirathne:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
bed19ad
Add orbits for tomcat 9.0.115
manodyaSenevirathne 1b8d89c
Add jdk21 compatible orbits for tomcat 9.0.115
manodyaSenevirathne 9dfdab1
bump(orbit/jaeger-client-jdk21):widen zipkin reporter import
manodyaSenevirathne fd1dedd
bump(orbit/zipkin-sender-okhttp3): export/embed zipkin2.reporter
manodyaSenevirathne File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com). | ||
| ~ | ||
| ~ WSO2 LLC. licenses this file to you under the Apache License, | ||
| ~ Version 2.0 (the "License"); you may not use this file except | ||
| ~ in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, | ||
| ~ software distributed under the License is distributed on an | ||
| ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| ~ KIND, either express or implied. See the License for the | ||
| ~ specific language governing permissions and limitations | ||
| ~ under the License. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.wso2.orbit.org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-catalina-ha</artifactId> | ||
| <version>9.0.115.wso2v1</version> | ||
| <packaging>bundle</packaging> | ||
| <name>Tomcat high availability orbit bundle - 9.0.115.wso2v1</name> | ||
| <description>Apache Tomcat HA</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-catalina-ha</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <distributionManagement> | ||
| <repository> | ||
| <id>wso2.releases</id> | ||
| <name>WSO2 internal Repository</name> | ||
| <url>https://maven.wso2.org/nexus/content/repositories/releases/</url> | ||
| </repository> | ||
| </distributionManagement> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <version>2.3.6</version> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <instructions> | ||
| <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> | ||
| <Bundle-Name>${project.artifactId}</Bundle-Name> | ||
| <Export-Package> | ||
| org.apache.catalina.ha.*;version="${version.tomcat}", | ||
| org.apache.catalina.ha.session.*;version="${version.tomcat}" | ||
| </Export-Package> | ||
| <Import-Package> | ||
| *;resolution:=optional | ||
| </Import-Package> | ||
| <DynamicImport-Package>*</DynamicImport-Package> | ||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <properties> | ||
| <version.tomcat>9.0.115</version.tomcat> | ||
| </properties> | ||
| </project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com). | ||
| ~ | ||
| ~ WSO2 LLC. licenses this file to you under the Apache License, | ||
| ~ Version 2.0 (the "License"); you may not use this file except | ||
| ~ in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, | ||
| ~ software distributed under the License is distributed on an | ||
| ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| ~ KIND, either express or implied. See the License for the | ||
| ~ specific language governing permissions and limitations | ||
| ~ under the License. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.wso2.orbit.org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-el-api-jdk21</artifactId> | ||
| <version>9.0.115.wso2v1</version> | ||
| <packaging>bundle</packaging> | ||
| <name>tomcat el api orbit bundle for JDK 21+ - 9.0.115.wso2v1</name> | ||
| <description>Apache Tomcat EL API</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-el-api</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <distributionManagement> | ||
| <repository> | ||
| <id>wso2.releases</id> | ||
| <name>WSO2 internal Repository</name> | ||
| <url>https://maven.wso2.org/nexus/content/repositories/releases/</url> | ||
| </repository> | ||
| </distributionManagement> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <version>2.4.0</version> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <instructions> | ||
| <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> | ||
| <Bundle-Name>${project.artifactId}</Bundle-Name> | ||
| <Private-Package> | ||
| javax.el.*;version="3.0" | ||
| </Private-Package> | ||
| <Export-Package> | ||
| javax.el;version="3.0.0" | ||
| </Export-Package> | ||
| <Import-Package> | ||
| *;resolution:=optional | ||
| </Import-Package> | ||
| <DynamicImport-Package>*</DynamicImport-Package> | ||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <properties> | ||
| <version.tomcat>9.0.115</version.tomcat> | ||
| </properties> | ||
| </project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com). | ||
| ~ | ||
| ~ WSO2 LLC. licenses this file to you under the Apache License, | ||
| ~ Version 2.0 (the "License"); you may not use this file except | ||
| ~ in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, | ||
| ~ software distributed under the License is distributed on an | ||
| ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| ~ KIND, either express or implied. See the License for the | ||
| ~ specific language governing permissions and limitations | ||
| ~ under the License. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.wso2.orbit.org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-el-api</artifactId> | ||
| <version>9.0.115.wso2v1</version> | ||
| <packaging>bundle</packaging> | ||
| <name>tomcat el api orbit bundle - 9.0.115.wso2v1</name> | ||
| <description>Apache Tomcat EL API</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-el-api</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <distributionManagement> | ||
| <repository> | ||
| <id>wso2.releases</id> | ||
| <name>WSO2 internal Repository</name> | ||
| <url>https://maven.wso2.org/nexus/content/repositories/releases/</url> | ||
| </repository> | ||
| </distributionManagement> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <version>2.4.0</version> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <instructions> | ||
| <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> | ||
| <Bundle-Name>${project.artifactId}</Bundle-Name> | ||
| <Private-Package> | ||
| javax.el.*;version="3.0" | ||
| </Private-Package> | ||
| <Export-Package> | ||
| javax.el;version="3.0.0" | ||
| </Export-Package> | ||
| <Import-Package> | ||
| *;resolution:=optional | ||
| </Import-Package> | ||
| <DynamicImport-Package>*</DynamicImport-Package> | ||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <properties> | ||
| <version.tomcat>9.0.115</version.tomcat> | ||
| </properties> | ||
| </project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com). | ||
| ~ | ||
| ~ WSO2 LLC. licenses this file to you under the Apache License, | ||
| ~ Version 2.0 (the "License"); you may not use this file except | ||
| ~ in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, | ||
| ~ software distributed under the License is distributed on an | ||
| ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| ~ KIND, either express or implied. See the License for the | ||
| ~ specific language governing permissions and limitations | ||
| ~ under the License. | ||
| --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <groupId>org.wso2.orbit.org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-jdk21</artifactId> | ||
| <version>9.0.115.wso2v1</version> | ||
| <packaging>bundle</packaging> | ||
| <name>tomcat orbit bundle for JDK 21+ - 9.0.115.wso2v1</name> | ||
| <description>Apache Tomcat</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-dbcp</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat.embed</groupId> | ||
| <artifactId>tomcat-embed-core</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat.embed</groupId> | ||
| <artifactId>tomcat-embed-jasper</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-websocket-api</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat.embed</groupId> | ||
| <artifactId>tomcat-embed-websocket</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-jasper</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-jaspic-api</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.tomcat</groupId> | ||
| <artifactId>tomcat-jasper-el</artifactId> | ||
| <version>${version.tomcat}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.jdt.core.compiler</groupId> | ||
| <artifactId>ecj</artifactId> | ||
| <version>${version.ecj}</version> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <distributionManagement> | ||
| <repository> | ||
| <id>wso2.releases</id> | ||
| <name>WSO2 internal Repository</name> | ||
| <url>https://maven.wso2.org/nexus/content/repositories/releases/</url> | ||
| </repository> | ||
| </distributionManagement> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <extensions>true</extensions> | ||
| <version>2.4.0</version> | ||
| <configuration> | ||
| <instructions> | ||
| <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> | ||
| <Bundle-Name>${project.artifactId}</Bundle-Name> | ||
| <Export-Package> | ||
| !org.apache.tomcat.jdbc.pool.*, | ||
| !org.apache.juli.logging, | ||
| org.apache.jasper.*;version="${version.tomcat}";-split-package:=merge-first, | ||
| org.apache.naming.*;version="${version.tomcat}", | ||
| org.apache.tomcat.*;version="${version.tomcat}";-split-package:=merge-first, | ||
| org.apache.catalina.*;version="${version.tomcat}", | ||
| org.apache.coyote.*;version="${version.tomcat}", | ||
| org.apache.el.*;version="${version.tomcat}";-split-package:=merge-first, | ||
| javax.websocket.*;version="1.1.0";-split-package:=merge-first, | ||
| javax.security.auth.message.*;version="6.0.0";-split-package:=merge-first | ||
| </Export-Package> | ||
| <Private-Package> | ||
| org.apache.juli | ||
| </Private-Package> | ||
| <Import-Package> | ||
| javax.annotation;version="0.0.0", | ||
| *;resolution:=optional | ||
| </Import-Package> | ||
| <DynamicImport-Package>*</DynamicImport-Package> | ||
| <Include-Resource> | ||
| {maven-resources}, | ||
| @tomcat-embed-websocket-${version.tomcat}.jar!/META-INF/*, | ||
| src/main/resources | ||
| </Include-Resource> | ||
| <Bundle-Classpath>patch.jar,.</Bundle-Classpath> | ||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <properties> | ||
| <version.tomcat>9.0.115</version.tomcat> | ||
| <version.ecj>4.6.1</version.ecj> | ||
| </properties> | ||
| </project> | ||
1 change: 1 addition & 0 deletions
1
tomcat-jdk21/9.0.115.wso2v1/src/main/resources/META-INF/services/javax.el.ExpressionFactory
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| org.apache.el.ExpressionFactoryImpl |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🌐 Web query:
ECJ 4.6.1 Java version support compatibility JDK💡 Result:
ecj-4.6.1.jar(the standalone Eclipse Compiler for Java): the published Maven POM for ECJ 4.6.1 setsmaven.compiler.source/targetto 1.7, meaning the JAR is built for Java 7 bytecode → you need JRE/JDK 7+ to run it. [1]-source 1.6 -target 1.6, and that annotation processing support requires a 1.6 VM. [3]Sources:
[1] Sonatype/Maven Central page showing ECJ 4.6.1 POM snippet (
maven.compiler.source/target=1.7). (central.sonatype.com)[2] Stack Overflow: Eclipse Neon vs Java 9 support (points to needing later Eclipse versions for Java 9). (stackoverflow.com)
[3] Eclipse Help: “Using the batch compiler” (implicit
-source/-target 1.6, annotation processing needs 1.6 VM). (help.eclipse.org)Citations:
🌐 Web query:
Apache Tomcat 9.0.115 ECJ version dependency💡 Result:
For Apache Tomcat 9.0.115, the Jasper JSP compiler (tomcat-jasper) has a Maven dependency on:
org.eclipse.jdt:ecj3.26.0(compile dependency) [1]If you’re looking at the Tomcat binary distribution (the
lib/folder), Tomcat 9 commonly ships an ECJ JAR namedecj-4.20.jar(optional, used when you configure Jasper to use ECJ instead ofjavac) [2].Sources:
[1] https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-jasper/9.0.115/dependencies
[2] https://stackoverflow.com/questions/79415289/org-apache-jasper-jasperexception-unable-to-compile-class-for-jsp-facing-this
🏁 Script executed:
Repository: wso2/orbit
Length of output: 95
🏁 Script executed:
Repository: wso2/orbit
Length of output: 36
ECJ 4.6.1 cannot compile code for JDK 21.
Line 140 pins
ecjto4.6.1, which only supports Java 8 language features and lacks Java 9+ support. This will cause JSP compilation failures with JDK 21. Additionally, Tomcat 9.0.115 officially uses ECJ 3.26.0 (a much newer version), so this pinning moves backward from the baseline dependency.🤖 Prompt for AI Agents