Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ jobs:
with:
file: './Dockerfile'
push: ${{ github.event_name == 'push' || github.event_name == 'release' }}
build-args: |
"PROJECT_VERSION=${{ github.ref_name }}"
2 changes: 1 addition & 1 deletion .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
- 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
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 8 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>
<groupId>org.fairdatateam</groupId>
<artifactId>fairdatapoint</artifactId>
<version>1.20.0</version>
<version>${revision}</version>
<packaging>jar</packaging>

<name>FairDataPoint</name>
Expand Down Expand Up @@ -45,6 +45,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>
Expand Down Expand Up @@ -384,6 +387,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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down