Skip to content

Commit 6df2164

Browse files
vamshirajidivamshirajidi
authored
Merge pull request #1207 from webdetails/Tomcat-10.X
[BACKLOG-40823] - Upgrade the Tomcat version from current to 10.x.x with Java 17
2 parents 842c136 + ec30884 commit 6df2164

File tree

24 files changed

+142
-143
lines changed

24 files changed

+142
-143
lines changed

‎core/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@
4040
<dependency>
4141
<groupId>org.hibernate</groupId>
4242
<artifactId>hibernate-core</artifactId>
43-
<version>${hibernate.version}</version>
43+
<version>${hibernate-core.version}</version>
4444
</dependency>
4545
<dependency>
46-
<groupId>javax.persistence</groupId>
47-
<artifactId>javax.persistence-api</artifactId>
48-
<version>${javax.persistence-api.version}</version>
46+
<groupId>jakarta.persistence</groupId>
47+
<artifactId>jakarta.persistence-api</artifactId>
48+
<version>${jakarta.persistence-api.version}</version>
4949
<scope>provided</scope>
5050
</dependency>
5151
<dependency>
52-
<groupId>javax.servlet</groupId>
53-
<artifactId>servlet-api</artifactId>
52+
<groupId>jakarta.servlet</groupId>
53+
<artifactId>jakarta.servlet-api</artifactId>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.owasp.encoder</groupId>

‎core/src/main/java/org/pentaho/cdf/comments/CommentsEngine.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.apache.commons.lang.StringUtils;
2020
import org.apache.commons.logging.Log;
2121
import org.apache.commons.logging.LogFactory;
22-
import org.hibernate.Query;
22+
import org.hibernate.query.Query;
2323
import org.hibernate.Session;
2424
import org.json.JSONArray;
2525
import org.json.JSONException;
@@ -124,11 +124,11 @@ public JSONObject list( String page, int firstResult, int maxResults, boolean is
124124
Session session = getSession();
125125

126126
Query query = session.getNamedQuery( "org.pentaho.cdf.comments.CommentEntry." + queryName );
127-
query.setString( "page", page );
127+
query.setParameter( "page", page );
128128

129129
if ( isDeleted || isArchived ) {
130-
query.setBoolean( "deleted", isDeleted );
131-
query.setBoolean( "archived", isArchived );
130+
query.setParameter( "deleted", isDeleted );
131+
query.setParameter( "archived", isArchived );
132132
}
133133

134134
query.setFirstResult( firstResult < 0 ? 0 : firstResult ); // default 0

‎core/src/main/java/org/pentaho/cdf/storage/StorageEngine.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.apache.commons.lang.StringUtils;
1717
import org.apache.commons.logging.Log;
1818
import org.apache.commons.logging.LogFactory;
19-
import org.hibernate.Query;
19+
import org.hibernate.query.Query;
2020
import org.hibernate.Session;
2121
import org.json.JSONException;
2222
import org.json.JSONObject;
@@ -90,7 +90,7 @@ public JSONObject store( String value, String user ) throws JSONException, Inval
9090
session.beginTransaction();
9191

9292
Query query =
93-
session.getNamedQuery( "org.pentaho.cdf.storage.StorageEntry.getStorageForUser" ).setString( "user", user );
93+
session.getNamedQuery( "org.pentaho.cdf.storage.StorageEntry.getStorageForUser" ).setParameter( "user", user );
9494
StorageEntry storageEntry = (StorageEntry) query.uniqueResult();
9595

9696
if ( storageEntry == null ) {
@@ -117,7 +117,7 @@ public JSONObject read( String user ) throws JSONException, InvalidCdfOperationE
117117
Session session = getSession();
118118

119119
Query query =
120-
session.getNamedQuery( "org.pentaho.cdf.storage.StorageEntry.getStorageForUser" ).setString( "user", user );
120+
session.getNamedQuery( "org.pentaho.cdf.storage.StorageEntry.getStorageForUser" ).setParameter( "user", user );
121121

122122
StorageEntry storageEntry = (StorageEntry) query.uniqueResult();
123123

@@ -137,7 +137,7 @@ public JSONObject delete( String user ) throws JSONException, InvalidCdfOperatio
137137
session.beginTransaction();
138138

139139
Query query =
140-
session.getNamedQuery( "org.pentaho.cdf.storage.StorageEntry.getStorageForUser" ).setString( "user", user );
140+
session.getNamedQuery( "org.pentaho.cdf.storage.StorageEntry.getStorageForUser" ).setParameter( "user", user );
141141
StorageEntry storageEntry = (StorageEntry) query.uniqueResult();
142142

143143
if ( storageEntry != null ) {

‎pentaho/pom.xml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
<version>11.0.0.0-SNAPSHOT</version>
1212
<properties>
1313
<dependency.commons-collections.revision>3.2.2</dependency.commons-collections.revision>
14-
<dependency.javax.ws.rs-api.revision>2.0</dependency.javax.ws.rs-api.revision>
1514
<dependency.google-collections.revision>1.0</dependency.google-collections.revision>
16-
<dependency.jersey-common.revision>2.22.2</dependency.jersey-common.revision>
1715
<platform.version>11.0.0.0-SNAPSHOT</platform.version>
1816
</properties>
1917
<dependencies>
@@ -51,13 +49,13 @@
5149
<artifactId>json</artifactId>
5250
</dependency>
5351
<dependency>
54-
<groupId>javax.servlet</groupId>
55-
<artifactId>servlet-api</artifactId>
52+
<groupId>jakarta.servlet</groupId>
53+
<artifactId>jakarta.servlet-api</artifactId>
5654
</dependency>
5755
<dependency>
58-
<groupId>javax.ws.rs</groupId>
59-
<artifactId>javax.ws.rs-api</artifactId>
60-
<version>${dependency.javax.ws.rs-api.revision}</version>
56+
<groupId>jakarta.ws.rs</groupId>
57+
<artifactId>jakarta.ws.rs-api</artifactId>
58+
<version>${jakarta.ws.rs-api.version}</version>
6159
<exclusions>
6260
<exclusion>
6361
<artifactId>*</artifactId>
@@ -120,12 +118,12 @@
120118
<dependency>
121119
<groupId>org.hibernate</groupId>
122120
<artifactId>hibernate-core</artifactId>
123-
<version>${hibernate.version}</version>
121+
<version>${hibernate-core.version}</version>
124122
</dependency>
125123
<dependency>
126-
<groupId>javax.persistence</groupId>
127-
<artifactId>javax.persistence-api</artifactId>
128-
<version>${javax.persistence-api.version}</version>
124+
<groupId>jakarta.persistence</groupId>
125+
<artifactId>jakarta.persistence-api</artifactId>
126+
<version>${jakarta.persistence-api.version}</version>
129127
<scope>provided</scope>
130128
</dependency>
131129
<dependency>
@@ -143,7 +141,7 @@
143141
<dependency>
144142
<groupId>org.glassfish.jersey.core</groupId>
145143
<artifactId>jersey-common</artifactId>
146-
<version>${dependency.jersey-common.revision}</version>
144+
<version>${jersey.version}</version>
147145
<scope>test</scope>
148146
</dependency>
149147
<dependency>

‎pentaho/src/main/java/org/pentaho/cdf/CdfApi.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@
3939
import pt.webdetails.cpf.utils.CharsetHelper;
4040
import pt.webdetails.cpf.utils.PluginIOUtils;
4141

42-
import javax.servlet.http.HttpServletRequest;
43-
import javax.servlet.http.HttpServletResponse;
44-
import javax.ws.rs.Consumes;
45-
import javax.ws.rs.DefaultValue;
46-
import javax.ws.rs.FormParam;
47-
import javax.ws.rs.GET;
48-
import javax.ws.rs.POST;
49-
import javax.ws.rs.Path;
50-
import javax.ws.rs.Produces;
51-
import javax.ws.rs.QueryParam;
52-
import javax.ws.rs.core.Context;
53-
import javax.ws.rs.core.MediaType;
54-
import javax.ws.rs.core.Response;
55-
import javax.ws.rs.core.StreamingOutput;
42+
import jakarta.servlet.http.HttpServletRequest;
43+
import jakarta.servlet.http.HttpServletResponse;
44+
import jakarta.ws.rs.Consumes;
45+
import jakarta.ws.rs.DefaultValue;
46+
import jakarta.ws.rs.FormParam;
47+
import jakarta.ws.rs.GET;
48+
import jakarta.ws.rs.POST;
49+
import jakarta.ws.rs.Path;
50+
import jakarta.ws.rs.Produces;
51+
import jakarta.ws.rs.QueryParam;
52+
import jakarta.ws.rs.core.Context;
53+
import jakarta.ws.rs.core.MediaType;
54+
import jakarta.ws.rs.core.Response;
55+
import jakarta.ws.rs.core.StreamingOutput;
5656
import java.io.IOException;
5757
import java.io.OutputStream;
5858
import java.util.Arrays;
@@ -61,12 +61,12 @@
6161
import java.util.Locale;
6262
import java.util.Map;
6363

64-
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
65-
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
66-
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
67-
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
68-
import static javax.ws.rs.core.MediaType.TEXT_HTML;
69-
import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
64+
import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
65+
import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
66+
import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
67+
import static jakarta.ws.rs.core.MediaType.APPLICATION_XML;
68+
import static jakarta.ws.rs.core.MediaType.TEXT_HTML;
69+
import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
7070
import static pt.webdetails.cpf.utils.MimeTypes.CSV;
7171
import static pt.webdetails.cpf.utils.MimeTypes.JAVASCRIPT;
7272
import static pt.webdetails.cpf.utils.MimeTypes.XLS;

‎pentaho/src/main/java/org/pentaho/cdf/CdfContentGenerator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import java.util.HashMap;
2323
import java.util.UUID;
2424

25-
import javax.servlet.http.HttpServletRequest;
26-
import javax.servlet.http.HttpServletResponse;
27-
import javax.ws.rs.DefaultValue;
28-
import javax.ws.rs.QueryParam;
29-
import javax.ws.rs.core.Context;
25+
import jakarta.servlet.http.HttpServletRequest;
26+
import jakarta.servlet.http.HttpServletResponse;
27+
import jakarta.ws.rs.DefaultValue;
28+
import jakarta.ws.rs.QueryParam;
29+
import jakarta.ws.rs.core.Context;
3030

3131
import org.apache.commons.io.FilenameUtils;
3232
import org.apache.commons.lang.StringUtils;

‎pentaho/src/main/java/org/pentaho/cdf/GetCDFResource.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,26 @@
1313

1414
package org.pentaho.cdf;
1515

16+
import java.io.IOException;
17+
import java.io.InputStream;
18+
import java.io.OutputStream;
19+
20+
import jakarta.servlet.ServletException;
21+
import jakarta.servlet.http.HttpServletRequest;
22+
import jakarta.servlet.http.HttpServletResponse;
23+
1624
import org.apache.commons.lang.StringUtils;
1725
import org.apache.commons.logging.Log;
1826
import org.apache.commons.logging.LogFactory;
1927
import org.pentaho.cdf.environment.CdfEngine;
2028
import org.pentaho.cdf.util.Parameter;
2129
import org.pentaho.platform.web.servlet.ServletBase;
30+
2231
import pt.webdetails.cpf.MimeTypeHandler;
2332
import pt.webdetails.cpf.repository.api.IReadAccess;
2433
import pt.webdetails.cpf.utils.MimeTypes;
2534
import pt.webdetails.cpf.utils.PluginIOUtils;
2635

27-
import javax.servlet.http.HttpServletRequest;
28-
import javax.servlet.http.HttpServletResponse;
29-
import java.io.IOException;
30-
import java.io.InputStream;
31-
import java.io.OutputStream;
32-
3336
public class GetCDFResource extends ServletBase {
3437

3538
private static final long serialVersionUID = 8251622066287622726L;

‎pentaho/src/main/java/org/pentaho/cdf/ResourcesApi.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313

1414
package org.pentaho.cdf;
1515

16-
import static javax.ws.rs.core.MediaType.WILDCARD;
16+
import static jakarta.ws.rs.core.MediaType.WILDCARD;
1717

1818
import java.io.IOException;
19-
import javax.servlet.http.HttpServletRequest;
20-
import javax.servlet.http.HttpServletResponse;
21-
import javax.ws.rs.GET;
22-
import javax.ws.rs.Path;
23-
import javax.ws.rs.PathParam;
24-
import javax.ws.rs.Produces;
25-
import javax.ws.rs.core.Context;
26-
import javax.ws.rs.core.Response;
27-
import javax.ws.rs.core.Response.Status;
19+
import jakarta.servlet.http.HttpServletRequest;
20+
import jakarta.servlet.http.HttpServletResponse;
21+
import jakarta.ws.rs.GET;
22+
import jakarta.ws.rs.Path;
23+
import jakarta.ws.rs.PathParam;
24+
import jakarta.ws.rs.Produces;
25+
import jakarta.ws.rs.core.Context;
26+
import jakarta.ws.rs.core.Response;
27+
import jakarta.ws.rs.core.Response.Status;
2828
import org.apache.commons.lang.StringUtils;
2929
import org.pentaho.cdf.environment.CdfEngine;
3030
import org.pentaho.cdf.utils.CorsUtil;

‎pentaho/src/main/java/org/pentaho/cdf/comments/CommentsApi.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313

1414
package org.pentaho.cdf.comments;
1515

16-
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
17-
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
18-
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
19-
20-
import javax.servlet.http.HttpServletRequest;
21-
import javax.servlet.http.HttpServletResponse;
22-
import javax.ws.rs.Consumes;
23-
import javax.ws.rs.DefaultValue;
24-
import javax.ws.rs.GET;
25-
import javax.ws.rs.Path;
26-
import javax.ws.rs.Produces;
27-
import javax.ws.rs.QueryParam;
28-
import javax.ws.rs.core.Context;
29-
import javax.ws.rs.core.Response;
16+
import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
17+
import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
18+
import static jakarta.ws.rs.core.MediaType.APPLICATION_XML;
19+
20+
import jakarta.servlet.http.HttpServletRequest;
21+
import jakarta.servlet.http.HttpServletResponse;
22+
import jakarta.ws.rs.Consumes;
23+
import jakarta.ws.rs.DefaultValue;
24+
import jakarta.ws.rs.GET;
25+
import jakarta.ws.rs.Path;
26+
import jakarta.ws.rs.Produces;
27+
import jakarta.ws.rs.QueryParam;
28+
import jakarta.ws.rs.core.Context;
29+
import jakarta.ws.rs.core.Response;
3030

3131
import org.apache.commons.logging.Log;
3232
import org.apache.commons.logging.LogFactory;

‎pentaho/src/main/java/org/pentaho/cdf/context/ContextApi.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313

1414
package org.pentaho.cdf.context;
1515

16-
import javax.servlet.http.HttpServletRequest;
17-
import javax.servlet.http.HttpServletResponse;
18-
import javax.ws.rs.Consumes;
19-
import javax.ws.rs.GET;
20-
import javax.ws.rs.Path;
21-
import javax.ws.rs.Produces;
22-
import javax.ws.rs.QueryParam;
23-
import javax.ws.rs.core.Context;
24-
import javax.ws.rs.core.Response;
25-
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
26-
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
16+
import jakarta.servlet.http.HttpServletRequest;
17+
import jakarta.servlet.http.HttpServletResponse;
18+
import jakarta.ws.rs.Consumes;
19+
import jakarta.ws.rs.GET;
20+
import jakarta.ws.rs.Path;
21+
import jakarta.ws.rs.Produces;
22+
import jakarta.ws.rs.QueryParam;
23+
import jakarta.ws.rs.core.Context;
24+
import jakarta.ws.rs.core.Response;
25+
import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
26+
import static jakarta.ws.rs.core.MediaType.APPLICATION_XML;
2727
import org.apache.commons.logging.Log;
2828
import org.apache.commons.logging.LogFactory;
2929
import org.json.JSONException;

0 commit comments

Comments
 (0)