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 3c1059e Make package versions derive from the upstream projects
versions used
3c1059e is described below
commit 3c1059e56dca2b24400c3f1c921406f800dee5dd
Author: remm <r...@apache.org>
AuthorDate: Sun Jun 30 23:47:01 2019 +0200
Make package versions derive from the upstream projects versions used
---
modules/cxf/pom.xml | 14 +++++++-------
modules/owb/pom.xml | 10 +++++-----
webapps/docs/cdi.xml | 6 ++++--
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index d64ca45..b6f5148 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -28,11 +28,11 @@
<artifactId>tomcat-cxf</artifactId>
<name>Apache CXF for Apache Tomcat CDI</name>
<description>Apache CXF packaged for Apache Tomcat CDI</description>
- <version>1.0</version>
+ <!-- This is the Apache CXF version -->
+ <version>3.3.2</version>
<packaging>jar</packaging>
<properties>
- <cxf.version>3.3.2</cxf.version>
<geronimo-jcdi.version>1.0.1</geronimo-jcdi.version>
<javax.json-api.version>1.1.4</javax.json-api.version>
<javax.json.bind-api.version>1.0</javax.json.bind-api.version>
@@ -60,27 +60,27 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-integration-cdi</artifactId>
- <version>${cxf.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>${cxf.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>${cxf.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>${cxf.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Apache Johnzon -->
<dependency>
diff --git a/modules/owb/pom.xml b/modules/owb/pom.xml
index 9e63efe..55d25b9 100644
--- a/modules/owb/pom.xml
+++ b/modules/owb/pom.xml
@@ -28,14 +28,14 @@
<artifactId>tomcat-owb</artifactId>
<name>Apache Tomcat CDI 2 support</name>
<description>Apache Tomcat CDI 2 support using Apache
OpenWebBeans</description>
- <version>1.0</version>
+ <!-- This is the Apache OpenWebBeans version -->
+ <version>2.0.10</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>
- <owb.version>2.0.10</owb.version>
<tomcat.version>9.0.21</tomcat.version>
</properties>
@@ -59,17 +59,17 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>${owb.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>${owb.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- <version>${owb.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Allows building integration code, temporarily located here -->
<dependency>
diff --git a/webapps/docs/cdi.xml b/webapps/docs/cdi.xml
index a812b4e..41da951 100644
--- a/webapps/docs/cdi.xml
+++ b/webapps/docs/cdi.xml
@@ -57,7 +57,8 @@
<source><![CDATA[cd $TOMCAT_SRC/modules/cdi
mvn clean && mvn package]]></source>
The resulting JAR at
- <code>target/tomcat-cdi-1.0.jar</code>
+ <code>target/tomcat-owb-x.y.z.jar</code> (where x.y.z depends on the
+ Apache OpenWebBeans version used during the build)
should then be placed into the <code>lib</code> folder of the Tomcat
installation.<br/>
CDI support can then be enabled for all webapps in the container by adding
@@ -90,7 +91,8 @@ mvn clean && mvn package]]></source>
<source><![CDATA[cd $TOMCAT_SRC/modules/cxf
mvn clean && mvn package]]></source>
The resulting JAR at
- <code>target/tomcat-cxf-1.0.jar</code>
+ <code>target/tomcat-cxf-x.y.z.jar</code> (where x.y.z depends on the
+ Apache CXF version used during the build)
should then be placed into the <code>/WEB-INF/lib</code> folder of the
desired web application.
</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
