From 5cf1072f513d9a89f75711386442ce397b8043a9 Mon Sep 17 00:00:00 2001
From: Guus Lieben <guus@xendox.com>
Date: Thu, 1 Aug 2024 20:21:19 +0200
Subject: [PATCH] #1110 Set up staging from root module, remove redundant 'all'
 profile

---
 .github/workflows/build.modules.yml      |  2 +-
 .github/workflows/check.codestyle.yml    |  2 +-
 .github/workflows/check.dependency.yml   |  4 +-
 .github/workflows/check.license.yml      |  2 +-
 .github/workflows/test.coverage.yml      |  4 +-
 hartshorn-assembly/parent/pom.parent.xml |  4 +-
 hartshorn-assembly/pom.staging.xml       | 86 ---------------------
 hartshorn-bom/pom.xml                    |  4 +-
 pom.xml                                  | 98 ++++++++++++++++--------
 9 files changed, 79 insertions(+), 127 deletions(-)
 delete mode 100644 hartshorn-assembly/pom.staging.xml

diff --git a/.github/workflows/build.modules.yml b/.github/workflows/build.modules.yml
index d929c61be9..e235eb460f 100644
--- a/.github/workflows/build.modules.yml
+++ b/.github/workflows/build.modules.yml
@@ -14,4 +14,4 @@ jobs:
           java-version: 21
           distribution: temurin
       - name: "Build (source JDK)"
-        run: mvn clean install -DskipTests -P ci,all
+        run: mvn clean install -DskipTests -P ci
diff --git a/.github/workflows/check.codestyle.yml b/.github/workflows/check.codestyle.yml
index c97af40677..a08fc439e6 100644
--- a/.github/workflows/check.codestyle.yml
+++ b/.github/workflows/check.codestyle.yml
@@ -15,4 +15,4 @@ jobs:
           java-version: 21
           distribution: temurin
       - name: Check code style
-        run: mvn clean install -DskipTests -P ci,all -Dcheckstyle.skip=false
+        run: mvn clean install -DskipTests -P ci -Dcheckstyle.skip=false
diff --git a/.github/workflows/check.dependency.yml b/.github/workflows/check.dependency.yml
index 17f20948de..7b9f490809 100644
--- a/.github/workflows/check.dependency.yml
+++ b/.github/workflows/check.dependency.yml
@@ -15,9 +15,9 @@ jobs:
           java-version: 21
           distribution: temurin
       - name: Prepare for dependency check
-        run: mvn clean install -DskipTests -P ci,all
+        run: mvn clean install -DskipTests -P ci
       - name: Analyze dependencies
-        run: mvn dependency-check:check -Dowasp.skip=false -DnvdApiKey=${{ secrets.NVD_API_KEY }} -P ci,all
+        run: mvn dependency-check:check -Dowasp.skip=false -DnvdApiKey=${{ secrets.NVD_API_KEY }} -P ci
       - name: Archive dependency reports
         uses: actions/upload-artifact@v2
         if: always()
diff --git a/.github/workflows/check.license.yml b/.github/workflows/check.license.yml
index 57147579d6..d7d8757156 100644
--- a/.github/workflows/check.license.yml
+++ b/.github/workflows/check.license.yml
@@ -18,4 +18,4 @@ jobs:
           java-version: 21
           distribution: temurin
       - name: Check license headers
-        run: mvn license:check -P ci,all
+        run: mvn license:check -P ci
diff --git a/.github/workflows/test.coverage.yml b/.github/workflows/test.coverage.yml
index a10bdc523e..e946cfa4b5 100644
--- a/.github/workflows/test.coverage.yml
+++ b/.github/workflows/test.coverage.yml
@@ -15,7 +15,7 @@ jobs:
           distribution: temurin
       - name: Run tests
         id: test
-        run: "mvn clean verify -P ci,all -Djacoco.haltOnFailure=true"
+        run: "mvn clean verify -P ci -Djacoco.haltOnFailure=true"
   testSourceCompat:
     needs: [coverage]
     strategy:
@@ -32,5 +32,5 @@ jobs:
           java-version: 21
           distribution: temurin
       - name: "Unit testing (OS: ${{ matrix.os }}, source JDK)"
-        run: "mvn clean verify -P ci,all -Djacoco.haltOnFailure=true"
+        run: "mvn clean verify -P ci -Djacoco.haltOnFailure=true"
         shell: bash
diff --git a/hartshorn-assembly/parent/pom.parent.xml b/hartshorn-assembly/parent/pom.parent.xml
index 75848580a0..6ebb79bd6d 100644
--- a/hartshorn-assembly/parent/pom.parent.xml
+++ b/hartshorn-assembly/parent/pom.parent.xml
@@ -5,9 +5,9 @@
 
     <parent>
         <groupId>org.dockbox.hartshorn</groupId>
-        <artifactId>hartshorn-staging</artifactId>
+        <artifactId>hartshorn</artifactId>
         <version>${revision}</version>
-        <relativePath>../pom.staging.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <name>Hartshorn parent</name>
diff --git a/hartshorn-assembly/pom.staging.xml b/hartshorn-assembly/pom.staging.xml
deleted file mode 100644
index 305b58e8fa..0000000000
--- a/hartshorn-assembly/pom.staging.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.dockbox.hartshorn</groupId>
-        <artifactId>hartshorn</artifactId>
-        <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>hartshorn-staging</artifactId>
-    <packaging>pom</packaging>
-    <version>${revision}</version>
-
-    <distributionManagement>
-        <repository>
-            <id>ossrh</id>
-            <name>OSSRH Staging</name>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-            <layout>default</layout>
-            <uniqueVersion>false</uniqueVersion>
-        </repository>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <profiles>
-        <profile>
-            <id>staging</id>
-            <activation>
-                <property>
-                    <name>staging</name>
-                    <value>true</value>
-                </property>
-            </activation>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <configuration>
-                            <!--
-                            Re-enable for staging.
-                            Originally disabled in parent POM as that should be excluded from deployments.
-                            -->
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                                <configuration>
-                                    <keyname>${gpg.keyname}</keyname>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/hartshorn-bom/pom.xml b/hartshorn-bom/pom.xml
index 9e6e763c41..f96b930168 100644
--- a/hartshorn-bom/pom.xml
+++ b/hartshorn-bom/pom.xml
@@ -5,9 +5,9 @@
 
     <parent>
         <groupId>org.dockbox.hartshorn</groupId>
-        <artifactId>hartshorn-staging</artifactId>
+        <artifactId>hartshorn</artifactId>
         <version>${revision}</version>
-        <relativePath>../hartshorn-assembly/pom.staging.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>Hartshorn common BOM</name>
diff --git a/pom.xml b/pom.xml
index e6023cc244..28ce5df25e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 
     <properties>
         <!-- Project version, inherited by all submodules -->
-        <revision>0.6.0</revision>
+        <revision>0.6.1</revision>
         <hartshorn.version>${revision}</hartshorn.version>
 
         <!-- Project properties, inherited by all submodules -->
@@ -90,32 +90,25 @@
         <plugin.staging.version>1.7.0</plugin.staging.version>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>all</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+    <modules>
+        <module>hartshorn-bom</module>
+        <module>hartshorn-assembly/parent/pom.parent.xml</module>
+        <module>hartshorn-util</module>
+        <module>hartshorn-spi</module>
+        <module>hartshorn-proxy</module>
+        <module>hartshorn-proxy-javassist</module>
+        <module>hartshorn-introspect</module>
+        <module>hartshorn-introspect-reflection</module>
+        <module>hartshorn-core</module>
+        <module>hartshorn-reporting</module>
+        <module>hartshorn-hsl</module>
+        <module>hartshorn-config</module>
+        <module>hartshorn-config-jackson</module>
+        <module>hartshorn-i18n</module>
+        <module>hartshorn-assembly/pom.assembly.xml</module>
+    </modules>
 
-            <modules>
-                <module>hartshorn-assembly/pom.staging.xml</module>
-                <module>hartshorn-bom</module>
-                <module>hartshorn-assembly/parent/pom.parent.xml</module>
-                <module>hartshorn-util</module>
-                <module>hartshorn-spi</module>
-                <module>hartshorn-proxy</module>
-                <module>hartshorn-proxy-javassist</module>
-                <module>hartshorn-introspect</module>
-                <module>hartshorn-introspect-reflection</module>
-                <module>hartshorn-core</module>
-                <module>hartshorn-reporting</module>
-                <module>hartshorn-hsl</module>
-                <module>hartshorn-config</module>
-                <module>hartshorn-config-jackson</module>
-                <module>hartshorn-i18n</module>
-                <module>hartshorn-assembly/pom.assembly.xml</module>
-            </modules>
-        </profile>
+    <profiles>
         <profile>
             <!-- CI profile, so we can opt-in to goals, instead of having to opt-out -->
             <id>ci</id>
@@ -129,9 +122,58 @@
         </profile>
         <profile>
             <id>staging</id>
+            <activation>
+                <property>
+                    <name>staging</name>
+                    <value>true</value>
+                </property>
+            </activation>
+
+            <distributionManagement>
+                <repository>
+                    <id>ossrh</id>
+                    <name>OSSRH Staging</name>
+                    <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                    <layout>default</layout>
+                    <uniqueVersion>false</uniqueVersion>
+                </repository>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+                </snapshotRepository>
+            </distributionManagement>
+
             <build>
                 <plugins>
                     <!-- Distribution staging -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <configuration>
+                                    <keyname>${gpg.keyname}</keyname>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -377,10 +419,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <!-- Skip root pom, re-enabled in hartshorn-assembly/pom.staging.xml -->
-                    <skip>true</skip>
-                </configuration>
             </plugin>
 
             <!-- Dependency version upgrades -->