You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2021/04/07 14:19:51 UTC
[tomee] branch master updated (a061c74 -> 40b4915)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from a061c74 [TOMEE-2995] Support constructor injection of JAX-RS Application
new 91240c9 TOMEE-2997 - Update OpenSAML to v3.4.6 (transient dependency of wss4j)
new 40b4915 TOMEE-2997 - Regenerate BOMs to reflect the OpenSAML Update
The 2 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 | 28 ++++++------
boms/tomee-plume/pom.xml | 28 ++++++------
boms/tomee-plus/pom.xml | 28 ++++++------
server/openejb-cxf/pom.xml | 95 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 137 insertions(+), 42 deletions(-)
[tomee] 02/02: TOMEE-2997 - Regenerate BOMs to reflect the OpenSAML
Update
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 40b4915ee755ef046c50e39cd1d2c2a7c390584a
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Wed Apr 7 16:19:10 2021 +0200
TOMEE-2997 - Regenerate BOMs to reflect the OpenSAML Update
---
boms/tomee-microprofile/pom.xml | 28 ++++++++++++++--------------
boms/tomee-plume/pom.xml | 28 ++++++++++++++--------------
boms/tomee-plus/pom.xml | 28 ++++++++++++++--------------
3 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 8602874..69e197f 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -246,7 +246,7 @@
<dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
- <version>7.3.0</version>
+ <version>7.5.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1929,7 +1929,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-core</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1940,7 +1940,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-profile-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1951,7 +1951,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1962,7 +1962,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1973,7 +1973,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-security-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1984,7 +1984,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-security-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1995,7 +1995,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-soap-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2006,7 +2006,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2017,7 +2017,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2028,7 +2028,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-saml-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2039,7 +2039,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-saml-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2050,7 +2050,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xmlsec-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2061,7 +2061,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xmlsec-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 0a527c4..4e058e0 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -246,7 +246,7 @@
<dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
- <version>7.3.0</version>
+ <version>7.5.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2039,7 +2039,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-core</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2050,7 +2050,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-profile-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2061,7 +2061,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2072,7 +2072,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2083,7 +2083,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-security-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2094,7 +2094,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-security-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2105,7 +2105,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-soap-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2116,7 +2116,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2127,7 +2127,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2138,7 +2138,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-saml-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2149,7 +2149,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-saml-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2160,7 +2160,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xmlsec-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2171,7 +2171,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xmlsec-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index aff0c99..3b30c2f 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -246,7 +246,7 @@
<dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
- <version>7.3.0</version>
+ <version>7.5.2</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2061,7 +2061,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-core</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2072,7 +2072,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-profile-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2083,7 +2083,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2094,7 +2094,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-saml-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2105,7 +2105,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-security-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2116,7 +2116,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-security-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2127,7 +2127,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-soap-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2138,7 +2138,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2149,7 +2149,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2160,7 +2160,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-saml-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2171,7 +2171,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xacml-saml-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2182,7 +2182,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xmlsec-api</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -2193,7 +2193,7 @@
<dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml-xmlsec-impl</artifactId>
- <version>3.3.1</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
[tomee] 01/02: TOMEE-2997 - Update OpenSAML to v3.4.6 (transient
dependency of wss4j)
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 91240c9631b9af395f289ee8d48d9c0bd8e3d8c4
Author: Richard Zowalla <13...@users.noreply.github.com>
AuthorDate: Wed Apr 7 15:31:50 2021 +0200
TOMEE-2997 - Update OpenSAML to v3.4.6 (transient dependency of wss4j)
---
server/openejb-cxf/pom.xml | 95 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 95 insertions(+)
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 93c6127..440c460 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -34,6 +34,8 @@
<properties>
<tomee.build.name>${project.groupId}.server.cxf</tomee.build.name>
<wss4j.version>2.3.1</wss4j.version>
+ <!-- XXX If wss4j is upgraded to >= 2.3.2 (unreleased yet), we can drop the overrides of opensaml -->
+ <opensaml.version>3.4.6</opensaml.version>
<openejb.osgi.import.pkg>
org.apache.xml.resolver*;resolution:=optional,
*
@@ -78,6 +80,10 @@
<artifactId>ehcache</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ <exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
@@ -103,6 +109,91 @@
</dependency>
<dependency>
<groupId>org.apache.wss4j</groupId>
+ <artifactId>wss4j-ws-security-common</artifactId>
+ <version>${wss4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-saml-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-xacml-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-xacml-saml-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- TOMEE-2997: Override opensaml from the previous artifact "wss4j-ws-security-common" to get >= v3.4.6-->
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-saml-impl</artifactId>
+ <version>${opensaml.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-soap-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-storage-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-messaging-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.cryptacular</groupId>
+ <artifactId>cryptacular</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-xacml-impl</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml-xacml-saml-impl</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-policy</artifactId>
<version>${wss4j.version}</version>
</dependency>
@@ -115,6 +206,10 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>