Merge branch 'release/v2.1.0'

Author: raeperd

.github/workflows/build.yml

@@ -25,6 +25,7 @@ jobs:
  path: ~/.gradle/caches
  key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
  restore-keys: ${{ runner.os }}-gradle
+
  - name: Build and analyze
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
@@ -33,30 +34,13 @@ jobs:
  - uses: actions/upload-artifact@v2
  with:
  path: build/libs/*.jar
- deploy:
- runs-on: ubuntu-latest
- needs: build
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-java@v1
- with:
- java-version: 11
- - name: Cache Gradle packages
- uses: actions/cache@v1
- with:
- path: ~/.gradle/caches
- key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
- restore-keys: ${{ runner.os }}-gradle
+
  - uses: docker/login-action@v1
  with:
- username: raeperd
- password: ${{ secrets.DOCKERHUB_TOKEN }}
- - name: Get branch name (merge)
- if: github.event_name != 'pull_request'
- shell: bash
- run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
- - name: Get branch name (pull request)
- if: github.event_name == 'pull_request'
- shell: bash
- run: echo "BRANCH_NAME=$(echo ${GITHUB_HEAD_REF} | tr / -)" >> $GITHUB_ENV
- - run: ./gradlew jib -Djib.to.tags=${{ env.BRANCH_NAME }}
+ registry: ghcr.io/raeperd
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - name: Get branch name
+ run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr /# -)" >> $GITHUB_ENV
+ - name: Build container image
+ run: ./gradlew jib -Djib.to.tags=${{ env.BRANCH_NAME }}

build.gradle

@@ -1,16 +1,16 @@
 plugins {
- id 'org.springframework.boot' version '2.4.4'
+ id 'org.springframework.boot' version '2.5.2'
  id 'io.spring.dependency-management' version '1.0.11.RELEASE'
  id 'java'
  id 'jacoco'
  id "io.freefair.lombok" version "5.3.3.3"
  id "org.ec4j.editorconfig" version "0.0.3"
  id "org.sonarqube" version "3.1.1"
- id 'com.google.cloud.tools.jib' version '3.0.0'
+ id 'com.google.cloud.tools.jib' version '3.1.4'
 }
 
 group = 'io.github.raeperd'
-version = '2.0.0'
+version = '2.1.0'
 sourceCompatibility = '11'
 
 repositories {
@@ -19,14 +19,14 @@ repositories {
 
 dependencies {
  implementation 'org.springframework.boot:spring-boot-starter-web'
- implementation 'org.springframework.boot:spring-boot-starter-security:2.4.5'
+ implementation 'org.springframework.boot:spring-boot-starter-security'
  implementation 'org.springframework.boot:spring-boot-starter-validation'
  implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
  runtimeOnly 'com.h2database:h2'
  testImplementation 'org.springframework.boot:spring-boot-starter-test'
  testImplementation 'org.springframework.security:spring-security-test'
- testImplementation 'org.mockito:mockito-inline:3.9.0'
+ testImplementation 'org.mockito:mockito-inline:3.12.1'
 }
 
 apply from: 'test.gradle'
@@ -58,7 +58,7 @@ jib {
  }
  }
  to {
- image = "raeperd/realworld-spring-boot-java"
+ image = "ghcr.io/raeperd/${rootProject.name}"
  }
  container {
  ports = ["8080"]