Merge dev to master (#30)

* setup github actions workflow (#1) * setup github actions workflow * fix: remove tag from Javadoc Co-authored-by: Ronja Quensel <[email protected]> * 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 <[email protected]> * 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](jacoco/jacoco@v0.8.6...v0.8.7) Signed-off-by: dependabot[bot] <[email protected]> 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](spotbugs/spotbugs-maven-plugin@spotbugs-maven-plugin-4.2.0...spotbugs-maven-plugin-4.2.3) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ronja Quensel <[email protected]> * 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](apache/maven-enforcer@enforcer-3.0.0-M2...enforcer-3.0.0-M3) Signed-off-by: dependabot[bot] <[email protected]> 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](pgjdbc/pgjdbc@REL42.2.19...REL42.2.20) Signed-off-by: dependabot[bot] <[email protected]> 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](spring-projects/spring-boot@v2.4.4...v2.4.5) Signed-off-by: dependabot[bot] <[email protected]> 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] <[email protected]> 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](apache/maven-project-info-reports-plugin@maven-project-info-reports-plugin-3.1.1...maven-project-info-reports-plugin-3.1.2) Signed-off-by: dependabot[bot] <[email protected]> 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 <[email protected]> * Update issue templates (#2) * Update issue templates * Create config.yml Co-authored-by: Brian-Frederik Jahnke <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: Brian-Frederik Jahnke <[email protected]> Co-authored-by: Julia Pampus <[email protected]> Co-authored-by: Brian-Frederik Jahnke <[email protected]> Co-authored-by: Julia Pampus <[email protected]> * 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](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.2.0...maven-javadoc-plugin-3.3.0) Signed-off-by: dependabot[bot] <[email protected]> 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](spring-projects/spring-boot@v2.4.5...v2.5.0) Signed-off-by: dependabot[bot] <[email protected]> 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] <[email protected]> * 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 <[email protected]> * 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 Co-authored-by: Brian-Frederik Jahnke <[email protected]> Co-authored-by: Julia Pampus <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
FraunhoferISST · Jun 8, 2021 · 79f92b5 · 79f92b5
1 parent 74673ce
commit 79f92b5
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 62 deletions.
diff --git a/.github/release-drafter.yaml b/.github/release-drafter.yaml
@@ -0,0 +1,31 @@
+name-template: 'v$RESOLVED_VERSION 🌈'
+tag-template: 'v$RESOLVED_VERSION'
+categories:
+  - title: '🚀 Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🧰 Maintenance'
+    label: 'chore'
+change-template: '- $TITLE'
+change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+  patch:
+    labels:
+      - 'patch'
+  default: patch
+template: |
+  ## Changes
+
+  $CHANGES
diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
@@ -1,16 +1,16 @@
 name: docker-image
 
 on:
-   push:
+  push:
     branches: [ master, develop ]
     tags: 'v*'
-   release:
-     types: [published]
-      
+  release:
+    types: [published]
+
 env:
   REGISTRY: ${{ secrets.IMAGE_REGISTRY }}
   OWNER: ${{ secrets.REPO_USER }}
-    
+
 jobs:
   docker:
     timeout-minutes: 30
@@ -24,60 +24,64 @@ jobs:
         id: get_repo
         run: echo ::set-output name=IMAGE::"$REGISTRY/$OWNER/dsc-camel-instance"
       -
-       name: Find tag
-       id: get_tag
-       run: echo ::set-output name=TAG::${GITHUB_REF/refs\/tags\//}
-       if: startsWith(github.ref, 'refs/tags')
+        name: Find tag
+        id: get_tag
+        run: |
+          echo ${GITHUB_REF#refs/tags/}
+          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: Find branch name
+        id: get_branch
+        run: |
+          # to lowercase
+          TMP=$(git rev-parse --abbrev-ref HEAD)
+          TMP=$(echo "$TMP" | tr '[:upper:]' '[:lower:]')
+          echo $TMP
+          echo ::set-output name=BRANCH::$TMP
       -
-       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: 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: 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 tagged image
+        run: |
+          echo $IMAGE
+          echo $BRANCH
+          echo $TAG
+          TMP=$TAG
+          if [[ $TMP == v* ]]
+          then
+            # Its a version tag
+            TMP=${TAG:1:${#TAG}}
+            echo "Found a version tag"
+            docker tag $IMAGE:$BRANCH $IMAGE:latest
+            docker push $IMAGE:latest
+          fi
+          # Has tag
+          docker tag $IMAGE:$BRANCH $IMAGE:$TMP
+          docker push $IMAGE:$TMP
+        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 }}
+        name: Push branch image
+        run: |
+          docker push $IMAGE:$BRANCH
+        if: startsWith(github.ref, 'refs/heads')
+        env:
+          IMAGE: ${{ steps.get_repo.outputs.IMAGE }}
+          BRANCH: ${{ steps.get_branch.outputs.BRANCH }}
diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml
@@ -0,0 +1,16 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+          config-name: release-drafter.yaml
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.0.1] 
+
+### Changed
+
+- Change Camel Spring Boot version to 3.10.0.
+- Change Spring Boot version to 2.5.0.
+
 ## [1.0.0] - 2021-04-30
 
 ### Added

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>2.5.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -36,7 +36,7 @@
 
     <properties>
         <!-- General -->
-        <revision>1.0.0</revision>
+        <revision>1.0.1</revision>
         <email>[email protected]</email>
 
         <!-- Build info -->
@@ -45,14 +45,14 @@
         <maven.minimum.version>3.3.9</maven.minimum.version>
 
         <!-- Dependencies -->
-        <camel-springboot.version>3.9.0</camel-springboot.version>
+        <camel-springboot.version>3.10.0</camel-springboot.version>
         <postgres.version>42.2.20</postgres.version>
         <tidy.version>1.1.0</tidy.version>
         <objenesis.version>3.2</objenesis.version>
 
         <!-- Plugins -->
         <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version>
-        <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
         <maven-site-plugin.version>3.9.1</maven-site-plugin.version>
         <maven-project-info-reports-plugin.version>3.1.2</maven-project-info-reports-plugin.version>
@@ -180,7 +180,7 @@
             <dependency>
                 <groupId>org.apache.camel.springboot</groupId>
                 <artifactId>camel-spring-boot-bom</artifactId>
-                <version>3.9.0</version>
+                <version>${camel-springboot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>