You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2021/08/31 07:32:59 UTC
[tomee] branch master updated (41e748c -> 67e81ae)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 41e748c Updates Tomee Patch Plugin to 0.6 (enables Windows build again)
new c297f45 TOMEE-3786 - Ignore the two tests for now (as discussed on dev@)
new 67e81ae TOMEE-3787 - Updates to Tomcat 9.0.52 Backports: https://github.com/apache/tomcat/commit/f53fb52ec1a316f5047dff52c154807bd4c11254
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
tck/cdi-tomee/src/test/resources/passing.xml | 8 +++++++-
.../apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
[tomee] 01/02: TOMEE-3786 - Ignore the two tests for now (as
discussed on dev@)
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit c297f455c3ba043bb66c55d496e219439600e20d
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Tue Aug 31 09:13:06 2021 +0200
TOMEE-3786 - Ignore the two tests for now (as discussed on dev@)
---
tck/cdi-tomee/src/test/resources/passing.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tck/cdi-tomee/src/test/resources/passing.xml b/tck/cdi-tomee/src/test/resources/passing.xml
index 1851e62..0aa7275 100644
--- a/tck/cdi-tomee/src/test/resources/passing.xml
+++ b/tck/cdi-tomee/src/test/resources/passing.xml
@@ -394,7 +394,13 @@
<methods><exclude name=".*" /></methods>
</class>
-
+ <!-- TODO https://issues.apache.org/jira/browse/TOMEE-3786 -->
+ <class name="org.jboss.cdi.tck.tests.context.session.async.SessionContextAsyncListenerTest">
+ <methods>
+ <exclude name="testSessionContextActiveOnError"/>
+ <exclude name="testSessionContextActiveOnStartAsync"/>
+ </methods>
+ </class>
</classes>
[tomee] 02/02: TOMEE-3787 - Updates to Tomcat 9.0.52 Backports:
https://github.com/apache/tomcat/commit/f53fb52ec1a316f5047dff52c154807bd4c11254
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 67e81ae1d41451356012b01f9fe45c0ef89075fc
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Tue Aug 31 09:13:28 2021 +0200
TOMEE-3787 - Updates to Tomcat 9.0.52
Backports: https://github.com/apache/tomcat/commit/f53fb52ec1a316f5047dff52c154807bd4c11254
---
pom.xml | 2 +-
.../org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fa6850c..5c2a10f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
<version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
- <tomcat.version>9.0.50</tomcat.version>
+ <tomcat.version>9.0.52</tomcat.version>
<cxf.version>3.4.3</cxf.version>
<ehcache.version>2.10.3</ehcache.version>
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java b/tomee/apache-tomee/src/patch/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
index d785d4e..1e7a70a 100644
--- a/tomee/apache-tomee/src/patch/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
+++ b/tomee/apache-tomee/src/patch/java/org/apache/catalina/authenticator/jaspic/CallbackHandlerImpl.java
@@ -89,6 +89,7 @@ public class CallbackHandlerImpl implements CallbackHandler, Contained {
PasswordValidationCallback pvc = (PasswordValidationCallback) callback;
principal = container.getRealm().authenticate(pvc.getUsername(),
String.valueOf(pvc.getPassword()));
+ pvc.setResult(principal != null);
subject = pvc.getSubject();
}
} else {