You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2021/10/27 09:23:35 UTC
[myfaces] branch master updated: use new tomcat versions + fixed
build
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new ed5122b use new tomcat versions + fixed build
ed5122b is described below
commit ed5122b82945d0293d9ab1b1ff1ff7c7cea25b54
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Wed Oct 27 11:23:11 2021 +0200
use new tomcat versions + fixed build
---
.../apache/myfaces/cdi/FacesArtifactProducer.java | 2 +-
parent/pom.xml | 6 +--
.../myfaces/test/mock/MockHttpServletRequest.java | 45 ++++++++++++++++++++++
.../apache/myfaces/test/mock/MockHttpSession.java | 9 -----
.../myfaces/test/mock/MockHttpSessionProxy.java | 8 ----
5 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/FacesArtifactProducer.java b/impl/src/main/java/org/apache/myfaces/cdi/FacesArtifactProducer.java
index 5702f63..50f1b6a 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/FacesArtifactProducer.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/FacesArtifactProducer.java
@@ -256,5 +256,5 @@ public class FacesArtifactProducer
{
return FacesContext.getCurrentInstance().getExternalContext().getRequest();
}
- /*
+ */
}
diff --git a/parent/pom.xml b/parent/pom.xml
index dcd0a00..de34439 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -362,19 +362,19 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
- <version>10.0.0-M9</version>
+ <version>10.1.0-M6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-websocket-api</artifactId>
- <version>10.0.0-M9</version>
+ <version>10.1.0-M6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-el-api</artifactId>
- <version>10.1.0-SNAPSHOT</version>
+ <version>10.1.0-M6</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
index fe3f5c3..72fcc20 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
@@ -43,6 +43,7 @@ import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletInputStream;
@@ -51,12 +52,14 @@ import jakarta.servlet.ServletRequestAttributeEvent;
import jakarta.servlet.ServletRequestAttributeListener;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletMapping;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSessionEvent;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
+import jakarta.servlet.http.PushBuilder;
/**
* <p>Mock implementation of <code>HttpServletContext</code>.</p>
@@ -1110,4 +1113,46 @@ public class MockHttpServletRequest implements HttpServletRequest
throw new UnsupportedOperationException("Not supported yet.");
}
+ @Override
+ public HttpServletMapping getHttpServletMapping()
+ {
+ return HttpServletRequest.super.getHttpServletMapping();
+ }
+
+ @Override
+ public PushBuilder newPushBuilder()
+ {
+ return HttpServletRequest.super.newPushBuilder();
+ }
+
+ @Override
+ public Map<String, String> getTrailerFields()
+ {
+ return HttpServletRequest.super.getTrailerFields();
+ }
+
+ @Override
+ public boolean isTrailerFieldsReady()
+ {
+ return HttpServletRequest.super.isTrailerFieldsReady();
+ }
+
+ @Override
+ public String getRequestId()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public String getProtocolRequestId()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public ServletConnection getServletConnection()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java
index 33fc4a8..3998376 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpSession.java
@@ -30,7 +30,6 @@ import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSessionAttributeListener;
import jakarta.servlet.http.HttpSessionBindingEvent;
import jakarta.servlet.http.HttpSessionBindingListener;
-import jakarta.servlet.http.HttpSessionContext;
import jakarta.servlet.http.HttpSessionEvent;
/**
@@ -194,14 +193,6 @@ public class MockHttpSession implements HttpSession
}
/** {@inheritDoc} */
- public HttpSessionContext getSessionContext()
- {
-
- throw new UnsupportedOperationException();
-
- }
-
- /** {@inheritDoc} */
public Object getValue(String name)
{
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpSessionProxy.java b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpSessionProxy.java
index 772a013..e7ee71e 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpSessionProxy.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpSessionProxy.java
@@ -22,7 +22,6 @@ package org.apache.myfaces.test.mock;
import java.util.Enumeration;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpSessionAttributeListener;
-import jakarta.servlet.http.HttpSessionContext;
import jakarta.servlet.http.HttpSessionEvent;
/**
@@ -105,13 +104,6 @@ public class MockHttpSessionProxy extends MockHttpSession
return servletContext == null ? getWrapped().getServletContext() : servletContext;
}
- @Override
- public HttpSessionContext getSessionContext()
- {
- return getWrapped().getSessionContext();
- }
-
- @Override
public Object getValue(String name)
{
return getWrapped().getValue(name);