You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/12/15 20:12:57 UTC
[tomee] branch master updated: Clean up johnzon dependencies and
new boms
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new c494e04 Clean up johnzon dependencies and new boms
c494e04 is described below
commit c494e04c5ba07fad547f0350fc4cd3e9a70a14e1
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Tue Dec 15 21:12:39 2020 +0100
Clean up johnzon dependencies and new boms
---
boms/tomee-microprofile/pom.xml | 38 ++++++++++++++---------------
boms/tomee-plume/pom.xml | 38 ++++++++++++++---------------
boms/tomee-plus/pom.xml | 38 ++++++++++++++---------------
boms/tomee-webprofile/pom.xml | 41 ++++++++++++++++++++------------
mp-jwt/pom.xml | 1 -
pom.xml | 27 +++++++++++++++++++++
server/openejb-cxf-rs/pom.xml | 2 --
tck/microprofile-tck/jwt/pom.xml | 1 -
tck/microprofile-tck/rest-client/pom.xml | 1 -
tomee/tomee-webapp/pom.xml | 4 ++++
utils/livereload-tomee/pom.xml | 1 -
11 files changed, 114 insertions(+), 78 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 8c92003..1b08845 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -730,7 +730,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -740,8 +740,8 @@
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <artifactId>johnzon-jaxrs</artifactId>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -751,8 +751,8 @@
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jaxrs</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <artifactId>johnzon-jsonb</artifactId>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -762,8 +762,8 @@
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonb</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <artifactId>johnzon-jsonp-strict</artifactId>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -774,7 +774,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -937,17 +937,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>taglibs-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-api</artifactId>
<version>${tomcat.version}</version>
@@ -1400,6 +1389,17 @@
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
+ <artifactId>taglibs-shade</artifactId>
+ <version>8.0.6-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
<artifactId>tomee-catalina</artifactId>
<version>${project.version}</version>
<exclusions>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index d177ead..e41e867 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -818,7 +818,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -828,8 +828,8 @@
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <artifactId>johnzon-jaxrs</artifactId>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -839,8 +839,8 @@
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jaxrs</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <artifactId>johnzon-jsonb</artifactId>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -850,8 +850,8 @@
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonb</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <artifactId>johnzon-jsonp-strict</artifactId>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -862,7 +862,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1003,17 +1003,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>taglibs-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-api</artifactId>
<version>${tomcat.version}</version>
@@ -1477,6 +1466,17 @@
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
+ <artifactId>taglibs-shade</artifactId>
+ <version>8.0.6-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
<artifactId>tomee-catalina</artifactId>
<version>${project.version}</version>
<exclusions>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 76b091a..cfa2f47 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -851,7 +851,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -861,8 +861,8 @@
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <artifactId>johnzon-jaxrs</artifactId>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -872,8 +872,8 @@
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jaxrs</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <artifactId>johnzon-jsonb</artifactId>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -883,8 +883,8 @@
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-jsonb</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <artifactId>johnzon-jsonp-strict</artifactId>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -895,7 +895,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1058,17 +1058,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>taglibs-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-api</artifactId>
<version>${tomcat.version}</version>
@@ -1521,6 +1510,17 @@
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
+ <artifactId>taglibs-shade</artifactId>
+ <version>8.0.6-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
<artifactId>tomee-catalina</artifactId>
<version>${project.version}</version>
<exclusions>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index e32c429..c87656f 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jaxrs</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,18 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.9</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-jsonp-strict</artifactId>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +499,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>1.2.9-SNAPSHOT</version>
+ <version>1.2.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -629,17 +640,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>taglibs-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-api</artifactId>
<version>${tomcat.version}</version>
@@ -1048,6 +1048,17 @@
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
+ <artifactId>taglibs-shade</artifactId>
+ <version>8.0.6-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
<artifactId>tomee-catalina</artifactId>
<version>${project.version}</version>
<exclusions>
diff --git a/mp-jwt/pom.xml b/mp-jwt/pom.xml
index 85c7a64..ccea770 100644
--- a/mp-jwt/pom.xml
+++ b/mp-jwt/pom.xml
@@ -64,7 +64,6 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
- <version>${johnzon.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index b3a7df6..572883e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1816,6 +1816,33 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>${johnzon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-mapper</artifactId>
+ <version>${johnzon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-jaxrs</artifactId>
+ <version>${johnzon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-jsonb</artifactId>
+ <version>${johnzon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-jsonp-strict</artifactId>
+ <version>${johnzon.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index c61fe91..1b07b51 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -179,12 +179,10 @@
<dependency> <!-- JohnzonProvider, WadlDocumentMessageBodyWriter and JsrProvider -->
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jaxrs</artifactId>
- <version>${johnzon.version}</version>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
- <version>${johnzon.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
diff --git a/tck/microprofile-tck/jwt/pom.xml b/tck/microprofile-tck/jwt/pom.xml
index 7ef6607..e495cd6 100644
--- a/tck/microprofile-tck/jwt/pom.xml
+++ b/tck/microprofile-tck/jwt/pom.xml
@@ -78,7 +78,6 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>${johnzon.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tck/microprofile-tck/rest-client/pom.xml b/tck/microprofile-tck/rest-client/pom.xml
index d3e6c8c..1fa3d47 100644
--- a/tck/microprofile-tck/rest-client/pom.xml
+++ b/tck/microprofile-tck/rest-client/pom.xml
@@ -238,7 +238,6 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>${johnzon.version}</version>
<scope>test</scope>
</dependency>
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index c7de3f1..3ba74df 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -400,5 +400,9 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-jsonp-strict</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/utils/livereload-tomee/pom.xml b/utils/livereload-tomee/pom.xml
index 88de3d0..1a5e790 100644
--- a/utils/livereload-tomee/pom.xml
+++ b/utils/livereload-tomee/pom.xml
@@ -46,7 +46,6 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>${johnzon.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>