You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2018/01/08 15:48:45 UTC
tomee git commit: TOMEE-2160 Thomas Andraschko patch to upgrade to
tomcat 9
Repository: tomee
Updated Branches:
refs/heads/fb_tomee8 acc6a5cb6 -> cb8ec5b9c
TOMEE-2160 Thomas Andraschko patch to upgrade to tomcat 9
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/cb8ec5b9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/cb8ec5b9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/cb8ec5b9
Branch: refs/heads/fb_tomee8
Commit: cb8ec5b9c77f0e49da1fa9fa1ba2552327e21b2e
Parents: acc6a5c
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Mon Jan 8 16:48:38 2018 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Mon Jan 8 16:48:38 2018 +0100
----------------------------------------------------------------------
.../apache/openejb/arquillian/tests/realm/HardCodedRealm.java | 6 ------
.../arquillian/tests/realm/MyCdiRealmBaseLazyRealm.java | 5 -----
pom.xml | 4 ++--
.../java/org/apache/tomee/catalina/realm/CdiEventRealm.java | 5 -----
4 files changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb8ec5b9/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/HardCodedRealm.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/HardCodedRealm.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/HardCodedRealm.java
index fb58415..3a5f36c 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/HardCodedRealm.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/HardCodedRealm.java
@@ -26,12 +26,6 @@ import static java.util.Arrays.asList;
public class HardCodedRealm extends RealmBase
{
@Override
- protected String getName()
- {
- return "hard-coded";
- }
-
- @Override
protected String getPassword(final String username)
{
return "tom".equals(username)? "ee" : null;
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb8ec5b9/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiRealmBaseLazyRealm.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiRealmBaseLazyRealm.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiRealmBaseLazyRealm.java
index f1b5e30..81f94ae 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiRealmBaseLazyRealm.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/realm/MyCdiRealmBaseLazyRealm.java
@@ -26,11 +26,6 @@ import static java.util.Arrays.asList;
// no scope cause RealmBase is not proxyable, realm impl would put a scope + implement Realm, Lifecycle
public class MyCdiRealmBaseLazyRealm extends RealmBase {
@Override
- protected String getName() {
- return "user";
- }
-
- @Override
protected String getPassword(final String username) {
return "pwd";
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb8ec5b9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 35a1cb8..14c07b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,13 +126,13 @@
<openejb.osgi.dynamic.import>${openejb.osgi.dynamic.import.pkg}</openejb.osgi.dynamic.import>
<openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name>
- <batchee.version>0.4-incubating</batchee.version>
+ <batchee.version>0.5-incubating</batchee.version>
<version.arquillian>1.1.13.Final</version.arquillian>
<version.shrinkwrap.descriptor>2.0.0-alpha-10</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
- <tomcat.version>8.5.23</tomcat.version>
+ <tomcat.version>9.0.2</tomcat.version>
<cxf.version>3.2.1</cxf.version>
<ehcache.version>2.10.3</ehcache.version>
http://git-wip-us.apache.org/repos/asf/tomee/blob/cb8ec5b9/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
index ce5725f..c7d4286 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/realm/CdiEventRealm.java
@@ -125,11 +125,6 @@ public class CdiEventRealm extends RealmBase {
}
@Override
- protected String getName() {
- return "CdiEventRealm";
- }
-
- @Override
protected String getPassword(final String username) {
// must never happen cause we overridden all authenticate() mthd
throw new UnsupportedOperationException();