Skip to content
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

[JENKINS-73256] Migrate Jelly from EE 8 to EE 9 #114

Merged
merged 1 commit into from
Sep 3, 2024
Merged

[JENKINS-73256] Migrate Jelly from EE 8 to EE 9 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ updates:
ignore:
# Provided by the Web container, so aligned with Jetty.
- dependency-name: "jakarta.servlet:jakarta.servlet-api"
# Contains incompatible API changes and needs compatibility work.
- dependency-name: "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
versions: [">=2.0.0"]
# Ignore 1.2.0-atlassian-2
- dependency-name: "jaxen:jaxen"
- package-ecosystem: "github-actions"
Expand Down
8 changes: 4 additions & 4 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>4.0.4</version>
<optional>true</optional>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>1.2.7</version>
<optional>true</optional>
<version>2.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jaxen</groupId>
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/java/org/apache/commons/jelly/servlet/JellyServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
import java.net.MalformedURLException;
import java.net.URL;

import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/commons/jelly/servlet/JellyServletContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import org.apache.commons.jelly.JellyContext;

import javax.servlet.ServletContext;
import jakarta.servlet.ServletContext;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/commons/jelly/tags/core/ForEachTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.util.Iterator;

import javax.servlet.jsp.jstl.core.LoopTagStatus;
import jakarta.servlet.jsp.jstl.core.LoopTagStatus;

import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/org/apache/commons/jelly/tags/Resources.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ SQL_DATASOURCE_NULL=\
'dataSource' is null

SQL_MAXROWS_PARSE_ERROR=\
Error parsing 'javax.servlet.jsp.jstl.sql.maxRows' configuration setting: "{0}"
Error parsing 'jakarta.servlet.jsp.jstl.sql.maxRows' configuration setting: "{0}"

SQL_MAXROWS_INVALID=\
'javax.servlet.jsp.jstl.sql.maxRows' configuration setting neither an Integer nor a String
'jakarta.servlet.jsp.jstl.sql.maxRows' configuration setting neither an Integer nor a String
Comment on lines 230 to +234
Copy link
Member

Choose a reason for hiding this comment

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

We don't use jelly-sql anywhere I think?

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct. This change is only for logical consistency with the jakarta.servlet.jsp.jstl-api bump.


SQL_DATE_PARAM_INVALID_TYPE=\
In &lt;dateParam&gt;, invalid 'type' attribute: "{0}"
Expand Down
2 changes: 1 addition & 1 deletion jelly-tags/fmt/src/main/java/org/apache/commons/jelly/tags/fmt/TimeZoneTag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ else if (valueInput instanceof String) {
* the time zone is taken from the enclosing &lt;timeZone&gt; action.
*
* <p> Otherwise, the time zone configuration setting
* <tt>javax.servlet.jsp.jstl.core.Config.FMT_TIME_ZONE</tt>
* <tt>jakarta.servlet.jsp.jstl.core.Config.FMT_TIME_ZONE</tt>
* is used.
*
* @param jc the page containing the action for which the
Expand Down
Loading