Skip to content

Commit

Permalink
Merge pull request #2 from qbicsoftware/development
Browse files Browse the repository at this point in the history
Release PR
  • Loading branch information
KochTobi authored May 28, 2024
2 parents 1d24157 + 0a6567e commit 1ec20f8
Show file tree
Hide file tree
Showing 44 changed files with 837 additions and 1,012 deletions.
24 changes: 12 additions & 12 deletions .github.settings.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<settings>
<servers>
<server>
<id>nexus-snapshots</id>
<username>${env.MAVEN_REPO_USERNAME}</username>
<password>${env.MAVEN_REPO_PASSWORD}</password>
</server>
<server>
<id>nexus-releases</id>
<username>${env.MAVEN_REPO_USERNAME}</username>
<password>${env.MAVEN_REPO_PASSWORD}</password>
</server>
</servers>
<servers>
<server>
<id>nexus-snapshots</id>
<username>${env.MAVEN_REPO_USERNAME}</username>
<password>${env.MAVEN_REPO_PASSWORD}</password>
</server>
<server>
<id>nexus-releases</id>
<username>${env.MAVEN_REPO_USERNAME}</username>
<password>${env.MAVEN_REPO_PASSWORD}</password>
</server>
</servers>
</settings>
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* @qbicsoftware/itss

11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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"
13 changes: 13 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -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' ]
- head-branch: [ 'development', 'dev' ]
3 changes: 0 additions & 3 deletions .github/pr-labels.yml

This file was deleted.

17 changes: 9 additions & 8 deletions .github/workflows/build_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,26 @@ on:
- '**'
pull_request:
# The branches below must be a subset of the branches above
branches: [ main, master ]
branches: [ main ]

jobs:
package:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.17
uses: actions/setup-java@v1
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: 1.17

distribution: 'zulu'
java-version: '11'
- name: Load local Maven repository cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Run mvn package
run: mvn -B package --file pom.xml
22 changes: 11 additions & 11 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@ name: "CodeQL"

on:
push:
branches: [ main, master, development, release/*, hotfix/* ]
branches: [ main, development, release/*, hotfix/* ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main, master ]
branches: [ main ]
schedule:
- cron: '21 1 * * 4'

jobs:
analyze:
name: analyze
runs-on: ubuntu-latest
permissions:
actions: read
Expand All @@ -38,15 +37,16 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Set up JDK 1.17
uses: actions/setup-java@v1
uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: 1.17
distribution: 'zulu'
java-version: '11'
settings-path: ${{ github.workspace }}

- name: Load local Maven repository cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -55,7 +55,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
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.
Expand All @@ -66,7 +66,7 @@ jobs:
# 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
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -80,4 +80,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
22 changes: 12 additions & 10 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.17
uses: actions/setup-java@v1
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: 1.17
distribution: 'zulu'
java-version: '11'
settings-path: ${{ github.workspace }}

- name: Load local Maven repository cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -32,17 +34,17 @@ jobs:
git config --global user.name "JohnnyQ5"
- name: Set version in Maven project
run: mvn versions:set -DnewVersion=${{ github.event.inputs.versionTag }}
run: mvn versions:set -DnewVersion=${{ github.event.inputs.versionTag }}

- name: Build with Maven
run: mvn -B package --file pom.xml
run: mvn -B package --file pom.xml

- name: Create 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: |
Expand All @@ -56,7 +58,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: |
Expand Down Expand Up @@ -85,7 +87,7 @@ 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: |
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/label-pull-requests.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
name: Label Pull Requests

permissions:
contents: read
pull-requests: write

on:
pull_request:
types: [ opened, edited ]

jobs:
label:
Assign-Label-To-Pull-Request:
runs-on: ubuntu-latest
steps:
- uses: TimonVS/pr-labeler-action@v3
- uses: actions/labeler@v5
with:
configuration-path: .github/pr-labels.yml # optional, .github/pr-labeler.yml is the default value
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/labeler.yml
18 changes: 10 additions & 8 deletions .github/workflows/nexus-publish-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,22 @@ on:
- development

jobs:
publish_snapshots:
publish_snapshot:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.17
uses: actions/setup-java@v1
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: 1.17
distribution: 'zulu'
java-version: '11'
settings-path: ${{ github.workspace }}

- name: Load local Maven repository cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand All @@ -34,13 +36,13 @@ jobs:
run: mvn versions:set -DremoveSnapshot
# Set the SNAPSHOT for this build and deployment
- name: Set version in Maven project
run: mvn versions:set -DnewVersion='${project.version}-SNAPSHOT'
run: mvn versions:set -DnewVersion='${project.version}-SNAPSHOT'

- name: Build with Maven
run: mvn -B package --file pom.xml

- name: Publish artefact to QBiC Nexus Repository
run: mvn --settings $GITHUB_WORKSPACE/.github.settings.xml deploy
run: mvn --quiet --settings $GITHUB_WORKSPACE/.github.settings.xml deploy
env:
MAVEN_REPO_USERNAME: ${{ secrets.NEXUS_USERNAME }}
MAVEN_REPO_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
15 changes: 9 additions & 6 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@ on:
- '**'
pull_request:
# The branches below must be a subset of the branches above
branches: [ main, master ]
branches: [ main ]

jobs:
test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.17
uses: actions/setup-java@v1
- name: Checkout repository
uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: 1.17
distribution: 'zulu'
java-version: '11'
settings-path: ${{ github.workspace }}

- name: Load local Maven repository cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
49 changes: 27 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,34 @@
# Compiled class file
*.class
# Eclipse
.classpath
.project
.settings/

# Log file
*.log
# VS Code
.vscode

# Maven targets
target/*
# Intellij
.idea/
*.iml
*.iws

# BlueJ files
*.ctxt
# Mac
.DS_Store

# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Maven
target/
**/.flattened-pom.xml

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# Some of our applications generate logs, which should be ignored by git
logs/

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
# Other
**/.factorypath

# misc
*.DS_STORE
# compiled Vaadin widgetsets
**/VAADIN/widgetsets

# From docs
**/__pycache__

# Properties, which may contain sensitive information
**/developer.properties
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 QBiC
Copyright (c) 2024, University of Tuebingen

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 1ec20f8

Please sign in to comment.