Merge branch 'master' into maintenance/920-upgrade-to-spring-boot-4

pulling in DRY project versioning and some dependency updates

Author: dennisvang

.github/workflows/code-style.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup Java
         uses: actions/setup-java@v5
@@ -49,7 +49,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup Java
         uses: actions/setup-java@v5
@@ -76,7 +76,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup Java
         uses: actions/setup-java@v5

.github/workflows/docker-publish.yml

@@ -32,3 +32,5 @@ jobs:
     with:
       file: './Dockerfile'
       push: ${{ github.event_name == 'push' || github.event_name == 'release' }}
+      build-args: |
+        "PROJECT_VERSION=${{ github.ref_name }}"

.github/workflows/security.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Setup Java
         uses: actions/setup-java@v5
@@ -63,7 +63,7 @@ jobs:
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Perform Snyk Check (Maven)
         uses: snyk/actions/maven@master
@@ -87,12 +87,12 @@ jobs:
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Docker build
         run: |
           docker pull $PUBLIC_IMAGE:$IMAGE_TAG
-          docker build --cache-from $PUBLIC_IMAGE:$IMAGE_TAG -t fdp:snyk-test -f Dockerfile .
+          docker build --build-arg PROJECT_VERSION=x.y.z --cache-from $PUBLIC_IMAGE:$IMAGE_TAG -t fdp:snyk-test -f Dockerfile .
 
       - name: Perform Snyk Check (Docker)
         uses: snyk/actions/docker@master

Dockerfile

@@ -11,7 +11,8 @@ WORKDIR /builder
 ADD . /builder
 
 # https://maven.apache.org/ref/current/maven-embedder/cli.html
-RUN mvn --quiet --batch-mode --update-snapshots --fail-fast -DskipTests package
+ARG PROJECT_VERSION
+RUN mvn --quiet --batch-mode --update-snapshots --fail-fast -DskipTests -Drevision=${PROJECT_VERSION} package
 
 ################################################################################
 # BUILD IMAGE

SECURITY.md

@@ -3,20 +3,20 @@
 ## Supported Versions
 
 We support the latest *major* and *minor* version with *patch* versions that fix vulnerabilities and critical bugs.
-For older versions, we highly recommend upgrading to the latest version. 
+For older versions, we highly recommend upgrading to the [latest] version. 
 
-| Version | Supported          |
-|---------| ------------------ |
-| 1.20.x  | :white_check_mark: |
-| < 1.20  | :x:                |
+| Version    | Supported          |
+|------------| ------------------ |
+| [latest]   | :white_check_mark: |
+| < [latest] | :x:                |
 
 ## Current Recommendations
 
-* Always use the [latest release]. 
+* Always use the [latest] release. 
 
 ## Reporting a Vulnerability
 
 If you encounter a vulnerability, please create a [private security advisory] using the "Report a vulnerability" button at the top of this page.
 
 [private security advisory]: https://docs.github.com/en/code-security/how-tos/report-and-fix-vulnerabilities/privately-reporting-a-security-vulnerability
-[latest release]: https://github.com/FAIRDataTeam/FAIRDataPoint/releases/latest
+[latest]: https://github.com/FAIRDataTeam/FAIRDataPoint/releases/latest

pom.xml

@@ -11,7 +11,7 @@
     </parent>
     <groupId>org.fairdatateam</groupId>
     <artifactId>fairdatapoint</artifactId>
-    <version>1.20.0</version>
+    <version>${revision}</version>
     <packaging>jar</packaging>
 
     <name>FairDataPoint</name>
@@ -46,6 +46,9 @@
     <properties>
         <!-- Project -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- The `revision` property should be overridden during build, e.g. `mvn -Drevision=v1.20.2 ...` -->
+        <!-- This is handled automatically in the `docker-publish.yml` workflow, with the help of `PROJECT_VERSION`. -->
+        <revision>dev</revision>
 
         <!-- Maven -->
         <maven.compiler.source>21</maven.compiler.source>
@@ -54,7 +57,7 @@
         <!-- Project related -->
         <spring-rdf-migration.version>2.0.0</spring-rdf-migration.version>
         <rdf-resource-resolver.version>0.2.0</rdf-resource-resolver.version>
-        <spring-security-acl-mongodb.version>6.0.0</spring-security-acl-mongodb.version>
+        <spring-security-acl-mongodb.version>6.0.4</spring-security-acl-mongodb.version>
 
         <!-- Core -->
         <springdoc-openapi-starter-webmvc-ui.version>3.0.3</springdoc-openapi-starter-webmvc-ui.version>
@@ -68,9 +71,9 @@
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <git-commit-id-maven-plugin.version>10.0.0</git-commit-id-maven-plugin.version>
         <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
-        <checkstyle.version>13.3.0</checkstyle.version>
+        <checkstyle.version>13.6.0</checkstyle.version>
         <spring-javaformat-checkstyle.version>0.0.47</spring-javaformat-checkstyle.version>
-        <spotbugs-maven-plugin.version>4.9.8.2</spotbugs-maven-plugin.version>
+        <spotbugs-maven-plugin.version>4.10.2.0</spotbugs-maven-plugin.version>
 
         <!-- required for mockito to function properly (#890) -->
         <argLine/>
@@ -402,6 +405,10 @@
                     <generateGitPropertiesFile>true</generateGitPropertiesFile>
                     <generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties</generateGitPropertiesFilename>
                     <commitIdGenerationMode>full</commitIdGenerationMode>
+                    <!-- include lightweight tags in git describe (github release creates lightweight tags) -->
+                    <gitDescribe>
+                        <tags>true</tags>
+                    </gitDescribe>
                 </configuration>
             </plugin>
             <plugin>

src/main/resources/application.yml

@@ -67,7 +67,7 @@ metadataProperties:
 
 openapi:
   title: FAIR Data Point API
-  version: 1.20.0
+  version: "@project.version@"
   description: "The reference implementation of the metadata registration service: A service implementing the API specification. It contains an authentication system to allow maintainers to define and update metadata. Read-only access to the data is public."
   contact:
     name: Luiz Bonino