From 186c31f4b358478fbc8d39691d4b91b44e2619aa Mon Sep 17 00:00:00 2001 From: Ronja Quensel <72978761+ronjaquensel@users.noreply.github.com> Date: Wed, 9 Jun 2021 07:28:19 +0200 Subject: [PATCH] Releasedrafter patch (#31) * setup github actions workflow (#1) * setup github actions workflow * fix: remove tag from Javadoc Co-authored-by: Ronja Quensel * Update issue templates (#2) * Update issue templates * Create config.yml * Edit License and Readme (#4) * Update README.md * docs: change LICENSE * auto build docker images (#5) * auto build docker images * chore: add dockerignore and update Dockerfile Co-authored-by: Ronja Quensel * setup dependabot (#10) * chore(deps): bump jacoco-maven-plugin from 0.8.6 to 0.8.7 (#11) Bumps [jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.6 to 0.8.7. - [Release notes](https://github.com/jacoco/jacoco/releases) - [Commits](https://github.com/jacoco/jacoco/compare/v0.8.6...v0.8.7) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump spotbugs-maven-plugin from 4.2.0 to 4.2.3 (#12) Bumps [spotbugs-maven-plugin](https://github.com/spotbugs/spotbugs-maven-plugin) from 4.2.0 to 4.2.3. - [Release notes](https://github.com/spotbugs/spotbugs-maven-plugin/releases) - [Commits](https://github.com/spotbugs/spotbugs-maven-plugin/compare/spotbugs-maven-plugin-4.2.0...spotbugs-maven-plugin-4.2.3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ronja Quensel <72978761+ronjaquensel@users.noreply.github.com> * chore(deps): bump maven-enforcer-plugin from 3.0.0-M2 to 3.0.0-M3 (#13) Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0-M2 to 3.0.0-M3. - [Release notes](https://github.com/apache/maven-enforcer/releases) - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0-M2...enforcer-3.0.0-M3) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump postgresql from 42.2.19 to 42.2.20 (#14) Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.19 to 42.2.20. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/REL42.2.20/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.19...REL42.2.20) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump spring-boot-starter-parent from 2.4.4 to 2.4.5 (#15) Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.4.4 to 2.4.5. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.4.4...v2.4.5) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump camel-spring-boot-bom from 3.8.0 to 3.9.0 (#16) Bumps camel-spring-boot-bom from 3.8.0 to 3.9.0. Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump maven-project-info-reports-plugin from 3.1.1 to 3.1.2 (#17) Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases) - [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.1.1...maven-project-info-reports-plugin-3.1.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: cancel same pending workflows (#18) * chore: update build-image.yaml (#19) * chore: remove duplication in image name (#20) * Dev patch (#22) * Configure actions and issue templates (#3) * setup github actions workflow (#1) * setup github actions workflow * fix: remove tag from Javadoc Co-authored-by: Ronja Quensel * Update issue templates (#2) * Update issue templates * Create config.yml Co-authored-by: Brian-Frederik Jahnke <74709618+brianjahnke@users.noreply.github.com> * fix: resolve conflict in ISSUE_TEMPLATE/config.yaml (#9) * auto build docker images (#6) * setup github actions workflow (#1) * setup github actions workflow * fix: remove tag from Javadoc Co-authored-by: Ronja Quensel * Update issue templates (#2) * Update issue templates * Create config.yml * Edit License and Readme (#4) * Update README.md * docs: change LICENSE * auto build docker images (#5) * auto build docker images * chore: add dockerignore and update Dockerfile Co-authored-by: Ronja Quensel Co-authored-by: Brian-Frederik Jahnke <74709618+brianjahnke@users.noreply.github.com> Co-authored-by: Julia Pampus <72392527+juliapampus@users.noreply.github.com> Co-authored-by: Brian-Frederik Jahnke <74709618+brianjahnke@users.noreply.github.com> Co-authored-by: Julia Pampus <72392527+juliapampus@users.noreply.github.com> * chore(deps): bump maven-javadoc-plugin from 3.2.0 to 3.3.0 (#27) Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.2.0...maven-javadoc-plugin-3.3.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump spring-boot-starter-parent from 2.4.5 to 2.5.0 (#25) Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.4.5 to 2.5.0. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.4.5...v2.5.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Camel springboot version fix (#28) * chore(deps): bump camel-springboot.version from 3.9.0 to 3.10.0 Bumps `camel-springboot.version` from 3.9.0 to 3.10.0. Updates `camel-spring-boot-starter` from 3.9.0 to 3.10.0 Updates `camel-http-starter` from 3.9.0 to 3.10.0 Updates `camel-sql-starter` from 3.9.0 to 3.10.0 Updates `camel-paho-starter` from 3.9.0 to 3.10.0 Updates `camel-file-starter` from 3.9.0 to 3.10.0 Signed-off-by: dependabot[bot] * chore: set camel-springboot.version property for Camel Springboot BOM * docs: update CHANGELOG.md Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brian-Frederik Jahnke <74709618+brianjahnke@users.noreply.github.com> * Prepare release v1.0.1 (#29) * chore: update build-image script * docs: update CHANGELOG.md * release: change project version to 1.0.1 * feat: add action for release drafter * fix: fix syntax error in release-drafter.yaml * Fix syntax error in release-drafter.yaml * Update build-image.yaml * Update dependabot.yaml * Update main.yml * Update CONTRIBUTING.md Co-authored-by: Brian-Frederik Jahnke <74709618+brianjahnke@users.noreply.github.com> Co-authored-by: Julia Pampus <72392527+juliapampus@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/dependabot.yaml | 2 +- .github/workflows/build-image.yaml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/release-drafter.yaml | 2 +- CONTRIBUTING.md | 6 ++---- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 0ac386c..79cc08a 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -4,5 +4,5 @@ updates: directory: "/" schedule: interval: "daily" - target-branch: "develop" + target-branch: "master" open-pull-requests-limit: 10 diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml index 204642d..1ca62e8 100644 --- a/.github/workflows/build-image.yaml +++ b/.github/workflows/build-image.yaml @@ -2,7 +2,7 @@ name: docker-image on: push: - branches: [ master, develop ] + branches: [ master ] tags: 'v*' release: types: [published] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6a1bc59..cd84689 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ name: Java CI with Maven on: pull_request: - branches: [ master, develop ] + branches: [ master ] concurrency: group: ${{ github.head_ref }} diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml index 1bd4c78..380e872 100644 --- a/.github/workflows/release-drafter.yaml +++ b/.github/workflows/release-drafter.yaml @@ -2,7 +2,6 @@ name: Release Drafter on: push: - # branches to consider in the event; optional, defaults to all branches: - master @@ -11,6 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: release-drafter/release-drafter@v5 + with: config-name: release-drafter.yaml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c73dc1..b167f28 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,10 +45,8 @@ developer that takes on the issue. New issues should be initially marked with `s ## Branches -This repository has a `dev` branch in addition to the `master` branch. The idea is to always -merge other branches into the `dev` branch (as SNAPSHOT version) and to push the changes from -there into the `master` only for releases. This way, the `dev` branch is always up to date, -with the risk of small issues, while the `master` only contains official releases. +This repository has a `master` branch, into which all changes from other branches are merged and where +release versions are tagged. After creating an issue yourself or if you want to address an existing issue, you have to create a branch with a unique number and name that assigns it to an issue. Therefore, follow the guidelines