From aa44f72ba3295bb8ecc7eb230b882be5c975d27d Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Tue, 27 Nov 2018 23:21:01 +0100
Subject: [PATCH] copyright check exclusion, final cleanup (#111)

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 etc/config/copyright-exclude   |  1 -
 pom.xml                        | 23 +----------------------
 src/main/java/module-info.java |  4 ++--
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/etc/config/copyright-exclude b/etc/config/copyright-exclude
index 0649ebe..94f551d 100644
--- a/etc/config/copyright-exclude
+++ b/etc/config/copyright-exclude
@@ -21,7 +21,6 @@
 .zip
 /CONTRIBUTING.md
 /LICENSE.md
-/META-INF/services/
 /NOTICE.md
 /README
 /README.md
diff --git a/pom.xml b/pom.xml
index 1c0efd3..5d9e8a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,6 @@
         <findbugs.exclude>${project.basedir}/exclude.xml</findbugs.exclude>
         <findbugs.threshold>Low</findbugs.threshold>
         <upgrade.mods>${project.build.directory}/upgrade-mods</upgrade.mods>
-        <mods>${project.build.directory}/mods</mods>
         <proxyOpts/>
         <config.dir>${project.basedir}/etc/config</config.dir>
         <legal.doc.source>${project.basedir}</legal.doc.source>
@@ -152,11 +151,6 @@
                     <artifactId>maven-enforcer-plugin</artifactId>
                     <version>3.0.0-M2</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.6</version>
-                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -202,18 +196,6 @@
                             <includeArtifactIds>jakarta.xml.soap-api,jakarta.activation</includeArtifactIds>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-module-path</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${mods}</outputDirectory>
-                            <silent>false</silent>
-                            <includeArtifactIds>stax-ex,mimepull</includeArtifactIds>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -291,6 +273,7 @@
                         </goals>
                         <configuration>
                             <instructions>
+                                <Import-Package>javax.activation;version=!,javax.xml.bind.attachment;version=!,*</Import-Package>
                                 <Implementation-Build-Id>${project.version} - ${scmBranch}-${buildNumber}, ${timestamp}</Implementation-Build-Id>
                                 <_noee>true</_noee>
                             </instructions>
@@ -370,10 +353,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 231bc4d..2045cde 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -13,9 +13,9 @@
  */
 module com.sun.xml.messaging.saaj {
     requires org.jvnet.mimepull;
-    requires transitive java.xml.bind;
+    requires java.xml.bind;
     requires org.jvnet.staxex;
-    requires transitive java.xml.soap;
+    requires java.xml.soap;
     requires java.logging;
     requires java.desktop;
     requires java.xml;