Skip to content

[BACKLOG-40823] - Upgrade the Tomcat version from current to 10.x.x with Java 17 #123

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
merged 4 commits into from
Jul 30, 2025
Merged

[BACKLOG-40823] - Upgrade the Tomcat version from current to 10.x.x with Java 17 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08495e8
[BACKLOG-41601]-Upgrade sun jersey from 1.x to glassfish jersey 2.x
vamshirajidi Oct 3, 2024
2222dbf
[BACKLOG-42739]-Upgrading Pdi-platform-utils-plugin from Java Ee to J…
SahithiKommagani6 Nov 8, 2024
8764e5c
[BACKLOG-44915]-Resolving Review Comments for Pr's related to tomcat
SahithiKommagani6 Jul 18, 2025
7f265e3
Merge pull request #124 from SahithiKommagani6/Tomcat-10.X
vamshirajidi Jul 18, 2025
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
10 changes: 5 additions & 5 deletions core/src/main/java/org/pentaho/di/baserver/utils/web/HttpConnectionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.web.context.request.RequestContextListener;

import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequestEvent;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequestEvent;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
Expand Down
61 changes: 46 additions & 15 deletions core/src/main/java/org/pentaho/di/baserver/utils/web/InternalHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,21 @@

package org.pentaho.di.baserver.utils.web;

import javax.servlet.AsyncContext;
import javax.servlet.DispatcherType;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.Part;
import jakarta.servlet.ServletConnection;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.Part;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down Expand Up @@ -300,6 +302,11 @@ public void putHeader( String name, String value ) {
return null;
}

@Override
public String changeSessionId() {
return null;
}

@Override public boolean isRequestedSessionIdValid() {
return false;
}
Expand All @@ -312,7 +319,7 @@ public void putHeader( String name, String value ) {
return false;
}

@Override public boolean isRequestedSessionIdFromUrl() {
public boolean isRequestedSessionIdFromUrl() {
return false;
}

Expand Down Expand Up @@ -344,10 +351,30 @@ public void putHeader( String name, String value ) {
return null;
}

@Override
public String getRequestId() {
return null;
}

@Override
public String getProtocolRequestId() {
return null;
}

@Override
public ServletConnection getServletConnection() {
return null;
}

@Override public Part getPart( String name ) throws IOException, ServletException {
return null;
}

@Override
public <T extends HttpUpgradeHandler> T upgrade( Class<T> aClass ) throws IOException, ServletException {
return null;
}

@Override public Collection<Part> getParts() throws IOException, ServletException {
return null;
}
Expand Down Expand Up @@ -406,7 +433,6 @@ public void putHeader( String name, String value ) {
return null;
}

@Override
public String getRealPath( String path ) {
return null;
}
Expand Down Expand Up @@ -461,6 +487,11 @@ public int getContentLength() {
return ( this.content != null ? this.content.length : -1 );
}

@Override
public long getContentLengthLong() {
return 0;
}

@Override
public String getContentType() {
return this.contentType;
Expand Down
12 changes: 8 additions & 4 deletions core/src/main/java/org/pentaho/di/baserver/utils/web/InternalHttpServletResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

package org.pentaho.di.baserver.utils.web;

import javax.servlet.ServletOutputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
Expand Down Expand Up @@ -109,6 +109,11 @@ public void setContentLength( int contentLength ) {
this.contentLength = contentLength;
}

@Override
public void setContentLengthLong( long l ) {

}

@Override public String getCharacterEncoding() {
return null;
}
Expand Down Expand Up @@ -256,7 +261,6 @@ public void sendRedirect( String url ) throws IOException {

}

@Override
public void setStatus( int status, String errorMessage ) {
this.status = status;
this.errorMessage = errorMessage;
Expand Down
18 changes: 17 additions & 1 deletion core/src/main/java/org/pentaho/di/baserver/utils/web/ServletInputStreamWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

package org.pentaho.di.baserver.utils.web;

import javax.servlet.ServletInputStream;
import jakarta.servlet.ReadListener;
import jakarta.servlet.ServletInputStream;
import java.io.IOException;
import java.io.InputStream;

Expand All @@ -39,4 +40,19 @@ public void close() throws IOException {
super.close();
this.inputStream.close();
}

@Override
public boolean isFinished() {
return false;
}

@Override
public boolean isReady() {
return false;
}

@Override
public void setReadListener( ReadListener readListener ) {

}
}
13 changes: 12 additions & 1 deletion core/src/main/java/org/pentaho/di/baserver/utils/web/ServletOutputStreamWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

package org.pentaho.di.baserver.utils.web;

import javax.servlet.ServletOutputStream;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.WriteListener;
import java.io.IOException;
import java.io.OutputStream;

Expand Down Expand Up @@ -45,4 +46,14 @@ public void close() throws IOException {
super.close();
this.outputStream.close();
}

@Override
public boolean isReady() {
return false;
}

@Override
public void setWriteListener( WriteListener writeListener ) {

}
}
6 changes: 3 additions & 3 deletions core/src/test/java/org/pentaho/di/baserver/utils/web/HttpConnectionHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
import org.pentaho.platform.web.servlet.JAXRSPluginServlet;
import org.springframework.beans.factory.ListableBeanFactory;

import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.net.MalformedURLException;
Expand Down
6 changes: 3 additions & 3 deletions core/src/test/java/org/pentaho/di/baserver/utils/web/InternalHttpServletRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import org.junit.Before;
import org.junit.Test;

import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Enumeration;

import static junit.framework.Assert.*;
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/org/pentaho/di/baserver/utils/web/InternalHttpServletResponseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import org.junit.Before;
import org.junit.Test;

import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;

Expand Down
100 changes: 56 additions & 44 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,12 @@
<pdi.version>11.0.0.0-SNAPSHOT</pdi.version>
<metastore.version>11.0.0.0-SNAPSHOT</metastore.version>

<javax.servlet-api.version>3.0.1</javax.servlet-api.version>
<jersey-servlet.version>1.19.1</jersey-servlet.version>
<jersey-spring.version>1.19.1</jersey-spring.version>
<org.eclipse.swt.gtk.linux.x86_64.version>4.6</org.eclipse.swt.gtk.linux.x86_64.version>

<!-- 'TEST' SCOPED DEPS -->
<junit.version>4.13.2</junit.version>
<mockito-core.version>5.10.0</mockito-core.version>
<encoder.version>1.2</encoder.version>
<jsr311-api.version>1.1.1</jsr311-api.version>
<jersey-core.version>1.19.1</jersey-core.version>
<jersey-server.version>1.19.1</jersey-server.version>
<slf4j-api.version>1.7.7</slf4j-api.version>
<commons-lang.version>2.6</commons-lang.version>
<eclipse.jface.version>3.33.0</eclipse.jface.version>
Expand Down Expand Up @@ -154,9 +148,9 @@
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api.version}</version>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.servlet.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -179,9 +173,42 @@
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
<version>${jersey-servlet.version}</version>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -191,9 +218,20 @@
</dependency>

<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
<version>${jersey-spring.version}</version>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-spring6</artifactId>
<version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down Expand Up @@ -293,35 +331,9 @@
</dependency>

<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>${jsr311-api.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey-core.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey-core.version}</version>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta.ws.rs-api.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down