Skip to content

Commit

Permalink
[JENKINS-73256] Migrate Jelly from EE 8 to EE 9
Browse files Browse the repository at this point in the history
  • Loading branch information
basil committed Aug 27, 2024
1 parent 4d17a3f commit 467c501
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 16 deletions.
2 changes: 0 additions & 2 deletions .github/dependabot.yml
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
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
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
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
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
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

SQL_DATE_PARAM_INVALID_TYPE=\
In &lt;dateParam&gt;, invalid 'type' attribute: "{0}"
Expand Down
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

0 comments on commit 467c501

Please sign in to comment.