From 116d1d3477e47b9e31196d4a537e786d47849a58 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 2 Oct 2020 12:46:35 -0500
Subject: [PATCH 1/3] Updating versions across all modules that are relevant
 for the release-profile

---
 scripts/release-jetty.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/release-jetty.sh b/scripts/release-jetty.sh
index f0226f710d6..73781c3bafb 100755
--- a/scripts/release-jetty.sh
+++ b/scripts/release-jetty.sh
@@ -151,6 +151,7 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then
     # This is equivalent to 'mvn release:prepare'
     if proceedyn "Update project.versions for $VER_RELEASE? (Y/n)" y; then
         mvn org.codehaus.mojo:versions-maven-plugin:2.7:set \
+            -Peclipse-release \
             -DoldVersion="$VER_CURRENT" \
             -DnewVersion="$VER_RELEASE" \
             -DprocessAllModules=true 
@@ -180,6 +181,7 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then
         cat VERSION.txt.backup >> VERSION.txt
         echo "Update project.versions for $VER_NEXT"
         mvn org.codehaus.mojo:versions-maven-plugin:2.7:set \
+            -Peclipse-release \
             -DoldVersion="$VER_RELEASE" \
             -DnewVersion="$VER_NEXT" \
             -DprocessAllModules=true 

From 3cabe815e4736cb43bb20785534b658730b27454 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 2 Oct 2020 13:55:49 -0500
Subject: [PATCH 2/3] Avoid forked maven lifecycle due to package + deploy

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 scripts/release-jetty.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/release-jetty.sh b/scripts/release-jetty.sh
index 73781c3bafb..78e3f512ac0 100755
--- a/scripts/release-jetty.sh
+++ b/scripts/release-jetty.sh
@@ -168,8 +168,7 @@ if proceedyn "Are you sure you want to release using above? (y/N)" n; then
     # This is equivalent to 'mvn release:perform'
     if proceedyn "Build/Deploy from tag $TAG_NAME? (Y/n)" y; then
         git checkout $TAG_NAME
-        mvn clean package deploy \
-            -Peclipse-release $DEPLOY_OPTS
+        mvn clean deploy -Peclipse-release $DEPLOY_OPTS
         reportMavenTestFailures
         git checkout $GIT_BRANCH_ID
     fi

From 0fa7925ccaa93ad2af0c616a8317ee8b2600f43d Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 2 Oct 2020 15:00:54 -0500
Subject: [PATCH 3/3] Ensuring javadoc jars are generated and attached during
 deploy

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0f5db929691..0ced6361477 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1307,6 +1307,19 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadoc-jar</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <inherited>true</inherited>
             <groupId>org.apache.maven.plugins</groupId>