Skip to content

Commit 84c2710

Browse files
authored
Merge main into develop (eclipse-rdf4j#5413)
2 parents 9122bcc + 50f78f2 commit 84c2710

File tree

6 files changed

+84
-32
lines changed

6 files changed

+84
-32
lines changed

scripts/release-notes.sh

Lines changed: 53 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ if ! [[ ${BRANCH} == "" ]]; then
2020
git pull
2121
fi
2222

23+
# Derive owner/repo slug from origin remote (supports SSH and HTTPS); fallback to rdf4j.
24+
ORIGIN_URL=$(git remote get-url origin 2>/dev/null || true)
25+
REPO_SLUG=$(echo "${ORIGIN_URL}" | sed -E 's#.*github.com[:/]+([^/]+/[^/.]+)(\.git)?#\1#')
26+
if ! [[ "${REPO_SLUG}" =~ .+/.+ ]]; then
27+
REPO_SLUG="eclipse-rdf4j/rdf4j"
28+
fi
29+
2330
echo ""
2431
echo "The script requires several external command line tools:"
2532
echo " - git"
@@ -39,7 +46,6 @@ if [ ! -f templates/"${RELEASE_NOTES_TEMPLATE}" ]; then
3946
exit 1;
4047
fi
4148

42-
4349
if [ ! -f templates/"${NEWS_ITEM_TEMPLATE}" ]; then
4450
echo "File not found!"
4551
echo "templates/${NEWS_ITEM_TEMPLATE}"
@@ -52,37 +58,53 @@ if [[ ${M} == "" ]]; then
5258
echo "Please make sure that you have cleaned up and closed the milestone connected to ${MVN_VERSION_RELEASE}";
5359
read -n 1 -srp "Press any key to continue (ctrl+c to cancel)"; printf "\n\n";
5460

55-
SHOULD_BE_NULL_IF_MILESTONE_IS_CLOSED=$(curl -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/eclipse-rdf4j/rdf4j/milestones?state=open | jq '.[] | select(.title == "'"${MVN_VERSION_RELEASE}"'") | .number')
61+
SHOULD_BE_NULL_IF_MILESTONE_IS_CLOSED=$(
62+
curl -s -H "Accept: application/vnd.github.v3+json" \
63+
"https://api.github.com/repos/${REPO_SLUG}/milestones?state=open" \
64+
| jq '.[] | select(.title == "'"${MVN_VERSION_RELEASE}"'") | .number'
65+
)
5666
echo "${SHOULD_BE_NULL_IF_MILESTONE_IS_CLOSED}"
57-
if ! [[ ${SHOULD_BE_NULL_IF_MILESTONE_IS_CLOSED} == "" ]]; then
58-
echo "";
59-
echo "Milestone not closed!";
60-
echo "https://github.com/eclipse-rdf4j/rdf4j/milestone/${SHOULD_BE_NULL_IF_MILESTONE_IS_CLOSED}";
61-
exit 1;
67+
if ! [[ ${SHOULD_BE_NULL_IF_MILESTONE_IS_CLOSED} == "" ]]; then
68+
echo ""
69+
echo "Milestone not closed!"
70+
echo "https://github.com/${REPO_SLUG}/milestone/${SHOULD_BE_NULL_IF_MILESTONE_IS_CLOSED}"
71+
exit 1
6272
fi
6373
fi
6474

65-
echo "Version: ${MVN_VERSION_RELEASE}";
75+
echo "Version: ${MVN_VERSION_RELEASE}"
6676

6777
# first try to get the GITHUB_MILESTONE number from the closed milestones
6878
export GITHUB_MILESTONE
69-
GITHUB_MILESTONE=$(curl -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/eclipse-rdf4j/rdf4j/milestones?state=closed\&direction=desc\&sort=title | jq '.[] | select(.title == "'"${MVN_VERSION_RELEASE}"'") | .number')
79+
GITHUB_MILESTONE=$(
80+
curl -s -H "Accept: application/vnd.github.v3+json" \
81+
"https://api.github.com/repos/${REPO_SLUG}/milestones?state=closed&direction=desc&sort=title" \
82+
| jq '.[] | select(.title == "'"${MVN_VERSION_RELEASE}"'") | .number'
83+
)
7084

7185
# then try to get the GITHUB_MILESTONE number from the open milestones (this should only be relevant for RDF4J Milestone builds).
72-
if [[ ${GITHUB_MILESTONE} == "" ]]; then
73-
GITHUB_MILESTONE=$(curl -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/eclipse-rdf4j/rdf4j/milestones | jq '.[] | select(.title == "'"${MVN_VERSION_RELEASE}"'") | .number')
86+
if [[ ${GITHUB_MILESTONE} == "" ]]; then
87+
GITHUB_MILESTONE=$(
88+
curl -s -H "Accept: application/vnd.github.v3+json" \
89+
"https://api.github.com/repos/${REPO_SLUG}/milestones" \
90+
| jq '.[] | select(.title == "'"${MVN_VERSION_RELEASE}"'") | .number'
91+
)
7492
fi
7593

76-
if [[ ${GITHUB_MILESTONE} == "" ]]; then
77-
echo "";
78-
echo "Milestone not found matching '${MVN_VERSION_RELEASE}'";
79-
exit 1;
94+
if [[ ${GITHUB_MILESTONE} == "" ]]; then
95+
echo ""
96+
echo "Milestone not found matching '${MVN_VERSION_RELEASE}'"
97+
exit 1
8098
fi
8199

82100
export NUMBER_OF_CLOSED_ISSUES
83-
NUMBER_OF_CLOSED_ISSUES=$(curl -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/eclipse-rdf4j/rdf4j/milestones/${GITHUB_MILESTONE} | jq '.closed_issues')
101+
NUMBER_OF_CLOSED_ISSUES=$(
102+
curl -s -H "Accept: application/vnd.github.v3+json" \
103+
"https://api.github.com/repos/${REPO_SLUG}/milestones/${GITHUB_MILESTONE}" \
104+
| jq '.closed_issues'
105+
)
84106

85-
echo "Milestone: https://github.com/eclipse-rdf4j/rdf4j/milestone/${GITHUB_MILESTONE}"
107+
echo "Milestone: https://github.com/${REPO_SLUG}/milestone/${GITHUB_MILESTONE}"
86108
echo "Number of closed issues: ${NUMBER_OF_CLOSED_ISSUES}"
87109

88110
export DATETIME
@@ -96,16 +118,22 @@ echo "Collecting assigned contributors for milestone #${GITHUB_MILESTONE}..."
96118
# Build a distinct, comma-separated list of assignees as Markdown links.
97119
# If a user has a GitHub 'name', use it; otherwise use the username.
98120
# Requires: gh (authenticated) and jq (already listed as dependencies above).
121+
122+
# Use explicit GET and querystring to avoid gh defaulting to POST when -f fields are provided.
123+
TMP_ISSUES_JSON=$(mktemp)
124+
if ! gh api -X GET \
125+
"repos/${REPO_SLUG}/issues?milestone=${GITHUB_MILESTONE}&state=all&per_page=100" \
126+
--paginate > "${TMP_ISSUES_JSON}"; then
127+
echo "Error: failed to fetch issues for milestone #${GITHUB_MILESTONE} via GitHub CLI."
128+
echo "Tip: run 'gh auth login' and ensure you have access to ${REPO_SLUG}."
129+
rm -f "${TMP_ISSUES_JSON}"
130+
exit 1
131+
fi
132+
99133
ASSIGNEE_LOGINS=$(
100-
gh api -H "Accept: application/vnd.github+json" \
101-
repos/eclipse-rdf4j/rdf4j/issues \
102-
--paginate \
103-
-f milestone="${GITHUB_MILESTONE}" \
104-
-f state=all \
105-
-f per_page=100 \
106-
| jq -r '.[].assignees[]?.login' \
107-
| sort -u
134+
jq -r '.[].assignees[]?.login' "${TMP_ISSUES_JSON}" | sort -u
108135
)
136+
rm -f "${TMP_ISSUES_JSON}"
109137

110138
CONTRIBUTORS_LIST=""
111139
if [[ -n "${ASSIGNEE_LOGINS}" ]]; then
@@ -136,7 +164,6 @@ echo "Using envsubst to generate content from templates."
136164
RELEASE_NOTES=$(cat templates/"${RELEASE_NOTES_TEMPLATE}" | envsubst)
137165
NEWS_ITEM=$(cat templates/"${NEWS_ITEM_TEMPLATE}" | envsubst)
138166

139-
140167
NEWS_FILENAME=${MVN_VERSION_RELEASE_RAW}
141168
NEWS_FILENAME=${NEWS_FILENAME/./}
142169
NEWS_FILENAME=${NEWS_FILENAME/./}

site/content/download.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ toc: true
55

66
You can either retrieve RDF4J via Apache Maven, or download the SDK or onejar directly.
77

8-
## RDF4J 5.1.3 (latest)
8+
## RDF4J 5.1.5 (latest)
99

10-
RDF4J 5.1.3 is our latest stable release. It requires Java 11 minimally.
11-
For details on what’s new and how to upgrade, see the [release and upgrade notes](/release-notes/5.1.3).
10+
RDF4J 5.1.5 is our latest stable release. It requires Java 11 minimally.
11+
For details on what’s new and how to upgrade, see the [release and upgrade notes](/release-notes/5.1.5).
1212

13-
- [RDF4J 5.1.3 SDK (zip)](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.3-sdk.zip)<br/>
13+
- [RDF4J 5.1.5 SDK (zip)](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.5-sdk.zip)<br/>
1414
Full Eclipse RDF4J SDK, containing all libraries, RDF4J Server, Workbench, and Console applications, and Javadoc API.
1515

16-
- [RDF4J 5.1.3 onejar](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.3-onejar.jar)<br/>
16+
- [RDF4J 5.1.5 onejar](http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-5.1.5-onejar.jar)<br/>
1717
Single jar file for easy inclusion of the full RDF4J toolkit in your Java project.
1818

1919
- [RDF4J artifacts](https://search.maven.org/search?q=org.eclipse.rdf4j) on the [Maven Central Repository](http://search.maven.org/)
@@ -28,7 +28,7 @@ You can include RDF4J as a Maven dependency in your Java project by including th
2828
<dependency>
2929
<groupId>org.eclipse.rdf4j</groupId>
3030
<artifactId>rdf4j-bom</artifactId>
31-
<version>5.1.3</version>
31+
<version>5.1.5</version>
3232
<type>pom</type>
3333
<scope>import</scope>
3434
</dependency>

site/content/news/rdf4j-515.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
title: "RDF4J 5.1.5 released"
3+
date: 2025-09-06T12:06:13+0200
4+
layout: "single"
5+
categories: ["news"]
6+
---
7+
RDF4J 5.1.5 is now available. This is a patch release fixing 5 bugs.
8+
9+
For more details, have a look at the [release notes](/release-notes/5.1.5).
10+
<!--more-->
11+
### Links
12+
13+
- [Download RDF4J](/download/)
14+
- [release notes](/release-notes/5.1.5).
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
title: "5.1.5"
3+
toc: true
4+
---
5+
RDF4J 5.1.5 is a patch release that fixes 5 issues.
6+
7+
For a complete overview, see [all issues fixed in 5.1.5](https://github.com/eclipse/rdf4j/milestone/121?closed=1).
8+
9+
### Acknowledgements
10+
11+
This release was made possible by contributions from [Andreas Schwarte](https://github.com/aschwarte10), [manuelfiorelli](https://github.com/manuelfiorelli), [Kacper Grzymkowski](https://github.com/niegrzybkowski).

site/static/javadoc/5.1.5.tgz

29 Bytes
Binary file not shown.

site/static/javadoc/latest.tgz

-12.3 MB
Binary file not shown.

0 commit comments

Comments
 (0)