This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new d0d5a1878 Bump jakarta.servlet:jakarta.servlet-api from 6.0.0 to 6.1.0
d0d5a1878 is described below
commit d0d5a1878987863ca7d1e3f97a126d2fae52b4cd
Author: Gary Gregory <[email protected]>
AuthorDate: Fri Jun 14 09:24:58 2024 -0400
Bump jakarta.servlet:jakarta.servlet-api from 6.0.0 to 6.1.0
Add org.apache.juneau.rest.mock.MockServletResponse.sendRedirect(String,
int, boolean) for jakarta.servlet:jakarta.servlet-api 6.1.0
---
RELEASE-NOTES.txt | 4 +++-
.../main/java/org/apache/juneau/rest/mock/MockServletResponse.java | 7 +++++++
pom.xml | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index c92c963f6..721ab5972 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -31,7 +31,9 @@ Release Notes - Juneau - Version 9.1.0
* Bump org.apache.maven.plugins:maven-jxr-plugin from 3.3.1 to 3.4.0 #150.
* Bump org.apache.maven.plugins:maven-shade-plugin from 3.4.1 to 3.6.0
#135, #144, #147.
* Bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 #140.
- * Bump org.apache.maven.plugins:maven-source-plugin from 3.2.1 to 3.3.1
#141
+ * Bump org.apache.maven.plugins:maven-source-plugin from 3.2.1 to 3.3.1
#141.
+ * Bump jakarta.servlet:jakarta.servlet-api 6.1.0 from 6.0.0 to 6.1.0.
+ * Add org.apache.juneau.rest.mock.MockServletResponse.sendRedirect(String,
int, boolean) for jakarta.servlet:jakarta.servlet-api 6.1.0.
Release Notes - Juneau - Version 9.0.1
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
index 6c656b6aa..7c55e7495 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
@@ -185,6 +185,12 @@ public class MockServletResponse implements
HttpServletResponse {
headerMap.put("Location", new String[] {location});
}
+ // @Override /* HttpServletResponse */
+ public void sendRedirect(String location, int sc, boolean clearBuffer)
throws IOException {
+ this.sc = sc;
+ headerMap.put("Location", new String[] {location});
+ }
+
@Override /* HttpServletResponse */
public void setDateHeader(String name, long date) {
headerMap.put(name, new String[] {DateUtils.formatDate(new
Date(date), DateUtils.PATTERN_RFC1123)});
@@ -273,4 +279,5 @@ public class MockServletResponse implements
HttpServletResponse {
Map<String,String[]> getHeaders() {
return headerMap;
}
+
}
diff --git a/pom.xml b/pom.xml
index 62c2fa65a..07f588725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
<jaxb.version>2.3.1</jaxb.version>
<junit.version>4.13.2</junit.version>
<jaxrs.version>1.1.1</jaxrs.version>
- <servlet.version>6.0.0</servlet.version>
+ <servlet.version>6.1.0</servlet.version>
<httpclient.version>4.5.14</httpclient.version>
<httpcore.version>4.4.16</httpcore.version>
<jetty.version>12.0.10</jetty.version>