[java-parent-project] branch master updated: JPAR-139 - Resolve duplicate activation artifacts

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-parent-project.

View the commit online:
http://git.shibboleth.net/view/?p=java-parent-project.git;a=commit;h=f0eec7b6d19c261d5887cd217814c2ccf51a3648

The following commit(s) were added to refs/heads/master by this push:
       new  f0eec7b   JPAR-139 - Resolve duplicate activation artifacts
f0eec7b is described below

commit f0eec7b6d19c261d5887cd217814c2ccf51a3648
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Jan 23 14:49:26 2020 +0000

    JPAR-139 - Resolve duplicate activation artifacts
    
    https://issues.shibboleth.net/jira/browse/JPAR-139
    See also
    https://issues.shibboleth.net/jira/browse/IDP-1465
---
 pom.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 05446f4..4208a9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,8 @@
         <httpclient.version>4.5.11</httpclient.version>
         <httpclient.httpcore.version>4.4.13</httpclient.httpcore.version>
         <guava.version>28.2-jre</guava.version>
+        <jakarta.mail.version>1.6.4</jakarta.mail.version>
+        <jakarta.activation.version>1.2.1</jakarta.activation.version>
         <jetty.groupId>org.eclipse.jetty</jetty.groupId>
         <jetty.version>9.4.19.v20190610</jetty.version>
         <ldaptive.version>1.3.0-SNAPSHOT</ldaptive.version>
@@ -300,12 +302,6 @@
                 <version>2.10.5</version>
             </dependency>
             <dependency>
-                <!-- needed for logback SMTP appender -->
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
-                <version>1.4.7</version>
-            </dependency>
-            <dependency>
                 <groupId>javax.json</groupId>
                 <artifactId>javax.json-api</artifactId>
                 <version>1.0</version>
@@ -318,11 +314,6 @@
                 <version>2.3.1</version>
             </dependency>
             <dependency>
-                <groupId>javax.activation</groupId>
-                <artifactId>activation</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
                 <version>2.3.2</version>
@@ -429,6 +420,18 @@
 
             <!-- Provided dependencies -->
             <dependency>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>${jakarta.activation.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.mail</groupId>
+                <artifactId>jakarta.mail-api</artifactId>
+                <version>${jakarta.mail.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
                 <groupId>javax.servlet.jsp</groupId>
                 <artifactId>javax.servlet.jsp-api</artifactId>
                 <version>2.3.3</version>
@@ -471,18 +474,48 @@
                 <artifactId>logback-classic</artifactId>
                 <version>${logback.version}</version>
                 <scope>runtime</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-core</artifactId>
                 <version>${logback.version}</version>
                 <scope>runtime</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-access</artifactId>
                 <version>${logback.version}</version>
                 <scope>runtime</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.mail</groupId>
+                        <artifactId>mail</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.activation</groupId>
+                <artifactId>jakarta.activation</artifactId>
+                <version>${jakarta.activation.version}</version>
+                <scope>runtime</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.mail</groupId>
+                <artifactId>jakarta.mail</artifactId>
+                <version>${jakarta.mail.version}</version>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.glassfish</groupId>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.