Fix sources attachment + MANIFSET overlaps

Acosix · Feb 21, 2025 · 725f768 · 725f768
1 parent fc83b6c
commit 725f768
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -28,4 +28,4 @@ jobs:
       - name: Change JDK version in toolchain to old notation
         run: sed -i 's/>17</>1.17</' ~/.m2/toolchains.xml
       - name: Build with Maven
-        run: mvn --batch-mode --update-snapshots package
+        run: mvn --batch-mode --update-snapshots clean package
diff --git a/README.md b/README.md
@@ -59,13 +59,13 @@ This project uses a Maven build using templates from the [Acosix Alfresco Maven]
 A simple build of this project can be executed by running:
 
 ```
-mvn install
+mvn clean install
 ```
 
 Since version 1.2.0-rc1 this project includes a sub-module that - when executed - starts up a local Alfresco + Keycloak stack for running user interaction tests and (in the future) integration tests. This sub-module is optionally enabled by using a Maven profile. A build starting such a stack without installing or publishing artifacts can be executed by running:
 
 ```
-mvn integration-test -P dockerTest
+mvn clean integration-test -P dockerTest
 ```
 
 or just running
@@ -74,7 +74,7 @@ or just running
 mvn integration-test
 ```
 
-in the `docker-test` sub-module directly. The Alfresco + Keycloak stack started that way will remain up and running until the `clean` target is executed on the project while the `tareget/classes/docker-compose.yaml` file is present in the sub-module. A run with the `clean` target will only stop the stack - in order to remove all persistent data and the images built for the stack, the `clean` target must be run with the additional profile `purge`.
+in the `docker-test` sub-module directly (this requires the artifacts of the other modules to be present in the local Maven repository, e.g. after a previous `mvn clean install`). The Alfresco + Keycloak stack started that way will remain up and running until the `clean` target is executed on the project while the `tareget/classes/docker-compose.yaml` file is present in the sub-module. A run with the `clean` target will only stop the stack - in order to remove all persistent data and the images built for the stack, the `clean` target must be run with the additional profile `purge`.
 
 Running the Alfresco + Keycloak stack with the `docker-test` sub-module requires the presence of a Toolchain that provides a path where the `docker` binary can be found. The locally installed Docker versions also needs to support Docker Compose v2.
 

diff --git a/repository/pom.xml b/repository/pom.xml
@@ -137,6 +137,13 @@
         <pluginManagement>
             <plugins>
 
+                <plugin>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <configuration>
+                        <classifier>sources-unshaded</classifier>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <artifactId>maven-shade-plugin</artifactId>
                     <executions>
@@ -176,6 +183,20 @@
                                         <addHeader>false</addHeader>
                                     </transformer>
                                 </transformers>
+                                <filters>
+                                    <filter>
+                                        <artifact>org.keycloak:*</artifact>
+                                        <excludes>
+                                            <exclude>META-INF/MANIFEST.MF</exclude>
+                                        </excludes>
+                                    </filter>
+                                    <filter>
+                                        <artifact>org.jboss.logging:*</artifact>
+                                        <excludes>
+                                            <exclude>META-INF/MANIFEST.MF</exclude>
+                                        </excludes>
+                                    </filter>
+                                </filters>
                             </configuration>
                         </execution>
                     </executions>

diff --git a/share/pom.xml b/share/pom.xml
@@ -143,6 +143,13 @@
         <pluginManagement>
             <plugins>
 
+                <plugin>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <configuration>
+                        <classifier>sources-unshaded</classifier>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <artifactId>maven-shade-plugin</artifactId>
                     <executions>