sepe81 commented on code in PR #778:
URL: https://github.com/apache/struts/pull/778#discussion_r1391731445
##########
plugins/velocity/pom.xml:
##########
@@ -54,7 +54,7 @@
<artifactId>mockobjects-core</artifactId>
<scope>test</scope>
</dependency>
-
+
Review Comment:
```suggestion
```
revert change
##########
apps/showcase/pom.xml:
##########
@@ -99,8 +94,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
Review Comment:
```suggestion
<artifactId>jakarta.servlet-api</artifactId>
```
##########
pom.xml:
##########
@@ -792,50 +748,56 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.1-b12</version>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
+ <version>5.0.0-M1</version>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+ <version>3.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ <version>5.0.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
- <version>8.5.53</version>
+ <version>10.1.15</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-api</artifactId>
- <version>8.5.53</version>
+ <version>10.1.15</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <groupId>jakarta.servlet.jsp</groupId>
+
<artifactId>jakarta.servlet.jsp-api</artifactId>
+ <version>3.1.0</version>
Review Comment:
```suggestion
<version>3.1.0</version>
```
##########
pom.xml:
##########
@@ -946,38 +908,12 @@
<artifactId>spring-web</artifactId>
<version>${spring.platformVersion}</version>
</dependency>
-
- <dependency>
+ <dependency>
Review Comment:
revert line
##########
pom.xml:
##########
@@ -792,50 +748,56 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.1-b12</version>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.el</artifactId>
+ <version>5.0.0-M1</version>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+ <version>3.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ <version>5.0.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jasper</artifactId>
- <version>8.5.53</version>
+ <version>10.1.15</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-api</artifactId>
- <version>8.5.53</version>
+ <version>10.1.15</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <groupId>jakarta.servlet.jsp</groupId>
+
<artifactId>jakarta.servlet.jsp-api</artifactId>
Review Comment:
```suggestion
<artifactId>jakarta.servlet.jsp-api</artifactId>
```
tabs2spaces
##########
bundles/pom.xml:
##########
@@ -51,9 +51,9 @@
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <dependency>
Review Comment:
```suggestion
<dependency>
```
trim trailing space
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
