From b2a7dcff6de8c56aae0070377d6dd34ee6920a0f Mon Sep 17 00:00:00 2001
From: Romain Grecourt <romain.grecourt@oracle.com>
Date: Wed, 20 Dec 2023 13:10:47 -0800
Subject: [PATCH] Post 4.0.2 release changes  (#8176)

* Update release for new docs/javadocs build

* Use generate-resources for the javadoc execution to make sure it's included in helidon-docs.jar

---------

Co-authored-by: Joe Di Pol <joe.dipol@oracle.com>
---
 docs/pom.xml           |  4 ++--
 etc/scripts/release.sh | 34 +---------------------------------
 pom.xml                |  1 +
 3 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 95a0a27078c..ec0fab96c49 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -82,7 +82,7 @@
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>default</id>
+                                <id>attach-javadocs</id>
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
@@ -95,7 +95,7 @@
                         <artifactId>helidon-javadoc-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <phase>package</phase>
+                                <phase>generate-resources</phase>
                                 <goals>
                                     <goal>javadoc</goal>
                                 </goals>
diff --git a/etc/scripts/release.sh b/etc/scripts/release.sh
index edb3c0905c7..23a4c73852b 100755
--- a/etc/scripts/release.sh
+++ b/etc/scripts/release.sh
@@ -174,35 +174,6 @@ update_version(){
     fi
 }
 
-release_site(){
-    if [ -n "${STAGING_REPO_ID}" ] ; then
-        readonly MAVEN_REPO_URL="https://oss.sonatype.org/service/local/staging/deployByRepositoryId/${STAGING_REPO_ID}/"
-    else
-        readonly MAVEN_REPO_URL="https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-    fi
-
-    # Generate site
-    mvn ${MAVEN_ARGS} site
-
-    # Sign site jar
-    gpg -ab ${WS_DIR}/target/helidon-project-${FULL_VERSION}-site.jar
-
-    # Deploy site.jar and signature file explicitly using deploy-file
-    mvn ${MAVEN_ARGS} deploy:deploy-file \
-        -Dfile="${WS_DIR}/target/helidon-project-${FULL_VERSION}-site.jar" \
-        -Dfiles="${WS_DIR}/target/helidon-project-${FULL_VERSION}-site.jar.asc" \
-        -Dclassifier="site" \
-        -Dclassifiers="site" \
-        -Dtypes="jar.asc" \
-        -DgeneratePom="false" \
-        -DgroupId="io.helidon" \
-        -DartifactId="helidon-project" \
-        -Dversion="${FULL_VERSION}" \
-        -Durl="${MAVEN_REPO_URL}" \
-        -DrepositoryId="ossrh" \
-        -DretryFailedDeploymentCount="10"
-}
-
 release_build(){
     # Do the release work in a branch
     local GIT_BRANCH="release/${FULL_VERSION}"
@@ -240,7 +211,7 @@ release_build(){
 
     # Perform deployment
     mvn ${MAVEN_ARGS} clean deploy \
-       -Prelease,archetypes \
+      -Prelease,archetypes,javadoc,docs \
       -DskipTests \
       -DstagingRepositoryId="${STAGING_REPO_ID}" \
       -DretryFailedDeploymentCount="10"
@@ -252,9 +223,6 @@ release_build(){
       done
     fi
 
-    # Release site (documentation, javadocs)
-    release_site
-
     # Close the nexus staging repository
     mvn ${MAVEN_ARGS} nexus-staging:rc-close \
       -DstagingRepositoryId="${STAGING_REPO_ID}" \
diff --git a/pom.xml b/pom.xml
index 9170ea8755c..9a3fefaadf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1293,6 +1293,7 @@
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <executions>
                             <execution>
+                                <id>attach-javadocs</id>
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>