You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2020/06/15 13:19:17 UTC
[tomcat] branch master updated: Update to OWB 2.0.17
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 eeafcd7 Update to OWB 2.0.17
eeafcd7 is described below
commit eeafcd76feaae0558e0e6c60ac4d9ad00b3d221b
Author: remm <re...@apache.org>
AuthorDate: Mon Jun 15 15:18:58 2020 +0200
Update to OWB 2.0.17
Use the new shade plugin version, it seems to work properly now. Simply
some items ... But add new stuff due to new warnings.
---
modules/owb/pom.xml | 34 ++++++++++++++++------------------
webapps/docs/changelog.xml | 3 +++
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 1a58c67..2fd627b 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.16</version>
+ <version>2.0.17</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>10.0.0-M3</tomcat.version>
+ <tomcat.version>10.0.0-M6</tomcat.version>
</properties>
<dependencies>
@@ -80,7 +80,6 @@
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -95,8 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.1</version>
- <!--<version>3.2.2</version>-->
+ <version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
@@ -106,23 +104,23 @@
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
- <transformer implementation="org.apache.openwebbeans.maven.shade.OpenWebBeansPropertiesTransformer" />
- <!-- With Shade 3.2.2 <transformer implementation="org.apache.maven.plugins.shade.resource.properties.OpenWebBeansPropertiesTransformer"/>-->
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>${mainClass}</mainClass>
- </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.properties.OpenWebBeansPropertiesTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
</transformers>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>
- <!-- Remove after Shade 3.2.2 -->
- <dependencies>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-maven</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61c628c..de814bc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -103,6 +103,9 @@
<bug>64515</bug>: Bnd files don't need to be filtered (save some work).
Pull request provided by Raymond Augé. (markt)
</fix>
+ <update>
+ Update the OWB module to Apache OpenWebBeans 2.0.17. (remm)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org