From f3ff6ac50a292272bc58ff5867852cd82ce160fd Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Fri, 13 Sep 2024 17:35:08 -0500
Subject: [PATCH] Fixes #3964 - Cleanup obsolete docs generation (#3965)

---
 .github/workflows/build-docs.yml |  3 +-
 .github/workflows/build.yml      | 33 ---------------
 docs/pom.xml                     |  9 ++--
 pom.xml                          | 72 ++++++++++++++++++--------------
 4 files changed, 47 insertions(+), 70 deletions(-)

diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
index a715ea6401..e62699a4f9 100644
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Build with Maven
       run: |
         cd docs
-        mvn -B -DskipTests -DskipITs -ntp site
+        mvn -B -DskipTests -DskipITs -ntp -P docs site
         cd ../
         rm -rf piranha-website/snapshot || true
         mkdir -p piranha-website/snapshot || true
@@ -65,7 +65,6 @@ jobs:
         cd maven/plugin
         mvn -B -DskipTests -DskipITs -ntp site
         cd ../..
-        rm -rf piranha-website/snapshot/maven-plugin || true
         rm -rf piranha-website/snapshot/maven/plugin || true
         mkdir -p piranha-website/snapshot/maven/plugin || true
         cp -R maven/plugin/target/site/* piranha-website/snapshot/maven/plugin/
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6d7efbee9d..51f3abc543 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -142,36 +142,3 @@ jobs:
       env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-  maven-plugin-documentation:
-    if: github.repository == 'piranhacloud/piranha' && github.event_name != 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout Piranha
-      uses: actions/checkout@v4
-    - name: Checkout Piranha Website
-      uses: actions/checkout@v4
-      with:
-        repository: piranhacloud/piranha-website
-        token: ${{ secrets.GIT_PASSWORD }}
-        path: piranha-website
-        ref: 'gh-pages'
-    - name: Setup Java
-      uses: actions/setup-java@v4
-      with:
-        distribution: 'temurin'
-        java-version: 21
-    - name: Build with Maven
-      run: |
-        mvn -B -DskipTests -DskipITs -ntp install
-        cd maven/plugin
-        mvn -B -DskipTests -DskipITs -ntp site
-        cd ../..
-        rm -rf piranha-website/maven/piranha-maven-plugin || true
-        mkdir -p piranha-website/maven/piranha-maven-plugin || true
-        cp -R maven/plugin/target/site/* piranha-website/maven/piranha-maven-plugin/
-        cd piranha-website
-        git config --global user.email "noreply@piranha.cloud"
-        git config --global user.name "Automated publish"
-        git add .
-        git commit -a -m "Publishing Maven plugin documentation" || true
-        git push
diff --git a/docs/pom.xml b/docs/pom.xml
index 862adef5a5..1862ca6334 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -2,8 +2,12 @@
 
 <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>cloud.piranha</groupId>
+        <artifactId>project</artifactId>
+        <version>24.10.0-SNAPSHOT</version>
+    </parent>
     <groupId>cloud.piranha.docs</groupId>
-    <version>24.10.0-SNAPSHOT</version>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
     <name>Piranha</name>
@@ -17,12 +21,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.20.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.3</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
@@ -34,7 +36,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.6.2</version>
                 <reportSets>
                     <reportSet/>
                 </reportSets>
diff --git a/pom.xml b/pom.xml
index e9ec6f2b2a..3c1b7b6384 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,6 @@
         <module>cli</module>
         <module>core</module>
         <module>dist</module>
-        <module>docs</module>
         <module>embedded</module>
         <module>extension</module>
         <module>feature</module>
@@ -171,8 +170,8 @@
         <maven-replacer-plugin.version>1.5.3</maven-replacer-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
-        <!-- Kept at 4.0.0-M3 because 4.0.0-M[4-16] do not work -->
-        <maven-site-plugin.version>4.0.0-M3</maven-site-plugin.version>
+        <!-- Kept at 3.20.0 because of Doxia requirement -->
+        <maven-site-plugin.version>3.20.0</maven-site-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
@@ -848,36 +847,16 @@
     </build>
 
     <profiles>
-        <!-- 
-
-        This profile is used when releasing to Maven central.
-
+        <!--
+        
+        This profile is used for generating our docs.
+        
         -->
         <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <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>
-                                    <gpgArguments>
-                                        <arg>--pinentry-mode</arg>
-                                        <arg>loopback</arg>
-                                    </gpgArguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
+            <id>docs</id>
+            <modules>
+                <module>docs</module>
+            </modules>
         </profile>
         <!-- 
 
@@ -985,6 +964,37 @@
                 <module>external</module>
             </modules>
         </profile>
+        <!-- 
+
+        This profile is used when releasing to Maven central.
+
+        -->
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <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>
+                                    <gpgArguments>
+                                        <arg>--pinentry-mode</arg>
+                                        <arg>loopback</arg>
+                                    </gpgArguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <!--
 
         This profile is used for running our integration tests.