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/09 21:45:13 UTC
[tomee] branch master updated (39c2539 -> 6897c6b)
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 39c2539 Remove this for the moment. We don't need it either
new 5ccc2bb Let OpenJPA go with Plume because it's required for CMP even though we want to use EclipseLink for JPA
new 87eead1 Make sure generated BOM files use the right version
new 6897c6b New generated versions after updates of versions and TomEE project
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
boms/tomee-microprofile/pom.xml | 119 +++++++++++-------
.../main/resources/tomee/conf/system.properties | 15 ---
.../src/main/resources/tomee/conf/tomee.xml | 16 ---
boms/tomee-plume/pom.xml | 131 ++++++++++++--------
.../main/resources/tomee/conf/system.properties | 16 ---
.../src/main/resources/tomee/conf/tomee.xml | 16 ---
boms/tomee-plus/pom.xml | 135 +++++++++++++--------
.../main/resources/tomee/conf/system.properties | 15 ---
.../src/main/resources/tomee/conf/tomee.xml | 16 ---
boms/tomee-webprofile/pom.xml | 84 ++++++++-----
.../main/resources/tomee/conf/system.properties | 16 ---
.../src/main/resources/tomee/conf/tomee.xml | 16 ---
tomee/tomee-bootstrap/pom.xml | 8 ++
.../src/test/resources/pom-template.xml | 2 +-
tomee/tomee-plume-webapp/pom.xml | 4 +-
tomee/tomee-plume-webapp/src/main/assembly/war.xml | 2 -
16 files changed, 305 insertions(+), 306 deletions(-)
[tomee] 02/03: Make sure generated BOM files use the right version
Posted by jl...@apache.org.
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
commit 87eead16728c52326282e77984cc0679d971fb1a
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Wed Dec 9 22:43:02 2020 +0100
Make sure generated BOM files use the right version
---
tomee/tomee-bootstrap/pom.xml | 8 ++++++++
tomee/tomee-bootstrap/src/test/resources/pom-template.xml | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/tomee/tomee-bootstrap/pom.xml b/tomee/tomee-bootstrap/pom.xml
index 650725d..075ab9d 100644
--- a/tomee/tomee-bootstrap/pom.xml
+++ b/tomee/tomee-bootstrap/pom.xml
@@ -36,6 +36,14 @@
<tomee.build.name>${project.groupId}.tomee.catalina</tomee.build.name>
</properties>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/tomee/tomee-bootstrap/src/test/resources/pom-template.xml b/tomee/tomee-bootstrap/src/test/resources/pom-template.xml
index d357b9f..0560f01 100644
--- a/tomee/tomee-bootstrap/src/test/resources/pom-template.xml
+++ b/tomee/tomee-bootstrap/src/test/resources/pom-template.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.tomee.bom</groupId>
<artifactId>boms</artifactId>
- <version>8.0.5-SNAPSHOT</version>
+ <version>${project.version}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[tomee] 01/03: Let OpenJPA go with Plume because it's required for
CMP even though we want to use EclipseLink for JPA
Posted by jl...@apache.org.
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
commit 5ccc2bb2af4891168fe7a236caa737100bc7e587
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Wed Dec 9 22:42:42 2020 +0100
Let OpenJPA go with Plume because it's required for CMP even though we want to use EclipseLink for JPA
---
tomee/tomee-plume-webapp/pom.xml | 4 +---
tomee/tomee-plume-webapp/src/main/assembly/war.xml | 2 --
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 9f38768..fdf2e21 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -192,7 +192,7 @@
<build>
<plugins>
- <!-- Looks like the war still have myfaces or openjpa because of the overlay with tomee-webapp -->
+ <!-- Looks like the war still have myfaces because of the overlay with tomee-webapp -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
@@ -200,11 +200,9 @@
<configuration>
<dependentWarExcludes>
%regex[(WEB-INF/)?lib/(tomee-)?myfaces(-api|-impl)?-.*.jar],
- %regex[(WEB-INF/)?lib/openjpa-.*.jar]
</dependentWarExcludes>
<packagingExcludes>
%regex[(WEB-INF/)?lib/(tomee-)?myfaces(-api|-impl)?-.*.jar],
- %regex[(WEB-INF/)?lib/openjpa-.*.jar]
</packagingExcludes>
</configuration>
</plugin>
diff --git a/tomee/tomee-plume-webapp/src/main/assembly/war.xml b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
index 60f5f82..9ecfa25 100644
--- a/tomee/tomee-plume-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
@@ -72,7 +72,6 @@
</includes>
<excludes>
<exclude>%regex[(WEB-INF/)?lib/(tomee-)?myfaces(-api|-impl)?-.*.jar]</exclude>
- <exclude>%regex[(WEB-INF/)?lib/openjpa-.*.jar]</exclude>
</excludes>
</fileSet>
</fileSets>
@@ -86,7 +85,6 @@
<!-- provided -->
<exclude>org.apache.tomcat:*</exclude>
<exclude>org.apache.myfaces:*</exclude>
- <exclude>org.apache.openjpa:*</exclude>
<!-- should be in a pom exclusion but it does perfectly the trick -->
<exclude>org.springframework:*</exclude>
[tomee] 03/03: New generated versions after updates of versions and
TomEE project
Posted by jl...@apache.org.
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
commit 6897c6bccc79163b81a7de85cebb4a3eec6405db
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Wed Dec 9 22:43:25 2020 +0100
New generated versions after updates of versions and TomEE project
---
boms/tomee-microprofile/pom.xml | 119 +++++++++++-------
.../main/resources/tomee/conf/system.properties | 15 ---
.../src/main/resources/tomee/conf/tomee.xml | 16 ---
boms/tomee-plume/pom.xml | 131 ++++++++++++--------
.../main/resources/tomee/conf/system.properties | 16 ---
.../src/main/resources/tomee/conf/tomee.xml | 16 ---
boms/tomee-plus/pom.xml | 135 +++++++++++++--------
.../main/resources/tomee/conf/system.properties | 15 ---
.../src/main/resources/tomee/conf/tomee.xml | 16 ---
boms/tomee-webprofile/pom.xml | 84 ++++++++-----
.../main/resources/tomee/conf/system.properties | 16 ---
.../src/main/resources/tomee/conf/tomee.xml | 16 ---
12 files changed, 295 insertions(+), 300 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 0a42985..e4b09f2 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -43,12 +43,12 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>tomee-bootstrap</artifactId>
- <version>${project.version}</version>
+ <version>8.0.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -169,7 +169,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
+ <version>1.15</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -279,7 +279,7 @@
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>bval-jsr</artifactId>
- <version>2.0.3</version>
+ <version>2.0.5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -290,7 +290,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.3</version>
+ <version>4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
+ <version>3.11</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -334,7 +334,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -356,7 +356,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -367,7 +367,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -378,7 +378,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -389,7 +389,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -400,7 +400,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,7 +411,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-mp-client</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +521,18 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-sse</artifactId>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -532,7 +543,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -543,7 +554,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security-saml</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -554,7 +565,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -565,7 +576,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -576,7 +587,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -587,7 +598,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -598,7 +609,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -719,7 +730,18 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -730,7 +752,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jaxrs</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -741,7 +763,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -752,7 +774,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -763,7 +785,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>2.3.6</version>
+ <version>2.3.7</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -774,7 +796,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>2.3.6</version>
+ <version>2.3.7</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -807,7 +829,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>3.1.0</version>
+ <version>3.1.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1170,7 +1192,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
- <version>8.0-4</version>
+ <version>8.0-5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1620,6 +1642,17 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm8-shaded</artifactId>
+ <version>4.17</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<version>4.14</version>
<exclusions>
@@ -2094,7 +2127,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.24</version>
+ <version>1.27</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/system.properties b/boms/tomee-microprofile/src/main/resources/tomee/conf/system.properties
index 71c4983..cdf5327 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/system.properties
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/system.properties
@@ -1,18 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
# all this properties are added at JVM system properties at startup
# here some default Apache TomEE system properties
# for more information please see http://tomee.apache.org/properties-listing.html
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/tomee.xml b/boms/tomee-microprofile/src/main/resources/tomee/conf/tomee.xml
index e714295..4f25bb2 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/tomee.xml
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/tomee.xml
@@ -1,20 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<tomee>
<!-- see http://tomee.apache.org/containers-and-resources.html -->
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 6922a18..cf28b36 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -43,12 +43,12 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>tomee-bootstrap</artifactId>
- <version>${project.version}</version>
+ <version>8.0.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -169,7 +169,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
+ <version>1.15</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -290,7 +290,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -301,7 +301,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jdbc-store</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -323,7 +323,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -334,7 +334,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-legacy</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -356,7 +356,7 @@
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>bval-jsr</artifactId>
- <version>2.0.3</version>
+ <version>2.0.5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -367,7 +367,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.3</version>
+ <version>4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -389,7 +389,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
+ <version>3.11</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,7 +411,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -543,7 +543,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-mp-client</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -554,7 +554,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -565,7 +565,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -576,7 +576,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -587,7 +587,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -598,7 +598,18 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-sse</artifactId>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -609,7 +620,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -620,7 +631,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security-saml</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -631,7 +642,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -642,7 +653,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -653,7 +664,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -664,7 +675,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -675,7 +686,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -718,8 +729,8 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.9.0-alpha-2</version>
+ <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <version>1.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -807,7 +818,18 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -818,7 +840,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jaxrs</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -829,7 +851,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -840,7 +862,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -873,7 +895,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>3.1.0</version>
+ <version>3.1.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1236,7 +1258,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
- <version>8.0-4</version>
+ <version>8.0-5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1686,6 +1708,17 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm8-shaded</artifactId>
+ <version>4.17</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<version>4.14</version>
<exclusions>
@@ -2204,7 +2237,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.24</version>
+ <version>1.27</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/system.properties b/boms/tomee-plume/src/main/resources/tomee/conf/system.properties
index adf2323..55daeaa 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/system.properties
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/system.properties
@@ -1,19 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
# all this properties are added at JVM system properties at startup
# here some default Apache TomEE system properties
# for more information please see http://tomee.apache.org/properties-listing.html
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/tomee.xml b/boms/tomee-plume/src/main/resources/tomee/conf/tomee.xml
index e714295..4f25bb2 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/tomee.xml
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/tomee.xml
@@ -1,20 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<tomee>
<!-- see http://tomee.apache.org/containers-and-resources.html -->
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 4435575..8270d48 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -43,12 +43,12 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>tomee-bootstrap</artifactId>
- <version>${project.version}</version>
+ <version>8.0.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -169,7 +169,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.14</version>
+ <version>1.15</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -290,7 +290,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -301,7 +301,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jdbc-store</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -323,7 +323,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -334,7 +334,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-legacy</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-ra</artifactId>
- <version>5.15.12</version>
+ <version>5.16.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -367,7 +367,7 @@
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>bval-jsr</artifactId>
- <version>2.0.3</version>
+ <version>2.0.5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -378,7 +378,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.3</version>
+ <version>4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
+ <version>3.11</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -543,7 +543,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -554,7 +554,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -565,7 +565,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -576,7 +576,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-mp-client</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -587,7 +587,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -598,7 +598,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -609,7 +609,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -620,7 +620,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -631,7 +631,18 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-sse</artifactId>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -642,7 +653,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -653,7 +664,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security-saml</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -664,7 +675,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -675,7 +686,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -686,7 +697,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -697,7 +708,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -708,7 +719,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -751,8 +762,8 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.9.0-alpha-2</version>
+ <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <version>1.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -840,7 +851,18 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -851,7 +873,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jaxrs</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -862,7 +884,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -873,7 +895,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -884,7 +906,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>2.3.6</version>
+ <version>2.3.7</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -895,7 +917,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>2.3.6</version>
+ <version>2.3.7</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -928,7 +950,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>3.1.0</version>
+ <version>3.1.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1291,7 +1313,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
- <version>8.0-4</version>
+ <version>8.0-5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1741,6 +1763,17 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm8-shaded</artifactId>
+ <version>4.17</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<version>4.14</version>
<exclusions>
@@ -2226,7 +2259,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.24</version>
+ <version>1.27</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/system.properties b/boms/tomee-plus/src/main/resources/tomee/conf/system.properties
index ab0fdfd..55daeaa 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/system.properties
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/system.properties
@@ -1,18 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
# all this properties are added at JVM system properties at startup
# here some default Apache TomEE system properties
# for more information please see http://tomee.apache.org/properties-listing.html
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/tomee.xml b/boms/tomee-plus/src/main/resources/tomee/conf/tomee.xml
index e714295..4f25bb2 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/tomee.xml
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/tomee.xml
@@ -1,20 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<tomee>
<!-- see http://tomee.apache.org/containers-and-resources.html -->
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index bef02a1..7ef38de 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -43,12 +43,12 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>tomee-bootstrap</artifactId>
- <version>${project.version}</version>
+ <version>8.0.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.10.0</version>
+ <version>2.12.0-rc1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>bval-jsr</artifactId>
- <version>2.0.3</version>
+ <version>2.0.5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -224,7 +224,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>4.3</version>
+ <version>4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -246,7 +246,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
+ <version>3.11</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -268,7 +268,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -279,7 +279,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -290,7 +290,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -301,7 +301,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -323,7 +323,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -334,7 +334,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -356,7 +356,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -367,7 +367,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -378,7 +378,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -389,7 +389,18 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-sse</artifactId>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -400,7 +411,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,7 +422,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.3.7</version>
+ <version>3.3.8</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -432,8 +443,8 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.9.0-alpha-2</version>
+ <artifactId>geronimo-javamail_1.6_mail</artifactId>
+ <version>1.0.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +455,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +466,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jaxrs</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +477,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-jsonb</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +488,7 @@
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-mapper</artifactId>
- <version>1.2.5</version>
+ <version>1.2.9-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +499,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>2.3.6</version>
+ <version>2.3.7</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -499,7 +510,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>2.3.6</version>
+ <version>2.3.7</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +532,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>3.1.0</version>
+ <version>3.1.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -873,7 +884,7 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
- <version>8.0-4</version>
+ <version>8.0-5</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1202,6 +1213,17 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm8-shaded</artifactId>
+ <version>4.17</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-bundleutils</artifactId>
<version>4.14</version>
<exclusions>
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/system.properties b/boms/tomee-webprofile/src/main/resources/tomee/conf/system.properties
index adf2323..55daeaa 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/system.properties
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/system.properties
@@ -1,19 +1,3 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
# all this properties are added at JVM system properties at startup
# here some default Apache TomEE system properties
# for more information please see http://tomee.apache.org/properties-listing.html
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/tomee.xml b/boms/tomee-webprofile/src/main/resources/tomee/conf/tomee.xml
index e714295..4f25bb2 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/tomee.xml
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/tomee.xml
@@ -1,20 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<tomee>
<!-- see http://tomee.apache.org/containers-and-resources.html -->