You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2020/10/17 21:49:47 UTC
[openwebbeans-meecrowave] branch master updated: MEECROWAVE-218
update tomcat to 9.0.39
This is an automated email from the ASF dual-hosted git repository.
struberg 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 2d65385 MEECROWAVE-218 update tomcat to 9.0.39
2d65385 is described below
commit 2d65385fb7a8a94ae8242a8fcdbcb6a989bddead
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sat Oct 17 23:48:57 2020 +0200
MEECROWAVE-218 update tomcat to 9.0.39
also update xbean to 4.18 and new owb version to support java-16
---
meecrowave-core/pom.xml | 2 +-
.../main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java | 1 +
pom.xml | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meecrowave-core/pom.xml b/meecrowave-core/pom.xml
index 2f61ff5..4c03802 100644
--- a/meecrowave-core/pom.xml
+++ b/meecrowave-core/pom.xml
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
- <artifactId>xbean-asm8-shaded</artifactId>
+ <artifactId>xbean-asm9-shaded</artifactId>
<version>${xbean.version}</version>
</dependency>
<dependency>
diff --git a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
index 6e419bb..e6f78fb 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
@@ -93,6 +93,7 @@ public class OWBAutoSetup implements ServletContainerInitializer {
.qualifiers(DefaultLiteral.INSTANCE)
.types(Configuration.class, Meecrowave.Builder.class, Object.class)
.createWith(cc -> meecrowave.getConfiguration())));
+
beanManager.addInternalBean(newBean(instance, configurator ->
configurator.beanClass(Meecrowave.class)
.scope(ApplicationScoped.class)
diff --git a/pom.xml b/pom.xml
index 36aca8f..b1367df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
<junit.version>4.13</junit.version>
<tomcat.version>9.0.39</tomcat.version>
- <openwebbeans.version>2.0.18</openwebbeans.version>
+ <openwebbeans.version>2.0.19-SNAPSHOT</openwebbeans.version>
<cxf.version>3.4.0</cxf.version>
<johnzon.version>1.2.8</johnzon.version>
<log4j2.version>2.13.3</log4j2.version>
@@ -63,7 +63,7 @@
<h2.version>1.4.200</h2.version>
<dbcp2.version>2.7.0</dbcp2.version>
<commons-cli.version>1.4</commons-cli.version>
- <xbean.version>4.17</xbean.version>
+ <xbean.version>4.18</xbean.version>
<java11.jaxb.version>2.3.0</java11.jaxb.version>
</properties>