This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/master by this push:
new da0484dff Upgrade mail api dependency to 2.1.0 (#52)
da0484dff is described below
commit da0484dffc5b711d73978b595495e27c9febf664
Author: jimma <e...@apache.org>
AuthorDate: Mon May 30 17:13:57 2022 +0800
Upgrade mail api dependency to 2.1.0 (#52)
---
parent/pom.xml | 37 ++++++++++++++++++++++++++++++++++++-
ws-security-common/pom.xml | 6 ++----
ws-security-stax/pom.xml | 2 --
3 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 81225cd05..f32433974 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -37,7 +37,9 @@
<cryptacular.version>1.2.4</cryptacular.version>
<ehcache.version>3.10.0</ehcache.version>
<hamcrest.version>2.2</hamcrest.version>
+ <jakarta.mail.api.version>2.1.0</jakarta.mail.api.version>
<jasypt.version>1.9.3</jasypt.version>
+ <jaxb-runtime.version>3.0.2</jaxb-runtime.version>
<junit.version>5.8.1</junit.version>
<kerby.version>2.0.2</kerby.version>
<neethi.version>3.1.1</neethi.version>
@@ -48,7 +50,6 @@
<xz.version>1.9</xz.version>
<xmlsec.version>3.0.0</xmlsec.version>
<xmlunit.version>2.8.2</xmlunit.version>
-
<!-- OSGi related properties -->
<wss4j.osgi.import />
<wss4j.osgi.symbolic.name>${project.groupId}.${project.artifactId}</wss4j.osgi.symbolic.name>
@@ -63,6 +64,12 @@
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -89,6 +96,11 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
+ <version>${jakarta.mail.api.version}</version>
+ </dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
@@ -113,6 +125,12 @@
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>${xmlunit.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
@@ -159,6 +177,23 @@
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb-runtime.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/ws-security-common/pom.xml b/ws-security-common/pom.xml
index ab7fd220f..346e50fb2 100644
--- a/ws-security-common/pom.xml
+++ b/ws-security-common/pom.xml
@@ -41,7 +41,6 @@
</DynamicImport-Package>
-->
<wss4j.module.name>org.apache.wss4j.common</wss4j.module.name>
- <jakarta.mail.version>2.0.0</jakarta.mail.version>
</properties>
<build>
@@ -93,9 +92,8 @@
<dependencies>
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
- <version>${jakarta.mail.version}</version>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/ws-security-stax/pom.xml b/ws-security-stax/pom.xml
index 08eb19cd5..c9e50ef49 100644
--- a/ws-security-stax/pom.xml
+++ b/ws-security-stax/pom.xml
@@ -32,7 +32,6 @@
<properties>
<wss4j.module.name>org.apache.wss4j.stax</wss4j.module.name>
<wss4j.osgi.import>javax.xml.bind*;version=!</wss4j.osgi.import>
- <jaxb-runtime.version>3.0.2</jaxb-runtime.version>
</properties>
<dependencies>
@@ -108,7 +107,6 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>${jaxb-runtime.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
