diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..90e05c40d
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+ - package-ecosystem: "github-actions" # See documentation for possible values
+ directory: "/" # Location of package manifests
+ schedule:
+ interval: "weekly"
diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000..fdd0f42bb
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,13 @@
+feature:
+ - any:
+ - head-branch: [ '^feature' ]
+fix:
+ - any:
+ - head-branch: [ '^fix', '^hotfix' ]
+chore:
+ - any:
+ - head-branch: [ '^chore', '^documentation', '^docs', '^ci', '^refactor' ]
+release:
+ - all:
+ - base-branch: [ 'main', 'master' ]
+ - head-branch: [ 'development', 'dev' ]
diff --git a/.github/pr-labels.yml b/.github/pr-labels.yml
deleted file mode 100644
index f95cf6e9d..000000000
--- a/.github/pr-labels.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-feature: ['feature/*', 'feat/*']
-fix: ['fix/*', 'hotfix']
-chore: ['chore/*', 'documentation/*', 'docs/*', 'ci/*', 'refactor/*']
diff --git a/.github/workflows/build_package.yml b/.github/workflows/build_package.yml
index d616186cc..9e4a66ccb 100644
--- a/.github/workflows/build_package.yml
+++ b/.github/workflows/build_package.yml
@@ -13,13 +13,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 1.8
- uses: actions/setup-java@v1
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ - name: Set up JDK 8
+ uses: actions/setup-java@v4
with:
- java-version: 1.8
+ distribution: 'zulu'
+ java-version: '8'
- name: Load local Maven repository cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d708ad0ff..5706a8aa6 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -22,7 +22,6 @@ on:
jobs:
analyze:
- name: analyze
runs-on: ubuntu-latest
permissions:
actions: read
@@ -37,47 +36,48 @@ jobs:
# Learn more about CodeQL language support at https://git.io/codeql-language-support
steps:
- - name: Checkout repository
- uses: actions/checkout@v2
- - name: Set up JDK 1.8
- uses: actions/setup-java@v1
- with:
- java-version: 1.8
- settings-path: ${{ github.workspace }}
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ - name: Set up JDK 8
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'zulu'
+ java-version: '8'
+ settings-path: ${{ github.workspace }}
- - name: Load local Maven repository cache
- uses: actions/cache@v2
- with:
- path: ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
+ - name: Load local Maven repository cache
+ uses: actions/cache@v3
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
- # Initializes the CodeQL tools for scanning.
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
- with:
- languages: ${{ matrix.language }}
- # If you wish to specify custom queries, you can do so here or in a config file.
- # By default, queries listed here will override any specified in a config file.
- # Prefix the list here with "+" to use these queries and those in the config file.
- # queries: ./path/to/local/query, your-org/your-repo/queries@main
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v3
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
- # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- # If this step fails, then you should remove it and run the build manually (see below)
- - name: Autobuild
- uses: github/codeql-action/autobuild@v1
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v3
- # âšī¸ Command-line programs to run using the OS shell.
- # đ https://git.io/JvXDl
+ # âšī¸ Command-line programs to run using the OS shell.
+ # đ https://git.io/JvXDl
- # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines
- # and modify them (or add more) to build your code if your project
- # uses a compiled language
+ # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines
+ # and modify them (or add more) to build your code if your project
+ # uses a compiled language
- #- run: |
- # make bootstrap
- # make release
+ #- run: |
+ # make bootstrap
+ # make release
- - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index ebae60566..ceec2cf1c 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -11,24 +11,28 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 1.8
- uses: actions/setup-java@v1
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ - name: Set up JDK 8
+ uses: actions/setup-java@v4
with:
- java-version: 1.8
+ distribution: 'zulu'
+ java-version: '8'
settings-path: ${{ github.workspace }}
- name: Load local Maven repository cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
+
- name: Set up git
run: |
git config --global user.email "support@qbic.zendesk.com"
git config --global user.name "JohnnyQ5"
+
- name: Set version in Maven project
run: mvn versions:set -DnewVersion=${{ github.event.inputs.versionTag }}
@@ -40,7 +44,7 @@ jobs:
&& !( contains(github.event.inputs.versionTag, 'alpha')
|| contains(github.event.inputs.versionTag, 'beta')
|| contains(github.event.inputs.versionTag, 'rc')) }}
- uses: actions/github-script@v4.0.2
+ uses: actions/github-script@v7
with:
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
script: |
@@ -48,12 +52,13 @@ jobs:
tag_name: "${{ github.event.inputs.versionTag }}",
generate_release_notes: true
});
+
- name: Create Pre-Release Notes
if: ${{ !startsWith(github.ref, 'refs/tags/')
&& ( contains(github.event.inputs.versionTag, 'alpha')
|| contains(github.event.inputs.versionTag, 'beta')
|| contains(github.event.inputs.versionTag, 'rc')) }}
- uses: actions/github-script@v4.0.2
+ uses: actions/github-script@v7
with:
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
script: |
@@ -62,6 +67,7 @@ jobs:
generate_release_notes: true,
prerelease: true
});
+
- name: Publish artefact to QBiC Nexus Repository
run: mvn --quiet --settings $GITHUB_WORKSPACE/.github.settings.xml deploy
env:
@@ -81,23 +87,12 @@ jobs:
run: git push
- name: Open PR with version bump
- uses: actions/github-script@v4.0.2
+ uses: actions/github-script@v7
with:
github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
script: |
await github.request(`POST /repos/${{ github.repository }}/pulls`, {
title: 'Update version to ${{ github.event.inputs.versionTag }}',
head: 'release/set-version-to-${{ github.event.inputs.versionTag }}',
- base: 'master'
- });
-
- - name: Open PR to development
- uses: actions/github-script@v4.0.2
- with:
- github-token: ${{secrets.JOHNNY_Q5_REPORTS_TOKEN}}
- script: |
- await github.request(`POST /repos/${{ github.repository }}/pulls`, {
- title: 'Merge release ${{ github.event.inputs.versionTag }} into development',
- head: 'master',
- base: 'development'
+ base: 'main'
});
diff --git a/.github/workflows/label-pull-request.yml b/.github/workflows/label-pull-request.yml
deleted file mode 100644
index b03eee147..000000000
--- a/.github/workflows/label-pull-request.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Label Pull Requests
-
-on:
- pull_request:
- types: [ opened, edited ]
-
-jobs:
- label:
- runs-on: ubuntu-latest
- steps:
- - uses: TimonVS/pr-labeler-action@v3
- with:
- configuration-path: .github/pr-labels.yml # optional, .github/pr-labeler.yml is the default value
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/label-pull-requests.yml b/.github/workflows/label-pull-requests.yml
new file mode 100644
index 000000000..931ff6da3
--- /dev/null
+++ b/.github/workflows/label-pull-requests.yml
@@ -0,0 +1,17 @@
+name: Label Pull Requests
+
+permissions:
+ contents: read
+ pull-requests: write
+
+on:
+ pull_request:
+ types: [ opened, edited ]
+
+jobs:
+ Assign-Label-To-Pull-Request:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/labeler@v5.0.0-alpha.1
+ with:
+ repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/nexus-publish-snapshots.yml b/.github/workflows/nexus-publish-snapshots.yml
index 8b8c411c1..0109aa06e 100644
--- a/.github/workflows/nexus-publish-snapshots.yml
+++ b/.github/workflows/nexus-publish-snapshots.yml
@@ -2,7 +2,7 @@
# qbic-repo.qbic.uni-tuebingen.de packages when a release is created
# For more information see: https://github.com/actions/setup-java#apache-maven-with-a-settings-path
-name: Nexus Publish Snapshots
+name: Deploy Snapshot
on:
push:
@@ -10,21 +10,22 @@ on:
- development
jobs:
- publish_snapshots:
+ publish_snapshot:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 1.8
- uses: actions/setup-java@v1
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ - name: Set up JDK 8
+ uses: actions/setup-java@v4
with:
- java-version: 1.8
- server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+ distribution: 'zulu'
+ java-version: '8'
settings-path: ${{ github.workspace }}
-
+
- name: Load local Maven repository cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -41,7 +42,7 @@ jobs:
run: mvn -B package --file pom.xml
- name: Publish artefact to QBiC Nexus Repository
- run: mvn --quiet --activate-profiles development-build,!release-build --settings $GITHUB_WORKSPACE/.github.settings.xml deploy
+ run: mvn --settings $GITHUB_WORKSPACE/.github.settings.xml deploy
env:
MAVEN_REPO_USERNAME: ${{ secrets.NEXUS_USERNAME }}
MAVEN_REPO_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index 5708a2585..78e7c39b8 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -13,14 +13,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- - name: Set up JDK 1.8
- uses: actions/setup-java@v1
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ - name: Set up JDK 8
+ uses: actions/setup-java@v4
with:
- java-version: 1.8
+ distribution: 'zulu'
+ java-version: '8'
+ settings-path: ${{ github.workspace }}
- name: Load local Maven repository cache
- uses: actions/cache@v2
+ uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/README.md b/README.md
index db8b29084..cb4f9eeb5 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,6 @@ _Data Model Library - A collection of QBiC data models._
[![Run Maven Tests](https://github.com/qbicsoftware/data-model-lib/actions/workflows/run_tests.yml/badge.svg)](https://github.com/qbicsoftware/data-model-lib/actions/workflows/run_tests.yml)
[![CodeQL](https://github.com/qbicsoftware/data-model-lib/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/qbicsoftware/data-model-lib/actions/workflows/codeql-analysis.yml)
[![release](https://img.shields.io/github/v/release/qbicsoftware/data-model-lib?include_prereleases)](https://github.com/qbicsoftware/data-model-lib/releases)
-
[![license](https://img.shields.io/github/license/qbicsoftware/data-model-lib)](https://github.com/qbicsoftware/data-model-lib/blob/main/LICENSE)
![language](https://img.shields.io/badge/language-groovy,%20java-blue.svg)
@@ -173,7 +172,6 @@ The following figure describes the entity relation of the imaging DTOs.
Please have a look at the detailed JavaDoc class description of the
DTOs.
-
### Business Context - Offer Management
The following figure describes the entity relation of the DTOs related to Offer Management.
diff --git a/pom.xml b/pom.xml
index 19fe41804..39210749b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
life.qbic
data-model-lib
- 2.25.1
+ 2.28.0
data-model-lib
http://github.com/qbicsoftware/data-model-lib
Data models. A collection of QBiC's central data models and DTOs.