diff --git a/scripts/milestone-release.sh b/scripts/milestone-release.sh
index 82a952d16b..cf28f29579 100755
--- a/scripts/milestone-release.sh
+++ b/scripts/milestone-release.sh
@@ -1,246 +1,769 @@
-#!/bin/bash
-
-cd ..
-
-echo ""
-echo "The release script requires several external command line tools:"
-echo " - git"
-echo " - mvn"
-echo " - gh (the GitHub CLI, see https://github.com/cli/cli)"
-echo " - xmllint (http://xmlsoft.org/xmllint.html)"
-
-echo ""
-echo "This script will stop if an unhandled error occurs";
-echo "Do not change any files in this directory while the script is running!"
-set -e -o pipefail
-
-
-read -rp "Start the release process (y/n)?" choice
-case "${choice}" in
-  y|Y ) echo "";;
-  n|N ) exit;;
-  * ) echo "unknown response, exiting"; exit;;
-esac
-
-# verify required tools are installed
-if ! command -v git &> /dev/null; then
-    echo "";
-    echo "git command not found!";
-    echo "";
-    exit 1;
+#!/usr/bin/env bash
+set -Eeuo pipefail
+
+SCRIPT_PATH="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/$(basename -- "${BASH_SOURCE[0]}")"
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+if REPO_ROOT="$(git rev-parse --show-toplevel 2>/dev/null)"; then
+  :
+elif REPO_ROOT="$(git -C "${SCRIPT_DIR}" rev-parse --show-toplevel 2>/dev/null)"; then
+  :
+else
+  REPO_ROOT="$(cd -- "${SCRIPT_DIR}/.." && pwd)"
 fi
-
-if ! command -v mvn &> /dev/null; then
-    echo "";
-    echo "mvn command not found!";
-    echo  "See https://maven.apache.org/";
-    echo "";
-    exit 1;
-fi
-
-if ! command -v gh &> /dev/null; then
-    echo "";
-    echo "gh command not found!";
-    echo  "See https://github.com/cli/cli";
-    echo "";
-    exit 1;
+if GIT_DIR="$(git -C "${REPO_ROOT}" rev-parse --git-dir 2>/dev/null)"; then
+  [[ "${GIT_DIR}" = /* ]] || GIT_DIR="${REPO_ROOT}/${GIT_DIR}"
+else
+  GIT_DIR="${REPO_ROOT}/.git"
 fi
+REPO_SCRIPT_DIR="${REPO_ROOT}/scripts"
+STATE_DIR="${GIT_DIR}/milestone-release-script"
+STATE_FILE="${STATE_DIR}/state.env"
+CONTEXT_FILE="${STATE_DIR}/milestone-release-context.env"
+LOG_FILE="${STATE_DIR}/milestone-release.log"
+
+mkdir -p "${STATE_DIR}"
+touch "${LOG_FILE}"
+exec > >(tee -a "${LOG_FILE}") 2>&1
+
+cd "${REPO_ROOT}"
+
+log() {
+  printf '\n==> %s\n' "$*"
+}
+
+die() {
+  printf 'ERROR: %s\n' "$*" >&2
+  exit 1
+}
+
+save_var() {
+  local name="$1"
+  local value="${2-}"
+  local tmp="${STATE_FILE}.tmp"
+
+  touch "${STATE_FILE}"
+  grep -v -E "^${name}=" "${STATE_FILE}" > "${tmp}" || true
+  printf '%s=%q\n' "${name}" "${value}" >> "${tmp}"
+  mv "${tmp}" "${STATE_FILE}"
+  printf -v "${name}" '%s' "${value}"
+  export "${name}"
+}
+
+load_state() {
+  if [[ -f "${STATE_FILE}" ]]; then
+    # shellcheck source=/dev/null
+    source "${STATE_FILE}"
+  fi
+}
+
+clear_state() {
+  rm -f "${STATE_FILE}" "${CONTEXT_FILE}"
+}
+
+print_resume_help() {
+  echo "State file: ${STATE_FILE}"
+  echo "Log file:   ${LOG_FILE}"
+  echo "Resume automatically: ${SCRIPT_PATH}"
+  echo "Resume from a specific step: ${SCRIPT_PATH} --from <step>"
+  echo "List available steps: ${SCRIPT_PATH} --list-steps"
+  echo "Start a fresh run: ${SCRIPT_PATH} --reset"
+}
+
+on_err() {
+  local rc=$?
+  echo
+  echo "Unhandled error while running step: ${CURRENT_STEP:-unknown}"
+  print_resume_help
+  exit "${rc}"
+}
+trap on_err ERR
+
+open_fix_shell() {
+  echo
+  echo "Opening a shell in ${REPO_ROOT}. Exit the shell when you want the script to retry."
+  (
+    cd "${REPO_ROOT}"
+    "${SHELL:-/bin/bash}"
+  )
+}
+
+handle_failure() {
+  local description="$1"
+  local rc="$2"
+  local choice
+
+  while true; do
+    echo
+    echo "The command failed in step '${CURRENT_STEP:-unknown}' with exit code ${rc}."
+    echo "Action: ${description}"
+    read -rp "Choose: [r]etry, [s]hell, [a]bort: " choice
+    case "${choice}" in
+      r|R)
+        return 0
+        ;;
+      s|S)
+        open_fix_shell
+        ;;
+      a|A)
+        print_resume_help
+        exit "${rc}"
+        ;;
+      *)
+        echo "Unknown choice: ${choice}"
+        ;;
+    esac
+  done
+}
+
+run_cmd() {
+  local description="$1"
+  shift
+  local rc
+
+  while true; do
+    log "${description}"
+    if "$@"; then
+      return 0
+    else
+      rc=$?
+      handle_failure "${description}" "${rc}"
+    fi
+  done
+}
+
+capture_cmd() {
+  local __resultvar="$1"
+  local description="$2"
+  shift 2
+  local output
+  local rc
+
+  while true; do
+    log "${description}"
+    if output=$("$@" 2>&1); then
+      printf '%s\n' "${output}"
+      printf -v "${__resultvar}" '%s' "${output}"
+      return 0
+    else
+      rc=$?
+      printf '%s\n' "${output}"
+      handle_failure "${description}" "${rc}"
+    fi
+  done
+}
+
+require_command() {
+  local command_name="$1"
+  local help_message="$2"
+  command -v "${command_name}" >/dev/null 2>&1 || die "${help_message}"
+}
+
+current_branch() {
+  git branch --show-current
+}
+
+ensure_on_branch() {
+  local expected="$1"
+  local actual
+  actual="$(current_branch)"
+  [[ "${actual}" == "${expected}" ]] || die "You need to be on '${expected}', but you are on '${actual:-detached HEAD}'."
+}
+
+ensure_on_main_or_develop() {
+  local actual
+  actual="$(current_branch)"
+  [[ "${actual}" == "main" || "${actual}" == "develop" ]] || die "You need to be on 'main' or 'develop', but you are on '${actual:-detached HEAD}'."
+}
+
+assert_clean_worktree() {
+  if [[ -n "$(git status --porcelain)" ]]; then
+    git status --short
+    die "There are uncommitted or untracked files. Clean them up before continuing."
+  fi
+}
 
-if ! command -v xmllint &> /dev/null; then
-    echo "";
-    echo "xmllint command not found!";
-    echo "See http://xmlsoft.org/xmllint.html"
-    echo "";
-    exit 1;
-fi
+assert_branch_in_sync() {
+  local branch="$1"
+  local counts
+  local ahead
+  local behind
 
-# check that there are no uncomitted or untracked files
-if  ! [[ $(git status --porcelain) == "" ]]; then
-    echo "";
-    echo "There are uncomitted or untracked files! Commit, delete or unstage files. Run git status for more info.";
-    exit 1;
-fi
+  counts="$(git rev-list --left-right --count "${branch}...origin/${branch}")"
+  ahead="${counts%%[[:space:]]*}"
+  behind="${counts##*[[:space:]]}"
 
-echo "Running git pull to make sure we are up to date"
-git pull
-
-# check that we are on main or develop
-if  ! [[ $(git status --porcelain -u no  --branch) == "## main...origin/main" ]]; then
-  if  ! [[ $(git status --porcelain -u no  --branch) == "## develop...origin/develop" ]]; then
-    echo""
-    echo "You need to be on main or develop!";
-    echo "";
-    exit 1;
+  if [[ "${ahead}" != "0" || "${behind}" != "0" ]]; then
+    die "Branch '${branch}' is not in sync with origin/${branch} (ahead=${ahead}, behind=${behind})."
   fi
-fi
-
-ORIGINAL_BRANCH=""
-if  [[ $(git status --porcelain -u no  --branch) == "## main...origin/main" ]]; then
-  ORIGINAL_BRANCH="main";
-fi
-if [[ $(git status --porcelain -u no  --branch) == "## develop...origin/develop" ]]; then
-  ORIGINAL_BRANCH="develop";
-fi
+}
 
-echo ""
-echo "You are on branch ${ORIGINAL_BRANCH}"
-read -rp "Do you want to use this branch for your milestone build (y/n)?" choice
-case "${choice}" in
-  y|Y ) echo "";;
-  n|N ) exit;;
-  * ) echo "unknown response, exiting"; exit;;
-esac
-
-echo "Running git pull to make sure we are up to date"
-git checkout develop
-git pull
-
-if  ! [[ $(git status --porcelain -u no  --branch) == "## develop...origin/develop" ]]; then
-  echo""
-  echo "There is something wrong with your git. It seems you are not up to date with develop. Run git status";
-  echo "";
-  exit 1;
-fi
+assert_push_access() {
+  if ! git push --dry-run >/dev/null 2>&1; then
+    die "Could not push to the repository. Check that you have sufficient access rights."
+  fi
+}
 
-git checkout main
-git pull
+local_branch_exists() {
+  git show-ref --verify --quiet "refs/heads/$1"
+}
 
-if  ! [[ $(git status --porcelain -u no  --branch) == "## main...origin/main" ]]; then
-  echo""
-  echo "There is something wrong with your git. It seems you are not up to date with main. Run git status";
-  echo "";
-  exit 1;
-fi
+local_tag_exists() {
+  git show-ref --verify --quiet "refs/tags/$1"
+}
 
-git checkout "${ORIGINAL_BRANCH}"
+remote_branch_exists() {
+  git ls-remote --exit-code --heads origin "refs/heads/$1" >/dev/null 2>&1
+}
 
+remote_tag_exists() {
+  git ls-remote --exit-code --tags origin "refs/tags/$1" >/dev/null 2>&1
+}
 
-# check that we have push access
-if ! git push --dry-run > /dev/null 2>&1; then
-    echo "";
-    echo "Could not push to the repository! Check that you have sufficient access rights.";
-    echo "";
-    exit 1;
-fi
+ensure_local_tag() {
+  local tag="$1"
+  if local_tag_exists "${tag}"; then
+    return 0
+  fi
+  if remote_tag_exists "${tag}"; then
+    run_cmd "Fetch tag ${tag}" git fetch origin "refs/tags/${tag}:refs/tags/${tag}"
+  fi
+}
 
+checkout_existing_or_create_from_ref() {
+  local branch="$1"
+  local start_point="${2:-}"
 
-echo "Running maven clean and install -DskipTests";
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean;
-mvn install -DskipTests;
+  if [[ "$(current_branch)" == "${branch}" ]]; then
+    return 0
+  fi
 
-MVN_CURRENT_SNAPSHOT_VERSION=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml)
+  if local_branch_exists "${branch}"; then
+    run_cmd "Checkout existing branch ${branch}" git checkout "${branch}"
+  else
+    if [[ -n "${start_point}" ]]; then
+      run_cmd "Create branch ${branch} from ${start_point}" git checkout -b "${branch}" "${start_point}"
+    else
+      run_cmd "Create branch ${branch}" git checkout -b "${branch}"
+    fi
+  fi
+}
+
+read_maven_version() {
+  xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml
+}
+
+write_context_file() {
+  cat > "${CONTEXT_FILE}" <<EOF_CTX
+MVN_CURRENT_SNAPSHOT_VERSION=${MVN_CURRENT_SNAPSHOT_VERSION}
+MVN_VERSION_RELEASE=${MVN_VERSION_RELEASE}
+BRANCH=${BRANCH}
+RELEASE_NOTES_BRANCH=${RELEASE_NOTES_BRANCH}
+SOURCE_BRANCH=${SOURCE_BRANCH}
+EOF_CTX
+}
+
+maven_clean_all() {
+  run_cmd "mvn clean (pass 1)" mvn clean -q -Dmaven.clean.failOnError=false
+  run_cmd "mvn clean (pass 2)" mvn clean -q -Dmaven.clean.failOnError=false
+  run_cmd "mvn clean" mvn clean
+}
+
+commit_tracked_if_needed() {
+  local message="$1"
+
+  if git diff --quiet && git diff --cached --quiet; then
+    echo "No tracked changes to commit for '${message}'."
+    return 0
+  fi
 
-echo "";
-echo "Your current maven snapshot version is: '${MVN_CURRENT_SNAPSHOT_VERSION}'"
-echo ""
-echo "What is the version you would like to publish?"
-read -rp "Version: " MVN_VERSION_RELEASE
-echo ""
-echo "Your maven release version will be: '${MVN_VERSION_RELEASE}'"
-read -n 1 -srp "Press any key to continue (ctrl+c to cancel)"; printf "\n\n";
+  run_cmd "Commit tracked changes: ${message}" git commit -s -a -m "${message}"
+}
 
-# set maven version
-mvn versions:set -DnewVersion="${MVN_VERSION_RELEASE}"
+stage_all_and_commit_if_needed() {
+  local message="$1"
+  run_cmd "Stage all changes for commit: ${message}" git add --all
+  if git diff --cached --quiet; then
+    echo "No staged changes to commit for '${message}'."
+    return 0
+  fi
+  run_cmd "Commit: ${message}" git commit -s -m "${message}"
+}
+
+create_pr_if_missing() {
+  local base="$1"
+  local head="$2"
+  local title="$3"
+  local body="$4"
+  local pr_number
+
+  capture_cmd pr_number "Check for an existing PR (${head} -> ${base})" \
+    gh pr list --state all --head "${head}" --base "${base}" --json number --jq '.[0].number // ""'
+
+  if [[ -n "${pr_number}" ]]; then
+    echo "PR already exists for ${head} -> ${base}: #${pr_number}"
+    return 0
+  fi
 
-# set the MVN_VERSION_RELEASE version again just to be on the safe side
-MVN_VERSION_RELEASE=$(xmllint --xpath "//*[local-name()='project']/*[local-name()='version']/text()" pom.xml)
+  run_cmd "Create PR (${head} -> ${base})" \
+    gh pr create --base "${base}" --head "${head}" --title "${title}" --body "${body}"
+}
+
+require_source_branch_context() {
+  [[ -n "${SOURCE_BRANCH:-}" ]] || die "Missing SOURCE_BRANCH. Resume from sync_current_branch or use --reset."
+}
+
+require_release_context() {
+  [[ -n "${MVN_CURRENT_SNAPSHOT_VERSION:-}" ]] || die "Missing MVN_CURRENT_SNAPSHOT_VERSION. Resume from prompt_release_version or use --reset."
+  [[ -n "${MVN_VERSION_RELEASE:-}" ]] || die "Missing MVN_VERSION_RELEASE. Resume from prompt_release_version or use --reset."
+  [[ -n "${BRANCH:-}" ]] || die "Missing BRANCH. Resume from prompt_release_version or use --reset."
+  [[ -n "${RELEASE_NOTES_BRANCH:-}" ]] || die "Missing RELEASE_NOTES_BRANCH. Resume from prompt_release_version or use --reset."
+  [[ -n "${SOURCE_BRANCH:-}" ]] || die "Missing SOURCE_BRANCH. Resume from sync_current_branch or use --reset."
+}
+
+sync_branch() {
+  local branch="$1"
+
+  run_cmd "Checkout ${branch}" git checkout "${branch}"
+  assert_clean_worktree
+  run_cmd "Fetch origin/${branch}" git fetch origin "${branch}"
+  run_cmd "Fast-forward ${branch}" git pull --ff-only origin "${branch}"
+  assert_branch_in_sync "${branch}"
+  assert_clean_worktree
+  maven_clean_all
+}
+
+step_confirm_start() {
+  echo
+  echo "The release script requires several external command line tools:"
+  echo " - git"
+  echo " - mvn"
+  echo " - gh (the GitHub CLI, see https://github.com/cli/cli)"
+  echo " - xmllint (http://xmlsoft.org/xmllint.html)"
+  echo
+  echo "This script checkpoints progress so you can rerun it after a failure."
+  echo "After the initial confirmation it will run unattended unless a step fails."
+  echo "If something fails, you can retry, open a shell to fix it, or abort and resume later."
+  print_resume_help
+  echo
+  echo "Do not change unrelated files in the repository while the script is running."
+
+  if [[ -n "${RESUME_FROM_STATE:-}" ]]; then
+    read -rp "Resume the milestone release process from step '${START_FROM}' (y/n)? " choice
+  else
+    read -rp "Start the milestone release process (y/n)? " choice
+  fi
 
-# find out a way to test that we set the correct version!
+  case "${choice}" in
+    y|Y)
+      echo
+      ;;
+    n|N)
+      exit 0
+      ;;
+    *)
+      die "Unknown response '${choice}'."
+      ;;
+  esac
+}
+
+step_verify_prereqs() {
+  require_command git "git command not found"
+  require_command mvn "mvn command not found. See https://maven.apache.org/"
+  require_command gh "gh command not found. See https://github.com/cli/cli"
+  require_command xmllint "xmllint command not found. See http://xmlsoft.org/xmllint.html"
+  [[ -f pom.xml ]] || die "pom.xml not found in ${REPO_ROOT}"
+  run_cmd "Check GitHub CLI authentication" gh auth status
+}
+
+step_sync_current_branch() {
+  assert_clean_worktree
+  ensure_on_main_or_develop
+  SOURCE_BRANCH="$(current_branch)"
+  save_var SOURCE_BRANCH "${SOURCE_BRANCH}"
+
+  echo
+  echo "You are on branch ${SOURCE_BRANCH}"
+  read -rp "Do you want to use this branch for your milestone build (y/n)? " choice
+  case "${choice}" in
+    y|Y)
+      echo
+      ;;
+    n|N)
+      exit 0
+      ;;
+    *)
+      die "Unknown response '${choice}'."
+      ;;
+  esac
+
+  sync_branch "${SOURCE_BRANCH}"
+  assert_push_access
+}
+
+step_sync_develop() {
+  require_source_branch_context
+  if [[ "${SOURCE_BRANCH}" == "develop" ]]; then
+    echo "Develop already synced via the source branch."
+    return 0
+  fi
 
-#Remove backup files. Finally, commit the version number changes:
-mvn versions:commit
+  sync_branch develop
+  run_cmd "Checkout ${SOURCE_BRANCH}" git checkout "${SOURCE_BRANCH}"
+}
 
+step_sync_main() {
+  require_source_branch_context
+  if [[ "${SOURCE_BRANCH}" == "main" ]]; then
+    echo "Main already synced via the source branch."
+    return 0
+  fi
 
-BRANCH="releases/${MVN_VERSION_RELEASE}"
+  sync_branch main
+  run_cmd "Checkout ${SOURCE_BRANCH}" git checkout "${SOURCE_BRANCH}"
+}
+
+step_prompt_release_version() {
+  require_source_branch_context
+  ensure_on_branch "${SOURCE_BRANCH}"
+
+  MVN_CURRENT_SNAPSHOT_VERSION="$(read_maven_version)"
+  echo
+  echo "Your current maven snapshot version is: '${MVN_CURRENT_SNAPSHOT_VERSION}'"
+  echo "What is the version you would like to publish?"
+  read -rp "Version: " MVN_VERSION_RELEASE
+
+  BRANCH="releases/${MVN_VERSION_RELEASE}"
+  RELEASE_NOTES_BRANCH="${MVN_VERSION_RELEASE}-release-notes"
+
+  save_var MVN_CURRENT_SNAPSHOT_VERSION "${MVN_CURRENT_SNAPSHOT_VERSION}"
+  save_var MVN_VERSION_RELEASE "${MVN_VERSION_RELEASE}"
+  save_var BRANCH "${BRANCH}"
+  save_var RELEASE_NOTES_BRANCH "${RELEASE_NOTES_BRANCH}"
+
+  write_context_file
+
+  echo
+  echo "Your maven release version will be: '${MVN_VERSION_RELEASE}'"
+  echo "Milestone context written to ${CONTEXT_FILE}"
+  echo "Continuing automatically. The script will only stop for input if a step fails."
+}
+
+step_build_source_snapshot() {
+  require_release_context
+  ensure_on_branch "${SOURCE_BRANCH}"
+  echo "Running maven clean and install -DskipTests"
+  maven_clean_all
+  run_cmd "mvn install -DskipTests" mvn install -DskipTests
+}
+
+step_set_release_version_on_worktree() {
+  require_release_context
+  ensure_on_branch "${SOURCE_BRANCH}"
+  run_cmd "Set maven version to ${MVN_VERSION_RELEASE}" mvn versions:set -DnewVersion="${MVN_VERSION_RELEASE}"
+  run_cmd "Commit maven version metadata" mvn versions:commit
+  MVN_VERSION_RELEASE="$(read_maven_version)"
+  save_var MVN_VERSION_RELEASE "${MVN_VERSION_RELEASE}"
+}
+
+step_create_or_checkout_release_branch() {
+  require_release_context
+  checkout_existing_or_create_from_ref "${BRANCH}" "${SOURCE_BRANCH}"
+}
+
+step_commit_release_version() {
+  require_release_context
+  ensure_on_branch "${BRANCH}"
+  commit_tracked_if_needed "release ${MVN_VERSION_RELEASE}"
+}
+
+step_tag_release_commit() {
+  require_release_context
+  ensure_on_branch "${BRANCH}"
+  if local_tag_exists "${MVN_VERSION_RELEASE}"; then
+    die "Tag ${MVN_VERSION_RELEASE} already exists locally."
+  fi
+  if remote_tag_exists "${MVN_VERSION_RELEASE}"; then
+    die "Tag ${MVN_VERSION_RELEASE} already exists on origin."
+  fi
+  run_cmd "Create tag ${MVN_VERSION_RELEASE}" git tag "${MVN_VERSION_RELEASE}"
+}
+
+step_push_release_branch() {
+  require_release_context
+  ensure_on_branch "${BRANCH}"
+  echo
+  echo "Pushing release branch to GitHub"
+  run_cmd "Push branch ${BRANCH}" git push -u origin "${BRANCH}"
+}
+
+step_push_release_tag() {
+  require_release_context
+  ensure_local_tag "${MVN_VERSION_RELEASE}"
+  if remote_tag_exists "${MVN_VERSION_RELEASE}"; then
+    echo "Tag ${MVN_VERSION_RELEASE} already exists on origin."
+    return 0
+  fi
+  run_cmd "Push tag ${MVN_VERSION_RELEASE}" git push origin "${MVN_VERSION_RELEASE}"
+}
+
+step_delete_release_branch() {
+  require_release_context
+  ensure_local_tag "${MVN_VERSION_RELEASE}"
+  run_cmd "Checkout tag ${MVN_VERSION_RELEASE}" git checkout "${MVN_VERSION_RELEASE}"
+
+  if local_branch_exists "${BRANCH}"; then
+    run_cmd "Delete local branch ${BRANCH}" git branch -d "${BRANCH}"
+  else
+    echo "Local branch ${BRANCH} already deleted."
+  fi
 
-# delete old release branch if it exits
-if git show-ref --verify --quiet "refs/heads/${BRANCH}"; then
-  git branch --delete --force "${BRANCH}" &>/dev/null
+  if remote_branch_exists "${BRANCH}"; then
+    run_cmd "Delete remote branch ${BRANCH}" git push origin --delete "${BRANCH}"
+  else
+    echo "Remote branch ${BRANCH} already deleted."
+  fi
+}
+
+step_prompt_for_jenkins_release() {
+  require_release_context
+  echo
+  echo "You need to tell Jenkins to start the release deployment processes, for SDK and maven artifacts"
+  echo "- SDK deployment: https://ci.eclipse.org/rdf4j/job/rdf4j-deploy-release-sdk/"
+  echo "- Maven deployment: https://ci.eclipse.org/rdf4j/job/rdf4j-deploy-release-ossrh/"
+  echo "Log in, then choose 'Build with Parameters' and type in ${MVN_VERSION_RELEASE}"
+  read -n 1 -srp "Press any key to continue (ctrl+c to cancel)"; printf "\n\n"
+}
+
+step_cleanup_before_javadocs() {
+  require_release_context
+  maven_clean_all
+  run_cmd "Checkout develop" git checkout develop
+  maven_clean_all
+  run_cmd "Checkout main" git checkout main
+  maven_clean_all
+}
+
+step_checkout_release_tag() {
+  require_release_context
+  ensure_local_tag "${MVN_VERSION_RELEASE}"
+  echo "Build javadocs"
+  run_cmd "Checkout tag ${MVN_VERSION_RELEASE}" git checkout "${MVN_VERSION_RELEASE}"
+}
+
+step_build_release_artifacts() {
+  require_release_context
+  run_cmd "mvn clean" mvn clean
+  run_cmd "mvn install -DskipTests -Djapicmp.skip" mvn install -DskipTests -Djapicmp.skip
+  run_cmd "mvn package -Passembly -DskipTests -Djapicmp.skip" mvn package -Passembly -DskipTests -Djapicmp.skip
+}
+
+step_build_javadoc_archive() {
+  require_release_context
+  run_cmd "Build javadoc archive" env JAVADOC_SKIP_INSTALL=true "${REPO_SCRIPT_DIR}/build-javadoc-archive.sh"
+}
+
+step_create_or_checkout_release_notes_branch() {
+  require_release_context
+  run_cmd "Checkout main" git checkout main
+  checkout_existing_or_create_from_ref "${RELEASE_NOTES_BRANCH}" main
+}
+
+step_commit_release_notes() {
+  require_release_context
+  ensure_on_branch "${RELEASE_NOTES_BRANCH}"
+  stage_all_and_commit_if_needed "javadocs for ${MVN_VERSION_RELEASE}"
+}
+
+step_push_release_notes_branch() {
+  require_release_context
+  ensure_on_branch "${RELEASE_NOTES_BRANCH}"
+  run_cmd "Push branch ${RELEASE_NOTES_BRANCH}" git push -u origin "${RELEASE_NOTES_BRANCH}"
+}
+
+step_create_release_notes_pr() {
+  require_release_context
+
+  create_pr_if_missing \
+    main \
+    "${RELEASE_NOTES_BRANCH}" \
+    "${RELEASE_NOTES_BRANCH}" \
+    "Javadocs, release-notes and news item for ${MVN_VERSION_RELEASE}"
+
+  echo "Javadocs are in git branch ${RELEASE_NOTES_BRANCH}"
+}
+
+step_final_cleanup() {
+  require_release_context
+  run_cmd "Checkout ${SOURCE_BRANCH}" git checkout "${SOURCE_BRANCH}"
+  maven_clean_all
+  save_var NEXT_STEP done
+  cd "${REPO_SCRIPT_DIR}"
+
+  echo
+  echo "DONE!"
+  echo
+  echo "You will now want to inform the community about the new milestone build!"
+  echo " - Check if all recently completed issues have the correct milestone: https://github.com/eclipse/rdf4j/issues?q=is%3Aissue+no%3Amilestone+-label%3A%22cannot+reproduce%22+-label%3A%22%F0%9F%94%A7+internal+task%22+-label%3Awontfix+-label%3Astale+-label%3Aduplicate+sort%3Aupdated-desc+is%3Aclosed"
+  echo " - For issues closed in the current milestone, those issues need to be tagged with the RDF4J milestone number (use GitHub labels M1, M2 or M3)"
+  echo "Remember that milestone builds are not releases!"
+  echo
+  echo "To generate the news item and release-notes you will want to run the following command:"
+  echo "./release-notes.sh ${MVN_VERSION_RELEASE} empty.md milestone-news-item.md ${RELEASE_NOTES_BRANCH}"
+  echo
+  echo "Release state and logs are stored in ${STATE_DIR}"
+}
+
+STEPS=(
+  confirm_start
+  verify_prereqs
+  sync_current_branch
+  sync_develop
+  sync_main
+  prompt_release_version
+  build_source_snapshot
+  set_release_version_on_worktree
+  create_or_checkout_release_branch
+  commit_release_version
+  tag_release_commit
+  push_release_branch
+  push_release_tag
+  delete_release_branch
+  prompt_for_jenkins_release
+  cleanup_before_javadocs
+  checkout_release_tag
+  build_release_artifacts
+  build_javadoc_archive
+  create_or_checkout_release_notes_branch
+  commit_release_notes
+  push_release_notes_branch
+  create_release_notes_pr
+  final_cleanup
+)
+
+is_valid_step() {
+  local candidate="$1"
+  local step
+  for step in "${STEPS[@]}"; do
+    [[ "${step}" == "${candidate}" ]] && return 0
+  done
+  return 1
+}
+
+list_steps() {
+  local step
+  printf 'Available steps:\n'
+  for step in "${STEPS[@]}"; do
+    printf ' - %s\n' "${step}"
+  done
+}
+
+usage() {
+  cat <<EOF_USAGE
+Usage: ${SCRIPT_PATH} [--reset] [--from <step>] [--list-steps]
+
+  --reset        Remove the saved checkpoint and start from the beginning.
+  --from <step>  Start from a specific step.
+  --list-steps   Print all step names.
+EOF_USAGE
+}
+
+RESET_STATE=0
+FROM_STEP=""
+LIST_ONLY=0
+
+while (( $# > 0 )); do
+  case "$1" in
+    --reset)
+      RESET_STATE=1
+      shift
+      ;;
+    --from)
+      [[ $# -ge 2 ]] || die "Missing value for --from"
+      FROM_STEP="$2"
+      shift 2
+      ;;
+    --list-steps)
+      LIST_ONLY=1
+      shift
+      ;;
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    *)
+      die "Unknown option: $1"
+      ;;
+  esac
+done
+
+if (( LIST_ONLY )); then
+  list_steps
+  exit 0
 fi
 
-# checkout branch for release, commit this maven version and tag commit
-git checkout -b "${BRANCH}"
-git commit -s -a -m "release ${MVN_VERSION_RELEASE}"
-git tag "${MVN_VERSION_RELEASE}"
-
-echo "";
-echo "Pushing release branch and tag to github, then deleting branch."
-read -n 1 -srp "Press any key to continue (ctrl+c to cancel)"; printf "\n\n";
-
-# push release branch and tag
-git push -u origin "${BRANCH}"
-git push origin "${MVN_VERSION_RELEASE}"
-
-# deleting the branch (local and remote) since we don't intend to merge the branch and it's enough that we leave the git tag
-git checkout "${MVN_VERSION_RELEASE}"
-git branch -d "${BRANCH}"
-git push origin --delete "${BRANCH}"
-
-echo "";
-echo "You need to tell Jenkins to start the release deployment processes, for SDK and maven artifacts"
-echo "- SDK deployment: https://ci.eclipse.org/rdf4j/job/rdf4j-deploy-release-sdk/ "
-echo "- Maven deployment: https://ci.eclipse.org/rdf4j/job/rdf4j-deploy-release-ossrh/ "
-echo "(if you are on linux or windows, remember to use CTRL+SHIFT+C to copy)."
-echo "Log in, then choose 'Build with Parameters' and type in ${MVN_VERSION_RELEASE}"
-read -n 1 -srp "Press any key to continue (ctrl+c to cancel)"; printf "\n\n";
-
-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
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
-
-
-echo "Build javadocs"
-read -n 1 -srp "Press any key to continue (ctrl+c to cancel)"; printf "\n\n";
-
-git checkout "${MVN_VERSION_RELEASE}"
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
-
-# temporarily disable exiting on error
-set +e
-mvn clean
-mvn install -DskipTests -Djapicmp.skip
-mvn package -Passembly -DskipTests -Djapicmp.skip
-set -e
-
-mvn package -Passembly -DskipTests -Djapicmp.skip
-
-JAVADOC_SKIP_INSTALL=true scripts/build-javadoc-archive.sh
+if (( RESET_STATE )); then
+  clear_state
+fi
 
-git checkout main
-RELEASE_NOTES_BRANCH="${MVN_VERSION_RELEASE}-release-notes"
-git checkout -b "${RELEASE_NOTES_BRANCH}"
+load_state
+
+if [[ -n "${FROM_STEP}" ]]; then
+  is_valid_step "${FROM_STEP}" || die "Unknown step '${FROM_STEP}'. Use --list-steps to see valid names."
+  START_FROM="${FROM_STEP}"
+  RESUME_FROM_STATE=""
+else
+  START_FROM="${NEXT_STEP:-confirm_start}"
+  if [[ -n "${NEXT_STEP:-}" && "${NEXT_STEP}" != "confirm_start" && "${NEXT_STEP}" != "done" ]]; then
+    RESUME_FROM_STATE=1
+  else
+    RESUME_FROM_STATE=""
+  fi
+fi
 
-git add --all
-git commit -s -a -m "javadocs for ${MVN_VERSION_RELEASE}"
-git push --set-upstream origin "${RELEASE_NOTES_BRANCH}"
-gh pr create -B main --title "${RELEASE_NOTES_BRANCH}" --body "Javadocs, release-notes and news item for ${MVN_VERSION_RELEASE}"
+if [[ "${START_FROM}" == "done" ]]; then
+  echo "The last recorded run already completed."
+  print_resume_help
+  exit 0
+fi
 
-echo "Javadocs are in git branch ${RELEASE_NOTES_BRANCH}"
+is_valid_step "${START_FROM}" || die "Unknown starting step '${START_FROM}'. Use --list-steps to see valid names."
 
-git checkout "${ORIGINAL_BRANCH}"
-mvn clean
+if [[ -n "${FROM_STEP}" ]]; then
+  echo "Starting from explicitly requested step: ${START_FROM}"
+elif [[ -n "${RESUME_FROM_STATE:-}" ]]; then
+  echo "Resuming from saved step: ${START_FROM}"
+  print_resume_help
+  echo
+fi
 
-cd scripts
+RUN_ENABLED=0
+run_step() {
+  local step="$1"
+  local next_step="$2"
+  local fn="step_${step}"
 
-echo ""
-echo "DONE!"
+  if [[ "${START_FROM}" == "${step}" ]]; then
+    RUN_ENABLED=1
+  fi
 
-echo ""
-echo "You will now want to inform the community about the new milestone build!"
-echo " - Check if all recently completed issues have the correct milestone: https://github.com/eclipse/rdf4j/issues?q=is%3Aissue+no%3Amilestone+-label%3A%22cannot+reproduce%22+-label%3A%22%F0%9F%94%A7+internal+task%22+-label%3Awontfix+-label%3Astale+-label%3Aduplicate+sort%3Aupdated-desc+is%3Aclosed"
-echo " - For issues closed in the current milestone, those issues need to be tagged with the RDF4J milestone number (use Github labels M1, M2 or M3)"
-echo "Remember that milestone builds are not releases!"
+  if (( RUN_ENABLED == 0 )); then
+    return 0
+  fi
 
-echo ""
-echo "To generate the news item and release-notes you will want to run the following command:"
-echo "./release-notes.sh ${MVN_VERSION_RELEASE} empty.md milestone-news-item.md ${RELEASE_NOTES_BRANCH}"
+  save_var CURRENT_STEP "${step}"
+  save_var NEXT_STEP "${step}"
+  log "Running step: ${step}"
+  "${fn}"
+  save_var LAST_COMPLETED_STEP "${step}"
+  save_var NEXT_STEP "${next_step}"
+}
+
+for (( i = 0; i < ${#STEPS[@]}; i++ )); do
+  current_step_name="${STEPS[$i]}"
+  if (( i + 1 < ${#STEPS[@]} )); then
+    next_step_name="${STEPS[$((i + 1))]}"
+  else
+    next_step_name="done"
+  fi
+  run_step "${current_step_name}" "${next_step_name}"
+done