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 2021/09/30 10:46:10 UTC
[tomee] branch master updated: Add some dependency updates and run
the tCK to see what it breaks or not
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 ca06c8c Add some dependency updates and run the tCK to see what it breaks or not
ca06c8c is described below
commit ca06c8cee2521e5fc89309cc35e6a37d11641ca1
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Thu Sep 30 12:45:21 2021 +0200
Add some dependency updates and run the tCK to see what it breaks or not
---
boms/tomee-microprofile/pom.xml | 72 ++++++++++----------
.../src/main/resources/tomee/conf/catalina.policy | 7 +-
.../main/resources/tomee/conf/catalina.properties | 1 +
.../src/main/resources/tomee/conf/server.xml | 2 +-
.../src/main/resources/tomee/conf/tomcat-users.xml | 24 +++++--
boms/tomee-plume-api/pom.xml | 2 +-
boms/tomee-plume/pom.xml | 76 +++++++++++-----------
.../src/main/resources/tomee/conf/catalina.policy | 7 +-
.../main/resources/tomee/conf/catalina.properties | 1 +
.../src/main/resources/tomee/conf/server.xml | 2 +-
.../src/main/resources/tomee/conf/tomcat-users.xml | 24 +++++--
boms/tomee-plus/pom.xml | 72 ++++++++++----------
.../src/main/resources/tomee/conf/catalina.policy | 7 +-
.../main/resources/tomee/conf/catalina.properties | 1 +
.../src/main/resources/tomee/conf/server.xml | 2 +-
.../src/main/resources/tomee/conf/tomcat-users.xml | 24 +++++--
boms/tomee-webprofile/pom.xml | 42 ++++++------
.../src/main/resources/tomee/conf/catalina.policy | 7 +-
.../main/resources/tomee/conf/catalina.properties | 1 +
.../src/main/resources/tomee/conf/server.xml | 2 +-
.../src/main/resources/tomee/conf/tomcat-users.xml | 24 +++++--
pom.xml | 29 +++++----
tomee/pom.xml | 4 +-
23 files changed, 253 insertions(+), 180 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 30d88bc..44bbf93 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -279,7 +279,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.3.0</version>
+ <version>2.9.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -301,7 +301,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.10.0</version>
+ <version>2.11.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -323,7 +323,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -334,7 +334,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -356,7 +356,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -367,7 +367,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -378,7 +378,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -389,7 +389,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -400,7 +400,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-mp-client</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,7 +411,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security-saml</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -763,7 +763,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -774,7 +774,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -785,7 +785,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -796,7 +796,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -807,7 +807,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -818,7 +818,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -829,7 +829,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -840,7 +840,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2116,7 +2116,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.27</version>
+ <version>1.28</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.policy b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.policy
index 2e6f8df..91b7c83 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.policy
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.policy
@@ -50,9 +50,14 @@ grant codeBase "file:${java.home}/lib/ext/-" {
permission java.security.AllPermission;
};
+// This permission is required when using javac to compile JSPs on Java 9
+// onwards
+//grant codeBase "jrt:/jdk.compiler" {
+// permission java.security.AllPermission;
+//};
-// ========== CATALINA CODE PERMISSIONS =======================================
+// ========== CATALINA CODE PERMISSIONS =======================================
// These permissions apply to the daemon code
grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
index cff2aa2..918f8f1 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
@@ -134,6 +134,7 @@ commons-lang*.jar,\
commons-logging*.jar,\
commons-math*.jar,\
commons-pool*.jar,\
+derby-*.jar,\
dom4j-*.jar,\
easymock-*.jar,\
ecj-*.jar,\
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
index 4aef996..00c17bb 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
@@ -26,7 +26,7 @@
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
- <!--APR library loader. Documentation at /docs/apr.html -->
+ <!-- APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
diff --git a/boms/tomee-microprofile/src/main/resources/tomee/conf/tomcat-users.xml b/boms/tomee-microprofile/src/main/resources/tomee/conf/tomcat-users.xml
index 4891abc..1a5b8ef 100644
--- a/boms/tomee-microprofile/src/main/resources/tomee/conf/tomcat-users.xml
+++ b/boms/tomee-microprofile/src/main/resources/tomee/conf/tomcat-users.xml
@@ -20,15 +20,27 @@
xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
version="1.0">
<!--
- NOTE: By default, no user is included in the "manager-gui" role required
+ By default, no user is included in the "manager-gui" role required
to operate the "/manager/html" web application. If you wish to use this app,
- you must define such a user - the username and password are arbitrary. It is
- strongly recommended that you do NOT use one of the users in the commented out
- section below since they are intended for use with the examples web
- application.
+ you must define such a user - the username and password are arbitrary.
+
+ Built-in Tomcat manager roles:
+ - manager-gui - allows access to the HTML GUI and the status pages
+ - manager-script - allows access to the HTTP API and the status pages
+ - manager-jmx - allows access to the JMX proxy and the status pages
+ - manager-status - allows access to the status pages only
+
+ The users below are wrapped in a comment and are therefore ignored. If you
+ wish to configure one or more of these users for use with the manager web
+ application, do not forget to remove the <!.. ..> that surrounds them. You
+ will also need to set the passwords to something appropriate.
+-->
+<!--
+ <user username="admin" password="<must-be-changed>" roles="manager-gui"/>
+ <user username="robot" password="<must-be-changed>" roles="manager-script"/>
-->
<!--
- NOTE: The sample user and role entries below are intended for use with the
+ The sample user and role entries below are intended for use with the
examples web application. They are wrapped in a comment and thus are ignored
when reading this file. If you wish to configure these users for use with the
examples web application, do not forget to remove the <!.. ..> that surrounds
diff --git a/boms/tomee-plume-api/pom.xml b/boms/tomee-plume-api/pom.xml
index 8455f90..7096f50 100644
--- a/boms/tomee-plume-api/pom.xml
+++ b/boms/tomee-plume-api/pom.xml
@@ -274,7 +274,7 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
- <version>2.3.14</version>
+ <version>2.3.15</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 65976d4..665613d 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.3.0</version>
+ <version>2.9.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -367,7 +367,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.10.0</version>
+ <version>2.11.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -378,7 +378,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -389,7 +389,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -400,7 +400,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,7 +411,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-mp-client</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</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.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -543,7 +543,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -554,7 +554,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security-saml</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -565,7 +565,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -576,7 +576,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -587,7 +587,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -598,7 +598,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -818,7 +818,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -829,7 +829,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -840,7 +840,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -851,7 +851,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -862,7 +862,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -873,7 +873,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -884,7 +884,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -895,7 +895,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1874,7 +1874,7 @@
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
- <version>2.7.7</version>
+ <version>2.7.9</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1929,7 +1929,7 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
- <version>2.3.14</version>
+ <version>2.3.15</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2215,7 +2215,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.27</version>
+ <version>1.28</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/catalina.policy b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.policy
index 2e6f8df..91b7c83 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/catalina.policy
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.policy
@@ -50,9 +50,14 @@ grant codeBase "file:${java.home}/lib/ext/-" {
permission java.security.AllPermission;
};
+// This permission is required when using javac to compile JSPs on Java 9
+// onwards
+//grant codeBase "jrt:/jdk.compiler" {
+// permission java.security.AllPermission;
+//};
-// ========== CATALINA CODE PERMISSIONS =======================================
+// ========== CATALINA CODE PERMISSIONS =======================================
// These permissions apply to the daemon code
grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
index cff2aa2..918f8f1 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
@@ -134,6 +134,7 @@ commons-lang*.jar,\
commons-logging*.jar,\
commons-math*.jar,\
commons-pool*.jar,\
+derby-*.jar,\
dom4j-*.jar,\
easymock-*.jar,\
ecj-*.jar,\
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
index 4aef996..00c17bb 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/server.xml
@@ -26,7 +26,7 @@
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
- <!--APR library loader. Documentation at /docs/apr.html -->
+ <!-- APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
diff --git a/boms/tomee-plume/src/main/resources/tomee/conf/tomcat-users.xml b/boms/tomee-plume/src/main/resources/tomee/conf/tomcat-users.xml
index 4891abc..1a5b8ef 100644
--- a/boms/tomee-plume/src/main/resources/tomee/conf/tomcat-users.xml
+++ b/boms/tomee-plume/src/main/resources/tomee/conf/tomcat-users.xml
@@ -20,15 +20,27 @@
xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
version="1.0">
<!--
- NOTE: By default, no user is included in the "manager-gui" role required
+ By default, no user is included in the "manager-gui" role required
to operate the "/manager/html" web application. If you wish to use this app,
- you must define such a user - the username and password are arbitrary. It is
- strongly recommended that you do NOT use one of the users in the commented out
- section below since they are intended for use with the examples web
- application.
+ you must define such a user - the username and password are arbitrary.
+
+ Built-in Tomcat manager roles:
+ - manager-gui - allows access to the HTML GUI and the status pages
+ - manager-script - allows access to the HTTP API and the status pages
+ - manager-jmx - allows access to the JMX proxy and the status pages
+ - manager-status - allows access to the status pages only
+
+ The users below are wrapped in a comment and are therefore ignored. If you
+ wish to configure one or more of these users for use with the manager web
+ application, do not forget to remove the <!.. ..> that surrounds them. You
+ will also need to set the passwords to something appropriate.
+-->
+<!--
+ <user username="admin" password="<must-be-changed>" roles="manager-gui"/>
+ <user username="robot" password="<must-be-changed>" roles="manager-script"/>
-->
<!--
- NOTE: The sample user and role entries below are intended for use with the
+ The sample user and role entries below are intended for use with the
examples web application. They are wrapped in a comment and thus are ignored
when reading this file. If you wish to configure these users for use with the
examples web application, do not forget to remove the <!.. ..> that surrounds
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index ca7b0f0..a844da9 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -70,7 +70,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.12.1</version>
+ <version>2.13.0-rc2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -367,7 +367,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.3.0</version>
+ <version>2.9.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -411,7 +411,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.10.0</version>
+ <version>2.11.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -422,7 +422,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -433,7 +433,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -444,7 +444,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-mp-client</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -543,7 +543,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -554,7 +554,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -565,7 +565,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -576,7 +576,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -587,7 +587,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -598,7 +598,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security-saml</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -609,7 +609,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -620,7 +620,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -631,7 +631,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -642,7 +642,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -884,7 +884,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -895,7 +895,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -906,7 +906,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -917,7 +917,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -928,7 +928,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -939,7 +939,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -950,7 +950,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -961,7 +961,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2248,7 +2248,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.27</version>
+ <version>1.28</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/catalina.policy b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.policy
index 2e6f8df..91b7c83 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/catalina.policy
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.policy
@@ -50,9 +50,14 @@ grant codeBase "file:${java.home}/lib/ext/-" {
permission java.security.AllPermission;
};
+// This permission is required when using javac to compile JSPs on Java 9
+// onwards
+//grant codeBase "jrt:/jdk.compiler" {
+// permission java.security.AllPermission;
+//};
-// ========== CATALINA CODE PERMISSIONS =======================================
+// ========== CATALINA CODE PERMISSIONS =======================================
// These permissions apply to the daemon code
grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
index cff2aa2..918f8f1 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
@@ -134,6 +134,7 @@ commons-lang*.jar,\
commons-logging*.jar,\
commons-math*.jar,\
commons-pool*.jar,\
+derby-*.jar,\
dom4j-*.jar,\
easymock-*.jar,\
ecj-*.jar,\
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
index 4aef996..00c17bb 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/server.xml
@@ -26,7 +26,7 @@
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
- <!--APR library loader. Documentation at /docs/apr.html -->
+ <!-- APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
diff --git a/boms/tomee-plus/src/main/resources/tomee/conf/tomcat-users.xml b/boms/tomee-plus/src/main/resources/tomee/conf/tomcat-users.xml
index 4891abc..1a5b8ef 100644
--- a/boms/tomee-plus/src/main/resources/tomee/conf/tomcat-users.xml
+++ b/boms/tomee-plus/src/main/resources/tomee/conf/tomcat-users.xml
@@ -20,15 +20,27 @@
xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
version="1.0">
<!--
- NOTE: By default, no user is included in the "manager-gui" role required
+ By default, no user is included in the "manager-gui" role required
to operate the "/manager/html" web application. If you wish to use this app,
- you must define such a user - the username and password are arbitrary. It is
- strongly recommended that you do NOT use one of the users in the commented out
- section below since they are intended for use with the examples web
- application.
+ you must define such a user - the username and password are arbitrary.
+
+ Built-in Tomcat manager roles:
+ - manager-gui - allows access to the HTML GUI and the status pages
+ - manager-script - allows access to the HTTP API and the status pages
+ - manager-jmx - allows access to the JMX proxy and the status pages
+ - manager-status - allows access to the status pages only
+
+ The users below are wrapped in a comment and are therefore ignored. If you
+ wish to configure one or more of these users for use with the manager web
+ application, do not forget to remove the <!.. ..> that surrounds them. You
+ will also need to set the passwords to something appropriate.
+-->
+<!--
+ <user username="admin" password="<must-be-changed>" roles="manager-gui"/>
+ <user username="robot" password="<must-be-changed>" roles="manager-script"/>
-->
<!--
- NOTE: The sample user and role entries below are intended for use with the
+ The sample user and role entries below are intended for use with the
examples web application. They are wrapped in a comment and thus are ignored
when reading this file. If you wish to configure these users for use with the
examples web application, do not forget to remove the <!.. ..> that surrounds
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index 3afd25c..e143bd6 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -180,7 +180,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.3.0</version>
+ <version>2.9.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -202,7 +202,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
- <version>2.10.0</version>
+ <version>2.11.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -224,7 +224,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -235,7 +235,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-search</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -246,7 +246,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -268,7 +268,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -279,7 +279,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-jose-jaxrs</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -290,7 +290,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -301,7 +301,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-sse</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -323,7 +323,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-security</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -455,7 +455,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -466,7 +466,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -477,7 +477,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-el22</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -499,7 +499,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -510,7 +510,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -521,7 +521,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -532,7 +532,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
- <version>2.0.22</version>
+ <version>2.0.23</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.policy b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.policy
index 2e6f8df..91b7c83 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.policy
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.policy
@@ -50,9 +50,14 @@ grant codeBase "file:${java.home}/lib/ext/-" {
permission java.security.AllPermission;
};
+// This permission is required when using javac to compile JSPs on Java 9
+// onwards
+//grant codeBase "jrt:/jdk.compiler" {
+// permission java.security.AllPermission;
+//};
-// ========== CATALINA CODE PERMISSIONS =======================================
+// ========== CATALINA CODE PERMISSIONS =======================================
// These permissions apply to the daemon code
grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
index cff2aa2..918f8f1 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
@@ -134,6 +134,7 @@ commons-lang*.jar,\
commons-logging*.jar,\
commons-math*.jar,\
commons-pool*.jar,\
+derby-*.jar,\
dom4j-*.jar,\
easymock-*.jar,\
ecj-*.jar,\
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
index 4aef996..00c17bb 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
@@ -26,7 +26,7 @@
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
- <!--APR library loader. Documentation at /docs/apr.html -->
+ <!-- APR library loader. Documentation at /docs/apr.html -->
<Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
<Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
diff --git a/boms/tomee-webprofile/src/main/resources/tomee/conf/tomcat-users.xml b/boms/tomee-webprofile/src/main/resources/tomee/conf/tomcat-users.xml
index 4891abc..1a5b8ef 100644
--- a/boms/tomee-webprofile/src/main/resources/tomee/conf/tomcat-users.xml
+++ b/boms/tomee-webprofile/src/main/resources/tomee/conf/tomcat-users.xml
@@ -20,15 +20,27 @@
xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
version="1.0">
<!--
- NOTE: By default, no user is included in the "manager-gui" role required
+ By default, no user is included in the "manager-gui" role required
to operate the "/manager/html" web application. If you wish to use this app,
- you must define such a user - the username and password are arbitrary. It is
- strongly recommended that you do NOT use one of the users in the commented out
- section below since they are intended for use with the examples web
- application.
+ you must define such a user - the username and password are arbitrary.
+
+ Built-in Tomcat manager roles:
+ - manager-gui - allows access to the HTML GUI and the status pages
+ - manager-script - allows access to the HTTP API and the status pages
+ - manager-jmx - allows access to the JMX proxy and the status pages
+ - manager-status - allows access to the status pages only
+
+ The users below are wrapped in a comment and are therefore ignored. If you
+ wish to configure one or more of these users for use with the manager web
+ application, do not forget to remove the <!.. ..> that surrounds them. You
+ will also need to set the passwords to something appropriate.
+-->
+<!--
+ <user username="admin" password="<must-be-changed>" roles="manager-gui"/>
+ <user username="robot" password="<must-be-changed>" roles="manager-script"/>
-->
<!--
- NOTE: The sample user and role entries below are intended for use with the
+ The sample user and role entries below are intended for use with the
examples web application. They are wrapped in a comment and thus are ignored
when reading this file. If you wish to configure these users for use with the
examples web application, do not forget to remove the <!.. ..> that surrounds
diff --git a/pom.xml b/pom.xml
index 3c035b3..fbbbff8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
<geronimo-javamail_1.6_mail.version>1.0.0</geronimo-javamail_1.6_mail.version>
<openjpa.version>3.2.0</openjpa.version>
- <openwebbeans.version>2.0.22</openwebbeans.version>
+ <openwebbeans.version>2.0.23</openwebbeans.version>
<jcs.version>2.1</jcs.version>
<johnzon.version>1.2.15-SNAPSHOT</johnzon.version>
<quartz-openejb-shade.version>2.2.4</quartz-openejb-shade.version>
@@ -148,10 +148,10 @@
<tomcat.version>9.0.53</tomcat.version>
- <cxf.version>3.4.3</cxf.version>
+ <cxf.version>3.4.4</cxf.version>
<ehcache.version>2.10.3</ehcache.version>
<!-- used by cxf for security (replay attack) -->
- <jetty.version>7.5.3.v20111011</jetty.version>
+ <jetty.version>7.6.9.v20130131</jetty.version>
<pax-url.version>1.3.5</pax-url.version>
<aether.version>1.13.1</aether.version>
<maven.version>3.0.5</maven.version>
@@ -180,27 +180,27 @@
'QuartzPersistenceForEJBTimersTest' is unable to obtain DB connection with
commons-dbcp.version > 2.3.0
-->
- <commons-dbcp.version>2.3.0</commons-dbcp.version>
- <commons-pool.version>2.10.0</commons-pool.version>
+ <commons-dbcp.version>2.9.0</commons-dbcp.version>
+ <commons-pool.version>2.11.1</commons-pool.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-codec.version>1.15</commons-codec.version>
<commons-fileupload.version>1.4</commons-fileupload.version>
<commons-discovery.version>0.5</commons-discovery.version>
<commons-lang3.version>3.11</commons-lang3.version>
- <commons-io.version>2.10.0</commons-io.version>
- <commons-net.version>3.7.2</commons-net.version>
+ <commons-io.version>2.11.0</commons-io.version>
+ <commons-net.version>3.8.0</commons-net.version>
<bval.version>2.0.5</bval.version>
<org.apache.activemq.version>5.16.3</org.apache.activemq.version>
<org.springframework.version>3.1.4.RELEASE</org.springframework.version>
<junit.version>4.13.2</junit.version>
- <junit.jupiter.version>5.8.0-RC1</junit.jupiter.version>
+ <junit.jupiter.version>5.8.1</junit.jupiter.version>
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>
<scannotation.version>1.0.2</scannotation.version>
<geronimo.connector.version>3.1.4</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
<myfaces.version>2.3.9</myfaces.version>
- <mojarra.version>2.3.14</mojarra.version>
+ <mojarra.version>2.3.15</mojarra.version>
<slf4j.version>1.7.21</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.0.1</log4j2.version>
@@ -212,11 +212,12 @@
'QuartzPersistenceForEJBTimersTest' cannot obtain a connection -> never timeouts
-->
<version.hsqldb>2.3.4</version.hsqldb>
- <version.axiom>1.2.20</version.axiom>
+ <version.axiom>1.3.0</version.axiom>
<version.xalan>2.7.2</version.xalan>
<version.hibernate>5.4.10.Final</version.hibernate>
- <version.eclipselink>2.7.7</version.eclipselink>
+ <version.eclipselink>2.7.9</version.eclipselink>
<version.groovy>2.4.12</version.groovy>
+ <version.ecj>4.6.1</version.ecj>
<!-- arquillian related -->
<version.arquillian.bom>1.1.13.Final</version.arquillian.bom>
@@ -244,8 +245,8 @@
<opentracing.api>0.31.0</opentracing.api>
<!-- Jackson required by OpenAPI Impl -->
- <jackson.version>2.12.1</jackson.version>
- <jackson.dataformat.version>2.12.1</jackson.dataformat.version>
+ <jackson.version>2.13.0-rc2</jackson.version>
+ <jackson.dataformat.version>2.13.0-rc2</jackson.dataformat.version>
<!-- Javadoc & Asciidoclet -->
<javadoc.version>3.0.1</javadoc.version>
@@ -1893,7 +1894,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.20</version>
+ <version>1.21</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/tomee/pom.xml b/tomee/pom.xml
index e57cc5b..e22bb26 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -219,12 +219,12 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>4.4</version>
+ <version>${version.ecj}</version>
</dependency>
<dependency>
<artifactId>commons-beanutils</artifactId>
<groupId>commons-beanutils</groupId>
- <version>1.8.3</version>
+ <version>${commons-beanutils.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>