This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new b2ceefd Update to OWB 2.0.17 b2ceefd is described below commit b2ceefd9f2676081051a6112ab388ee613dd53d0 Author: remm <r...@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 | 31 ++++++++++++++++--------------- webapps/docs/changelog.xml | 3 +++ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml index ee2869a..7fe93e5 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>9.0.33</tomcat.version> + <tomcat.version>9.0.36</tomcat.version> </properties> <dependencies> @@ -80,7 +80,6 @@ </dependency> </dependencies> - <build> <plugins> <plugin> @@ -95,7 +94,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.2.1</version> + <version>3.2.4</version> <executions> <execution> <phase>package</phase> @@ -105,21 +104,23 @@ <configuration> <createDependencyReducedPom>false</createDependencyReducedPom> <transformers> - <transformer implementation="org.apache.openwebbeans.maven.shade.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> - <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 888f540..316b7b7 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -97,6 +97,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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org