From 40c441eb965dc73df2b9174122e94dc44c652aab Mon Sep 17 00:00:00 2001
From: Tobias Schneider <Tobias.Schneider@Tobsch.org>
Date: Fri, 11 Aug 2023 09:04:45 +0200
Subject: [PATCH] Do not add test module on -Drelease

---
 .github/workflows/release.yml |  2 +-
 jollyday-tests/pom.xml        | 19 -------------------
 pom.xml                       | 20 +++++++++++++++++++-
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f002aa557..852268941 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Build with Maven
         run: >
           ./mvnw $MAVEN_CLI_OPTS
-          -Prelease
+          -Prelease -Drelease
           clean deploy
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
diff --git a/jollyday-tests/pom.xml b/jollyday-tests/pom.xml
index a9228f717..78c97f7bc 100644
--- a/jollyday-tests/pom.xml
+++ b/jollyday-tests/pom.xml
@@ -77,23 +77,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.13</version>
-            <configuration>
-              <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/pom.xml b/pom.xml
index 72c7f70c1..70300c41e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,6 @@
   <modules>
     <module>jollyday-core</module>
     <module>jollyday-jaxb</module>
-    <module>jollyday-tests</module>
   </modules>
 
   <developers>
@@ -338,5 +337,24 @@
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <id>no-release</id>
+      <!--
+      According to https://github.com/sonatype/nexus-maven-plugins/tree/master/staging/maven-plugin
+      skipNexusStagingDeployMojo may not be set to true in the last reactor module. Because we don't
+      want to deploy our last module, nor a dummy module, we simply omit the relevant modules when
+      a deployment is in progress.
+      -->
+      <activation>
+        <property>
+          <name>!release</name>
+        </property>
+      </activation>
+      <modules>
+        <module>jollyday-tests</module>
+      </modules>
+    </profile>
+
   </profiles>
 </project>