Merge pull request #259 from International-Data-Spaces-Association/de…

…velop

Release v5.0.0

.dockerignore

@@ -1,35 +1,3 @@
-target/
-images/
-README.md
-CONTRIBUTING.md
-CHANGELOG.md
-.gitignore
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**
-!**/src/test/**
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-
-### VS Code ###
-.vscode/
+**
+!pom.xml
+!src/main/**

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,9 @@
+---
+blank_issues_enabled: false
+contact_links:
+ - name: Ask a question or get support
+ url: https://github.com/International-Data-Spaces-Association/DataspaceConnector/discussions
+ about: Ask a question or request support for using the Dataspace Connector
+ - name: Take a look at the wiki
+ url: https://github.com/International-Data-Spaces-Association/DataspaceConnector/wiki
+ about: Browse the wiki for help regarding the Dataspace Connector

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/dependabot.yaml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ target-branch: "develop"
+ open-pull-requests-limit: 10

.github/workflows/build-image.yaml

@@ -0,0 +1,83 @@
+name: docker-image
+
+on:
+ push:
+ branches: [ master, develop ]
+ tags: 'v*'
+ release:
+ types: [published]
+
+env:
+ REGISTRY: ${{ secrets.IMAGE_REGISTRY }}
+ OWNER: ${{ secrets.REPO_USER }}
+
+jobs:
+ docker:
+ timeout-minutes: 30
+ runs-on: ubuntu-latest
+ steps:
+ -
+ name: Checkout Repo
+ uses: actions/checkout@v2
+ -
+ name: Build registry path
+ id: get_repo
+ run: echo ::set-output name=IMAGE::"$REGISTRY/$OWNER/dataspace-connector"
+ -
+ name: Find tag
+ id: get_tag
+ run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\//}
+ if: startsWith(github.ref, 'refs/tags')
+ -
+ name: Find branch name
+ id: get_branch
+ run: echo ::set-output name=BRANCH::$(git rev-parse --abbrev-ref HEAD)
+ -
+ name: Login to registry
+ uses: docker/login-action@v1
+ with:
+ # This should use REGISTRY instead of the secret directly
+ registry: ${{ secrets.IMAGE_REGISTRY }}
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ -
+ name: Build image
+ run: |
+ docker build . -t $IMAGE:$BRANCH
+ env:
+ IMAGE: ${{ steps.get_repo.outputs.IMAGE }}
+ BRANCH: ${{ steps.get_branch.outputs.BRANCH }}
+ -
+ name: Push tagged image
+ run: |
+ echo $IMAGE
+ echo $BRANCH
+ echo $TAG
+ TMP=$TAG
+ if [[ $TAG == v* ]]
+ then
+ # Its a version tag
+ TMP=${TAG:1:${#TAG}}
+ echo "Found a version tag"
+ if [[ $BRANCH == 'master' ]]
+ then
+ # Its a release version tag
+ docker tag $IMAGE:$BRANCH $IMAGE:latest
+ docker push $IMAGE:latest
+ fi
+ fi
+ # Has tag
+ docker tag $IMAGE_NAME:$BRANCH_NAME $IMAGE_NAME:$TAG
+ docker push $IMAGE_NAME:$TAG
+ if: startsWith(github.ref, 'refs/tags')
+ env:
+ IMAGE: ${{ steps.get_repo.outputs.IMAGE }}
+ BRANCH: ${{ steps.get_branch.outputs.BRANCH }}
+ TAG: ${{ steps.get_tag.outputs.TAG }}
+ -
+ name: Push branch image
+ run: |
+ docker push $IMAGE:$BRANCH
+ env:
+ IMAGE: ${{ steps.get_repo.outputs.IMAGE }}
+ BRANCH: ${{ steps.get_branch.outputs.BRANCH }}

.github/workflows/maven.yml

@@ -4,13 +4,16 @@
 name: Java CI with Maven
 
 on:
- push:
- branches: [ develop ]
  pull_request:
- branches: [ develop ]
+ branches: [ master, develop ]
+
+concurrency:
+ group: ${{ github.head_ref }}
+ cancel-in-progress: true
 
 jobs:
  build:
+ timeout-minutes: 30
  runs-on: ${{ matrix.os }}
  strategy:
  fail-fast: false
@@ -29,6 +32,6 @@ jobs:
  with:
  path: ~/.m2
  key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
- restore-keys: ${{ runner.os }}-m2 
+ restore-keys: ${{ runner.os }}-m2
  - name: Build with Maven
  run: mvn -B -U verify --file pom.xml