You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2021/05/13 18:07:07 UTC
[openwebbeans-meecrowave] branch master updated:
[MEECROWAVE-291][MEECROWAVE-292] upgrade xbean 4.20 and tomcat 9.0.46
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/master by this push:
new a640a4b [MEECROWAVE-291][MEECROWAVE-292] upgrade xbean 4.20 and tomcat 9.0.46
a640a4b is described below
commit a640a4b9532b2a2593284f3ab797e37d0519775e
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Thu May 13 20:07:01 2021 +0200
[MEECROWAVE-291][MEECROWAVE-292] upgrade xbean 4.20 and tomcat 9.0.46
---
.../org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java | 6 ++----
.../main/java/org/apache/meecrowave/tomcat/ProvidedLoader.java | 10 ++--------
.../src/test/java/org/apache/meecrowave/ConfigInjection.java | 1 +
pom.xml | 4 ++--
4 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java b/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
index 3b13595..261da27 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
@@ -127,12 +127,10 @@ public class MeecrowaveContextConfig extends ContextConfig {
.findFirst().get().getKey(), k -> new HashSet<>())
.add(webComponent)));
}
- } finally {
- thread.setContextClassLoader(old);
- }
- try {
+
super.webConfig();
} finally {
+ thread.setContextClassLoader(old);
webClasses.clear();
finder = null;
}
diff --git a/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/ProvidedLoader.java b/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/ProvidedLoader.java
index a0f361a..e9f2801 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/ProvidedLoader.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/ProvidedLoader.java
@@ -18,14 +18,14 @@
*/
package org.apache.meecrowave.tomcat;
-import java.beans.PropertyChangeListener;
-
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Loader;
import org.apache.catalina.util.LifecycleBase;
+import java.beans.PropertyChangeListener;
+
// used to not recreate another classloader,
// it has a small workaround cause tomcat set properties (clear*) on the classloader
// and AppLoader doesnt support it leading to warnings we don't want
@@ -34,7 +34,6 @@ public class ProvidedLoader extends LifecycleBase implements Loader {
private final ClassLoader delegate;
private Context context;
- private int mockReturns = -1;
public ProvidedLoader(final ClassLoader loader, final boolean wrap) {
// use another classloader cause tomcat set properties on the classloader
@@ -49,10 +48,6 @@ public class ProvidedLoader extends LifecycleBase implements Loader {
@Override
public ClassLoader getClassLoader() {
- if (mockReturns > 0) {
- mockReturns--;
- return MOCK;
- }
return delegate;
}
@@ -103,7 +98,6 @@ public class ProvidedLoader extends LifecycleBase implements Loader {
@Override
protected void startInternal() throws LifecycleException {
- mockReturns = 4; // check StandardContext.startInternal, while there is no warnings in the log and tests pass we are good
setState(LifecycleState.STARTING);
}
diff --git a/meecrowave-core/src/test/java/org/apache/meecrowave/ConfigInjection.java b/meecrowave-core/src/test/java/org/apache/meecrowave/ConfigInjection.java
index 57d2d99..28a1872 100644
--- a/meecrowave-core/src/test/java/org/apache/meecrowave/ConfigInjection.java
+++ b/meecrowave-core/src/test/java/org/apache/meecrowave/ConfigInjection.java
@@ -37,6 +37,7 @@ public class ConfigInjection {
try (final Meecrowave meecrowave = new Meecrowave(
new Meecrowave.Builder()
.randomHttpPort()
+ .skipHttp(true)
.includePackages(ConfigInjection.class.getName())).bake()) {
OWBInjector.inject(WebBeansContext.currentInstance().getBeanManagerImpl(), this, null);
assertNotNull(configuration);
diff --git a/pom.xml b/pom.xml
index 0575285..a84e58b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<meecrowave.build.name>${project.groupId}.${project.artifactId}</meecrowave.build.name>
<junit.version>4.13.1</junit.version>
- <tomcat.version>9.0.44</tomcat.version>
+ <tomcat.version>9.0.46</tomcat.version>
<openwebbeans.version>2.0.22</openwebbeans.version>
<cxf.version>3.4.3</cxf.version>
<johnzon.version>1.2.11</johnzon.version>
@@ -63,7 +63,7 @@
<h2.version>1.4.200</h2.version>
<dbcp2.version>2.8.0</dbcp2.version>
<commons-cli.version>1.4</commons-cli.version>
- <xbean.version>4.19</xbean.version>
+ <xbean.version>4.20</xbean.version>
<geronimo-jcache-simple.version>1.0.5</geronimo-jcache-simple.version>
<geronimo-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>