update release script

Author: hmottestad

scripts/release.sh

@@ -69,11 +69,11 @@ fi
 echo "Running git pull to make sure we are up to date"
 git pull
 
-# check that we are on main
-if  ! [[ $(git status --porcelain -u no  --branch) == "## main...origin/main" ]]; then
+# check that we are on rdf4j-4.3.x-backporting
+if  ! [[ $(git status --porcelain -u no  --branch) == "## rdf4j-4.3.x-backporting...origin/rdf4j-4.3.x-backporting" ]]; then
   echo""
-  echo "You need to be on main!";
-  echo "git checkout main";
+  echo "You need to be on rdf4j-4.3.x-backporting!";
+  echo "git checkout rdf4j-4.3.x-backporting";
   echo "";
   exit 1;
 fi
@@ -86,9 +86,9 @@ echo "Running git pull to make sure we are up to date"
 git pull
 
 # check that we are not ahead or behind
-if  ! [[ $(git status --porcelain -u no  --branch) == "## main...origin/main" ]]; then
+if  ! [[ $(git status --porcelain -u no  --branch) == "## rdf4j-4.3.x-backporting...origin/rdf4j-4.3.x-backporting" ]]; then
     echo "";
-    echo "There is something wrong with your git. It seems you are not up to date with main. Run git status";
+    echo "There is something wrong with your git. It seems you are not up to date with rdf4j-4.3.x-backporting. Run git status";
     exit 1;
 fi
 
@@ -110,15 +110,6 @@ fi
 mvn clean -Dmaven.clean.failOnError=false
 mvn clean -Dmaven.clean.failOnError=false
 mvn clean;
-git checkout develop;
-git pull;
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean;
-git checkout main;
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean;
 
 
 MVN_CURRENT_SNAPSHOT_VERSION=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml)
@@ -132,10 +123,6 @@ BRANCH="releases/${MVN_VERSION_RELEASE}"
 
 RELEASE_NOTES_BRANCH="${MVN_VERSION_RELEASE}-release-notes"
 
-git checkout develop
-MVN_VERSION_DEVELOP=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml)
-git checkout main;
-
 cd scripts
 rm -rf temp
 mkdir temp
@@ -144,7 +131,6 @@ echo "MVN_VERSION_RELEASE=\"${MVN_VERSION_RELEASE}\"" > temp/constants.txt
 echo "MVN_NEXT_SNAPSHOT_VERSION=\"${MVN_NEXT_SNAPSHOT_VERSION}\"" > temp/constants.txt
 echo "BRANCH=\"${BRANCH}\"" > temp/constants.txt
 echo "RELEASE_NOTES_BRANCH=\"${RELEASE_NOTES_BRANCH}\"" > temp/constants.txt
-echo "MVN_VERSION_DEVELOP=\"${MVN_VERSION_DEVELOP}\"" > temp/constants.txt
 cd ..
 
 echo "Running maven clean and install -DskipTests";
@@ -222,35 +208,13 @@ echo "About to create PR"
 read -n 1 -srp "Press any key to continue (ctrl+c to cancel)"; printf "\n\n";
 echo "";
 
-echo "Creating pull request to merge release branch back into main"
-gh pr create --title "next development iteration: ${MVN_NEXT_SNAPSHOT_VERSION}" --body "Merge using merge commit rather than rebase"
-
-echo "";
-echo "Preparing a merge-branch to merge into develop"
-read -n 1 -srp "Press any key to continue (ctrl+c to cancel)"; printf "\n\n";
-
-
-
-git checkout "${BRANCH}"
-
-git checkout -b "merge_main_into_develop_after_release_${MVN_VERSION_RELEASE}"
-mvn versions:set -DnewVersion="${MVN_VERSION_DEVELOP}"
-mvn versions:commit
-git commit -s -a -m "set correct version"
-git push --set-upstream origin "merge_main_into_develop_after_release_${MVN_VERSION_RELEASE}"
-
-echo "Creating pull request to merge the merge-branch into develop"
-gh pr create -B develop --title "sync develop branch after release ${MVN_VERSION_RELEASE}" --body "Merge using merge commit rather than rebase"
-echo "It's ok to merge this PR later, so wait for the Jenkins tests to finish."
-read -n 1 -srp "Press any key to continue (ctrl+c to cancel)"; printf "\n\n";
+echo "Creating pull request to merge release branch back into rdf4j-4.3.x-backporting"
+gh pr create --title "next development iteration: ${MVN_NEXT_SNAPSHOT_VERSION}" --body "Merge using merge commit rather than rebase" --base rdf4j-4.3.x-backporting
 
 mvn clean -Dmaven.clean.failOnError=false
 mvn clean -Dmaven.clean.failOnError=false
 
-git checkout develop
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
-git checkout main
+git checkout rdf4j-4.3.x-backporting
 mvn clean -Dmaven.clean.failOnError=false
 mvn clean -Dmaven.clean.failOnError=false
 
@@ -269,7 +233,7 @@ set -e
 mvn package -Passembly -DskipTests
 
 
-git checkout main
+git checkout rdf4j-4.3.x-backporting
 git checkout -b "${RELEASE_NOTES_BRANCH}"
 
 tar -cvzf "site/static/javadoc/${MVN_VERSION_RELEASE}.tgz" -C target/site/apidocs .
@@ -281,7 +245,7 @@ gh pr create -B main --title "${RELEASE_NOTES_BRANCH}" --body "Javadocs, release
 
 echo "Javadocs are in git branch ${RELEASE_NOTES_BRANCH}"
 
-git checkout main
+git checkout rdf4j-4.3.x-backporting
 mvn clean
 
 cd scripts