sync develop branch after release 5.1.5 (#5415)

Author: hmottestad

pom.xml

@@ -750,7 +750,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.11.2</version>
+					<version>3.11.3</version>
 					<configuration>
 						<encoding>utf8</encoding>
 						<source>11</source>

scripts/release-notes.sh

@@ -90,6 +90,47 @@ DATETIME=$(date +"%Y-%m-%dT%H:%M:%S%z")
 
 echo "Datetime: ${DATETIME}"
 
+echo ""
+echo "Collecting assigned contributors for milestone #${GITHUB_MILESTONE}..."
+
+# Build a distinct, comma-separated list of assignees as Markdown links.
+# If a user has a GitHub 'name', use it; otherwise use the username.
+# Requires: gh (authenticated) and jq (already listed as dependencies above).
+ASSIGNEE_LOGINS=$(
+  gh api -H "Accept: application/vnd.github+json" \
+         repos/eclipse-rdf4j/rdf4j/issues \
+         --paginate \
+         -f milestone="${GITHUB_MILESTONE}" \
+         -f state=all \
+         -f per_page=100 \
+  | jq -r '.[].assignees[]?.login' \
+  | sort -u
+)
+
+CONTRIBUTORS_LIST=""
+if [[ -n "${ASSIGNEE_LOGINS}" ]]; then
+  while IFS= read -r login; do
+    [[ -z "${login}" ]] && continue
+    # Fetch the user's profile; prefer 'name', fallback to 'login'
+    USER_JSON=$(gh api -H "Accept: application/vnd.github+json" "/users/${login}" || echo '{}')
+    NAME=$(echo "${USER_JSON}" | jq -r '.name // empty' 2>/dev/null)
+    if [[ -z "${NAME}" || "${NAME}" == "null" ]]; then
+      DISPLAY="${login}"
+    else
+      DISPLAY="${NAME}"
+    fi
+    LINK="[${DISPLAY}](https://github.com/${login})"
+    if [[ -z "${CONTRIBUTORS_LIST}" ]]; then
+      CONTRIBUTORS_LIST="${LINK}"
+    else
+      CONTRIBUTORS_LIST="${CONTRIBUTORS_LIST}, ${LINK}"
+    fi
+  done <<< "${ASSIGNEE_LOGINS}"
+fi
+
+# Export so envsubst can replace ${LIST_OF_CONTRIBUTORS} in templates.
+export LIST_OF_CONTRIBUTORS="${CONTRIBUTORS_LIST}"
+
 echo ""
 echo "Using envsubst to generate content from templates."
 RELEASE_NOTES=$(cat templates/"${RELEASE_NOTES_TEMPLATE}" | envsubst)

scripts/release.sh

@@ -78,8 +78,8 @@ if  ! [[ $(git status --porcelain -u no  --branch) == "## main...origin/main" ]]
   exit 1;
 fi
 
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
 mvn clean;
 
 echo "Running git pull to make sure we are up to date"
@@ -107,17 +107,17 @@ if ! git push --dry-run > /dev/null 2>&1; then
     exit 1;
 fi
 
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
+mvn clean -q -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 -q -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
 mvn clean;
 git checkout main;
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
 mvn clean;
 
 
@@ -148,8 +148,8 @@ echo "MVN_VERSION_DEVELOP=\"${MVN_VERSION_DEVELOP}\"" >> temp/constants.txt
 cd ..
 
 echo "Running maven clean and install -DskipTests";
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
 mvn clean;
 mvn install -DskipTests;
 
@@ -185,14 +185,13 @@ git push -u origin "${BRANCH}"
 git push origin "${MVN_VERSION_RELEASE}"
 
 # Cleanup
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
 mvn clean
 
 # Set a new SNAPSHOT version
 echo "";
 echo "Setting the next snapshot version to: ${MVN_NEXT_SNAPSHOT_VERSION}"
-read -n 1 -srp "Press any key to continue (ctrl+c to cancel)"; printf "\n\n";
 
 
 # set maven version
@@ -230,17 +229,16 @@ git push --set-upstream origin "merge_main_into_develop_after_release_${MVN_VERS
 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 CI tests to finish."
-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
+mvn clean -q -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
 
 git checkout develop
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
 git checkout main
-mvn clean -Dmaven.clean.failOnError=false
-mvn clean -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
+mvn clean -q -Dmaven.clean.failOnError=false
 
 echo "Build javadocs"
 
@@ -259,7 +257,7 @@ mvn package -Passembly -DskipTests -Djapicmp.skip
 git checkout main
 git checkout -b "${RELEASE_NOTES_BRANCH}"
 
-tar --no-xattrs --exclude ".*" -cvzf "site/static/javadoc/${MVN_VERSION_RELEASE}.tgz" -C target/site/apidocs .
+tar --no-xattrs --exclude ".*" -cvzf "site/static/javadoc/${MVN_VERSION_RELEASE}.tgz" -C target/reports/apidocs .
 cp -f "site/static/javadoc/${MVN_VERSION_RELEASE}.tgz" "site/static/javadoc/latest.tgz"
 git add --all
 git commit -s -a -m "javadocs for ${MVN_VERSION_RELEASE}"

scripts/templates/patch-release-notes.md

@@ -8,4 +8,4 @@ For a complete overview, see [all issues fixed in ${MVN_VERSION_RELEASE}](https:
 
 ### Acknowledgements
 
-This release was made possible by contributions from ???
+This release was made possible by contributions from ${LIST_OF_CONTRIBUTORS}.