This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new ec86527 Update to OpenWebBeans 2.0.12
ec86527 is described below
commit ec86527544650294068279316e26e00a987f3e13
Author: remm <r...@apache.org>
AuthorDate: Thu Oct 3 17:18:44 2019 +0200
Update to OpenWebBeans 2.0.12
Prepare to use shade 3.2.2 whenever it is released.
---
modules/owb/pom.xml | 6 ++++--
.../main/resources/META-INF/openwebbeans/openwebbeans.properties | 2 ++
webapps/docs/changelog.xml | 3 +++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 55d25b9..88328d3 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -29,14 +29,14 @@
<name>Apache Tomcat CDI 2 support</name>
<description>Apache Tomcat CDI 2 support using Apache
OpenWebBeans</description>
<!-- This is the Apache OpenWebBeans version -->
- <version>2.0.10</version>
+ <version>2.0.12</version>
<packaging>jar</packaging>
<properties>
<geronimo-atinject.version>1.0</geronimo-atinject.version>
<geronimo-interceptor.version>1.0</geronimo-interceptor.version>
<geronimo-jcdi.version>1.0.1</geronimo-jcdi.version>
- <tomcat.version>9.0.21</tomcat.version>
+ <tomcat.version>9.0.26</tomcat.version>
</properties>
<dependencies>
@@ -96,6 +96,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
+ <!--<version>3.2.2</version>-->
<executions>
<execution>
<phase>package</phase>
@@ -105,6 +106,7 @@
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
+ <!--<transformer
implementation="org.apache.maven.plugins.shade.resource.properties.OpenWebBeansPropertiesTransformer"/>-->
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${mainClass}</mainClass>
</transformer>
diff --git
a/modules/owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
b/modules/owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
index fa5a3fb..b1d0ae4 100644
---
a/modules/owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
+++
b/modules/owb/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
@@ -16,6 +16,8 @@
#under the License.
org.apache.webbeans.spi.SecurityService=org.apache.webbeans.web.tomcat.TomcatSecurityService
+
+# Remove if using shade 3.2.2 and OpenWebBeansPropertiesTransformer
org.apache.webbeans.spi.adaptor.ELAdaptor=org.apache.webbeans.el22.EL22Adaptor
org.apache.webbeans.spi.ContainerLifecycle=org.apache.webbeans.web.lifecycle.WebContainerLifecycle
org.apache.webbeans.spi.ScannerService=org.apache.webbeans.web.scanner.WebScannerService
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4ed78e0..fc230d0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -132,6 +132,9 @@
use that build property to reduce the number of edits required to
update
the minimum supported Java version. (markt)
</add>
+ <update>
+ Update to OpenWebBeans 2.0.12. (remm)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
