[java-identity-provider] 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-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=6d8c92eefbb691873d9da28f48c5d8ef7f8ff078

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

commit 6d8c92eefbb691873d9da28f48c5d8ef7f8ff078
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Jan 23 14:50:28 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
---
 idp-parent/pom.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/idp-parent/pom.xml b/idp-parent/pom.xml
index 98d19c5..f102754 100644
--- a/idp-parent/pom.xml
+++ b/idp-parent/pom.xml
@@ -138,11 +138,6 @@
             <version>${java-support.version}</version>
         </dependency>
         <dependency>
-            <!-- needed for logback SMTP appender -->
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-        </dependency>
-        <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-messaging-api</artifactId>
         </dependency>
@@ -159,6 +154,13 @@
 
         <!-- Runtime Dependencies -->
 
+        <!-- Needed for logback SMTP appender. -->
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>jakarta.mail</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <!-- Test Dependencies -->
         <dependency>
             <groupId>${spring.groupId}</groupId>
@@ -274,6 +276,46 @@
                     </archive>
                 </configuration>
              </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>banned-dependencies</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <!--
+                                            Ban use of old variants of the Java EE
+                                            component implementations, and of the
+                                            corresponding API modules.
+                                        -->
+                                        <exclude>javax.activation:activation</exclude>
+                                        <exclude>javax.activation:activation-api</exclude>
+                                        <exclude>jakarta.activation:jakarta.activation-api</exclude>
+                                        <exclude>javax.mail:mail</exclude>
+                                        <exclude>com.sun.mail:javax.mail</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <!--
+                                            Allow a harmless case where the dependency will be
+                                            satisfied by another artifact.
+                                        -->
+                                        <include>jakarta.activation:jakarta.activation-api:*:jar:provided</include>
+                                    </includes>
+                                </bannedDependencies>
+                            </rules>
+                            <fail>true</fail>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
 
     </build>

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