This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new b653a3f Fix Jakarta backport
b653a3f is described below
commit b653a3f6bc6f1eac6019a1ee2894329d35df48c1
Author: remm <r...@apache.org>
AuthorDate: Sun Jun 27 19:34:46 2021 +0200
Fix Jakarta backport
Probably not the last one ...
---
test/org/apache/jasper/compiler/TestJspUtil.java | 2 +-
webapps/docs/changelog.xml | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/test/org/apache/jasper/compiler/TestJspUtil.java
b/test/org/apache/jasper/compiler/TestJspUtil.java
index f7755d0..438fb73 100644
--- a/test/org/apache/jasper/compiler/TestJspUtil.java
+++ b/test/org/apache/jasper/compiler/TestJspUtil.java
@@ -16,7 +16,7 @@
*/
package org.apache.jasper.compiler;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
import org.junit.Assert;
import org.junit.Test;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 49e3c04..e25ed0e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,8 +105,15 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.50 (remm)" rtext="in development">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Jakarta to Javax backport issue in tests. (remm)
+ </fix>
+ </changelog>
+ </subsection>
</section>
-<section name="Tomcat 9.0.49 (remm)" rtext="in progress">
+<section name="Tomcat 9.0.49 (remm)" rtext="not released">
<subsection name="Catalina">
<changelog>
<scode>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
