Skip to content

Commit ad056f7

Browse files
committed
Merge branch 'release/4.6.2'
2 parents 415ec06 + acc1809 commit ad056f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1653
-889
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919

2020
jobs:
2121
Continuous-Integration-Actions:
22-
runs-on: self-hosted
22+
runs-on: [self-hosted, corese-stack-ubuntu-24]
2323

2424
env:
2525
PACKAGE_TOKEN: ${{ secrets.JLS_TOKEN }}
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/setup-java@v4
3737
with:
3838
java-version: 21
39-
distribution: 'temurin'
39+
distribution: "temurin"
4040

4141
- name: Cache Gradle
4242
uses: actions/cache@v4

.github/workflows/publish-prerelease.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@ on:
55
workflow_dispatch:
66
inputs:
77
ref:
8-
description: 'Tag to run workflow on'
8+
description: "Tag to run workflow on"
99
required: true
1010
push:
1111
branches:
1212
- develop
1313

1414
jobs:
15-
prerelease:
15+
prerelease-github:
1616
name: Build and Publish Pre-release
17-
runs-on: ubuntu-latest
17+
runs-on: [self-hosted, corese-stack-ubuntu-24]
1818
permissions:
1919
contents: write
2020

2121
steps:
2222
- name: Checkout code
2323
uses: actions/checkout@v4
2424

25-
- name: Set up JDK 11
25+
- name: Set up JDK 21
2626
uses: actions/setup-java@v4
2727
with:
28-
distribution: 'temurin'
29-
java-version: '11'
30-
cache: 'gradle'
28+
distribution: "temurin"
29+
java-version: "21"
30+
cache: "gradle"
3131

3232
- name: Cache Gradle
3333
uses: actions/cache@v4
@@ -38,7 +38,11 @@ jobs:
3838
${{ runner.os }}-gradle-
3939
4040
- name: Build project
41-
run: ./gradlew build
41+
run: ./gradlew shadowJar
42+
43+
- name: Generate timestamp
44+
id: timestamp
45+
run: echo "timestamp=$(date '+%d %B %Y, %H:%M:%S')" >> $GITHUB_OUTPUT
4246

4347
- name: Publish single pre-release
4448
uses: ncipollo/release-action@v1
@@ -49,6 +53,12 @@ jobs:
4953
body: |
5054
🚧 This is the latest build from the `develop` branch.
5155
Not intended for production use.
56+
57+
**Last Updated:** ${{ steps.timestamp.outputs.timestamp }}
58+
**Build Info:**
59+
- Branch: `${{ github.ref_name }}`
60+
- Commit: `${{ github.sha }}`
61+
- Build Time: `${{ steps.timestamp.outputs.timestamp }}`
5262
prerelease: true
5363
allowUpdates: true
5464
replacesArtifacts: true

.github/workflows/release-github.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ on:
55
workflow_dispatch:
66
inputs:
77
ref:
8-
description: 'Tag to run workflow on'
8+
description: "Tag to run workflow on"
99
required: true
1010
push:
1111
tags:
1212
- "v*.*.*"
1313

1414
jobs:
15-
release:
16-
runs-on: ubuntu-latest
15+
release-github:
16+
runs-on: [self-hosted, corese-stack-ubuntu-24]
1717
permissions:
1818
contents: write
1919

@@ -23,12 +23,12 @@ jobs:
2323
with:
2424
ref: ${{ github.event.inputs.ref || github.ref_name }}
2525

26-
- name: Set up JDK 11
26+
- name: Set up JDK 21
2727
uses: actions/setup-java@v4
2828
with:
29-
distribution: 'temurin'
30-
java-version: '11'
31-
cache: 'gradle'
29+
distribution: "temurin"
30+
java-version: "21"
31+
cache: "gradle"
3232

3333
- name: Cache Gradle
3434
uses: actions/cache@v4
@@ -58,4 +58,4 @@ jobs:
5858
bodyFile: "release_notes.md"
5959
tag: ${{ github.ref_name }}
6060
name: "Release ${{ github.ref_name }}"
61-
draft: true
61+
draft: true
Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
11
name: Publish Maven Central
2-
run-name: ${{ github.actor }} triggered Maven Central release on ${{ github.ref_name }}
2+
run-name: ${{ github.actor }} triggered Maven Central release on ${{ github.event.inputs.ref || github.ref_name }}
33

44
on:
55
push:
66
tags:
77
- "v*.*.*"
88
workflow_dispatch:
9+
inputs:
10+
ref:
11+
description: "Branch or tag to publish (e.g. develop or v4.6.4)"
12+
required: true
913

1014
jobs:
11-
release:
12-
runs-on: ubuntu-latest
15+
release-maven-central:
16+
runs-on: [self-hosted, corese-stack-ubuntu-24]
1317

1418
steps:
1519
- name: Checkout code
1620
uses: actions/checkout@v4
21+
with:
22+
ref: ${{ github.event.inputs.ref || github.ref }}
1723

18-
- name: Set up JDK 11
24+
- name: Set up JDK 21
1925
uses: actions/setup-java@v4
2026
with:
21-
distribution: 'temurin'
22-
java-version: '11'
23-
cache: 'gradle'
27+
distribution: "temurin"
28+
java-version: "21"
29+
cache: "gradle"
2430

2531
- name: Cache Gradle
2632
uses: actions/cache@v4
@@ -30,13 +36,13 @@ jobs:
3036
restore-keys: |
3137
${{ runner.os }}-gradle-
3238
33-
- name: Build and publish to Sonatype (staging only)
39+
- name: Publish to Maven Central via Vanniktech
3440
env:
35-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
36-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
37-
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
38-
GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }}
39-
run: ./gradlew publishToSonatype
41+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
42+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
43+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SIGNING_KEY }}
44+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SIGNING_PASSPHRASE }}
45+
run: ./gradlew publishToMavenCentral
4046

4147
- name: Manual Release Reminder
42-
run: echo "The artifacts have been staged on Sonatype. Please log in to Sonatype Nexus to close and release the staging repository manually."
48+
run: echo "Upload complete. Please finalize the deployment at https://central.sonatype.com/publishing/deployments"

.github/workflows/sphinx-prod.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,45 @@ permissions:
1111
contents: write
1212

1313
jobs:
14-
Continuous-Integration-Actions:
15-
runs-on: self-hosted
14+
build-production-docs:
15+
runs-on: [self-hosted, corese-stack-ubuntu-24]
1616

1717
env:
1818
PACKAGE_TOKEN: ${{ secrets.JLS_TOKEN }}
1919

2020
steps:
21-
- name: Checkout repository
22-
uses: actions/checkout@v4
23-
with:
24-
ref: main
21+
- name: Checkout repository
22+
uses: actions/checkout@v4
23+
with:
24+
ref: main
2525

26-
- name: Check existing tags before fetch
27-
run: git tag --sort=-v:refname || echo "No tags found"
26+
- name: Check existing tags before fetch
27+
run: git tag --sort=-v:refname || echo "No tags found"
2828

29-
- name: Delete all local tags to avoid conflicts
30-
run: git tag -d $(git tag) || echo "No tags to delete"
29+
- name: Delete all local tags to avoid conflicts
30+
run: git tag -d $(git tag) || echo "No tags to delete"
3131

32-
- name: Fetch updated tags
33-
run: git fetch --prune --tags --force
32+
- name: Fetch updated tags
33+
run: git fetch --prune --tags --force
3434

35-
- name: Check tags after fetch
36-
run: git tag --sort=-v:refname || echo "No tags found after fetch"
35+
- name: Check tags after fetch
36+
run: git tag --sort=-v:refname || echo "No tags found after fetch"
3737

38-
- name: Build Sphinx documentation with multiversion
39-
run: |
40-
set -x # Enable debug mode
41-
source /builds/miniconda3/etc/profile.d/conda.sh
42-
conda activate corese-core-documentation
38+
- name: Build Sphinx documentation with multiversion
39+
run: |
40+
set -x # Enable debug mode
41+
source /builds/miniconda3/etc/profile.d/conda.sh
42+
conda activate corese-core-documentation
4343
44-
sphinx-multiversion docs/source build/html -D exhale_args.containmentFolder="\${sourcedir}/java_api"
44+
sphinx-multiversion docs/source build/html -D exhale_args.containmentFolder="\${sourcedir}/java_api"
4545
46-
chmod +x docs/switcher_generator.sh
47-
./docs/switcher_generator.sh build/html/switcher.json build/html/index.html
48-
set +x # Disable debug mode
46+
chmod +x docs/switcher_generator.sh
47+
./docs/switcher_generator.sh build/html/switcher.json build/html/index.html
48+
set +x # Disable debug mode
4949
50-
- name: Deploy to GitHub Pages
51-
uses: peaceiris/actions-gh-pages@v3
52-
with:
53-
github_token: ${{ secrets.GITHUB_TOKEN }}
54-
publish_dir: ./build/html
55-
keep_files: true
50+
- name: Deploy to GitHub Pages
51+
uses: peaceiris/actions-gh-pages@v3
52+
with:
53+
github_token: ${{ secrets.GITHUB_TOKEN }}
54+
publish_dir: ./build/html
55+
keep_files: true

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
<!-- markdownlint-disable MD024 -->
22
# Corese Changelog
33

4+
## Version 4.6.2 - 2025-08-01
5+
6+
### Changed
7+
8+
- Remove `module-info.java` from the `corese-command` module to avoid issues with Java 21 and later versions. This file is not needed for command-line applications and its removal simplifies the build process.
9+
- Update JDK version to 21 in GitHub workflows.
10+
- Update Corese-Core dependency to version `4.6.4`.
11+
- Update error messages for clarity and consistency.
12+
13+
### Fixed
14+
15+
- Fixed bugs in installation scripts for Linux, macOS, and Windows.
16+
417
## Version 4.6.1 – 2025-06-17
518

619
### Added

README.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33

44
<p align="center">
55
<a href="https://project.inria.fr/corese/">
6-
<img src="docs/source/_static/logo/corese-command-logo.svg" width="200" alt="Corese-Command-logo">
6+
<img src="docs/source/_static/logo/corese-command.svg" width="200" alt="Corese-Command-logo">
77
</a>
88
<br>
99
<strong>Command-line tool for the Semantic Web of Linked Data</strong>
1010
</p>
1111

1212
[![License: CECILL-C](https://img.shields.io/badge/License-CECILL--C-blue.svg)](https://cecill.info/licences/Licence_CeCILL-C_V1-en.html) [![Discussions](https://img.shields.io/badge/Discussions-GitHub-blue)](https://github.com/orgs/corese-stack/discussions)
1313

14-
## Features
14+
## Features
1515

1616
- Convert RDF data formats (Turtle, RDF/XML, N-Triples, etc.)
1717
- Execute SPARQL queries on local or remote files
1818
- Query SPARQL endpoints
1919
- Validate RDF graphs using SHACL
2020
- Canonicalize RDF data
2121

22-
## 🚀 Getting Started
22+
## Getting Started
2323

2424
Install Corese-Command using your preferred platform:
2525

2626
### Linux
2727

2828
<a href='https://flathub.org/apps/fr.inria.corese.CoreseCommand'>
29-
<img width='140' alt='Get it on Flathub' src='https://flathub.org/api/badge?locale=en'/>
29+
<img width='140' alt='Get it on Flathub' src='docs/source/_static/logo/badge_flathub.svg'/>
3030
</a>
3131

3232
```shell
@@ -45,24 +45,26 @@ curl -fsSL https://raw.githubusercontent.com/corese-stack/corese-command/main/pa
4545
iwr -useb https://raw.githubusercontent.com/corese-stack/corese-command/main/packaging/scripts/install-windows.ps1 | iex
4646
```
4747

48-
You’ll then be able to use Corese-Command via the corese command in your terminal.
49-
5048
### Manual Installation (cross-platform)
5149

5250
You can also use Corese-Command as a standalone `.jar` file or add it to a Java project via Maven.
5351

54-
> Requires Java 11 or higher.
52+
> Requires Java 21 or higher.
5553
56-
- [🔗 GitHub Releases](https://github.com/corese-stack/corese-command/releases)
57-
- [📦 Maven Central](https://central.sonatype.com/artifact/fr.inria.corese/corese-command)
54+
<a href='https://github.com/corese-stack/corese-command/releases'>
55+
<img width='140' alt='Get it on GitHub' src='docs/source/_static/logo/badge_github.svg'/>
56+
</a>
57+
<a href='https://central.sonatype.com/artifact/fr.inria.corese/corese-command'>
58+
<img width='140' alt='Get it on Maven Central' src='docs/source/_static/logo/badge_maven.svg'/>
59+
</a>
5860

5961
Run manually with:
6062

6163
```shell
6264
java -jar corese-command-standalone.jar
6365
```
6466

65-
## Example Usage
67+
## Example Usage
6668

6769
```shell
6870
# Run a simple SPARQL query on an RDF file
@@ -89,19 +91,19 @@ corese canonicalize -i data.ttl -of rdfc-1.0-sha256
8991
corese query-endpoint -q 'SELECT * WHERE {?s ?p ?o}' -e "https://dbpedia.org/sparql"
9092
```
9193

92-
## 📖 Documentation
94+
## Documentation
9395

94-
- [Getting Started Guide](https://corese-stack.github.io/corese-command/v4.6.1/user_guide.html)
96+
- [Getting Started Guide](https://corese-stack.github.io/corese-command/v4.6.2/user_guide.html)
9597

96-
## 🤝 Contributing
98+
## Contributing
9799

98100
We welcome contributions! Here’s how to get involved:
99101

100102
- [GitHub Discussions](https://github.com/orgs/corese-stack/discussions)
101103
- [Issue Tracker](https://github.com/corese-stack/corese-command/issues)
102104
- [Pull Requests](https://github.com/corese-stack/corese-command/pulls)
103105

104-
## 🔗 Useful Links
106+
## Useful Links
105107

106108
- [Corese Website](https://corese-stack.github.io/corese-command/)
107109
- Mailing List: <corese-users@inria.fr>

0 commit comments

Comments
 (0)