From f96bf72831ecec8c8610148c01fa89aa41184119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Banno-Cloutier?=
<leo.banno-cloutier@savoirfairelinux.com>
Date: Thu, 22 Jun 2023 15:36:15 -0400
Subject: [PATCH] pom.xml: properly exclude overlapping resources
Change-Id: I7172dc5ea50428d30d8bf505b59670155dfcab8a
---
ad-connector/pom.xml | 9 +++++++++
authentication-module/pom.xml | 4 ++++
jams-ca/pom.xml | 4 ++++
jams-launcher/pom.xml | 3 +++
jams-server/pom.xml | 27 +++++++++------------------
ldap-connector/pom.xml | 9 +++++++++
pom.xml | 18 ------------------
7 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/ad-connector/pom.xml b/ad-connector/pom.xml
index 3ce8e4be..28a73c42 100644
--- a/ad-connector/pom.xml
+++ b/ad-connector/pom.xml
@@ -54,9 +54,18 @@
<filter>
<artifact>*:*</artifact>
<excludes>
+ <exclude>module-info.class</exclude>
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/NOTICE</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
+ <exclude>OSGI-INF/bundle.info</exclude>
</excludes>
</filter>
</filters>
diff --git a/authentication-module/pom.xml b/authentication-module/pom.xml
index 8488c454..2bdd79b9 100644
--- a/authentication-module/pom.xml
+++ b/authentication-module/pom.xml
@@ -60,6 +60,10 @@
<filter>
<artifact>*:*</artifact>
<excludes>
+ <exclude>module-info.class</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
diff --git a/jams-ca/pom.xml b/jams-ca/pom.xml
index fcc292d6..277ba306 100644
--- a/jams-ca/pom.xml
+++ b/jams-ca/pom.xml
@@ -42,6 +42,10 @@
<filter>
<artifact>*:*</artifact>
<excludes>
+ <exclude>module-info.class</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
diff --git a/jams-launcher/pom.xml b/jams-launcher/pom.xml
index 80b71c72..71fcb214 100644
--- a/jams-launcher/pom.xml
+++ b/jams-launcher/pom.xml
@@ -38,6 +38,9 @@
<filter>
<artifact>*:*</artifact>
<excludes>
+ <exclude>module-info.class</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
diff --git a/jams-server/pom.xml b/jams-server/pom.xml
index b28f2bec..1d07adf2 100644
--- a/jams-server/pom.xml
+++ b/jams-server/pom.xml
@@ -175,6 +175,15 @@
<filter>
<artifact>*:*</artifact>
<excludes>
+ <exclude>module-info.class</exclude>
+ <!-- <exclude>META-INF.versions.9.module-info</exclude> -->
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/NOTICE</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
@@ -199,24 +208,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>exec-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- <version>${maven.exec.version}</version>
- <executions>
- <execution>
- <id>Build UI</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>bash</executable>
- <commandlineArgs>build-ui.sh</commandlineArgs>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/ldap-connector/pom.xml b/ldap-connector/pom.xml
index 70e6b36d..a1065916 100644
--- a/ldap-connector/pom.xml
+++ b/ldap-connector/pom.xml
@@ -67,6 +67,15 @@
<filter>
<artifact>*:*</artifact>
<excludes>
+ <exclude>module-info.class</exclude>
+ <exclude>META-INF/DEPENDENCIES</exclude>
+ <exclude>META-INF/LICENSE</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/MANIFEST.MF</exclude>
+ <exclude>META-INF/NOTICE</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ <exclude>META-INF/io.netty.versions.properties</exclude>
+ <exclude>META-INF/services/javax.annotation.processing.Processor</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
diff --git a/pom.xml b/pom.xml
index 928c326c..9b7d6418 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,24 +152,6 @@
</filesets>
</configuration>
</plugin>
- <plugin>
- <artifactId>exec-maven-plugin</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- <version>${maven.exec.version}</version>
- <inherited>false</inherited>
- <executions>
- <execution><!-- Run our version calculation script -->
- <id>Build PDF Documentation</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>build-doc.sh</executable>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
--
GitLab