feat: upgrade to spring 2.3, gradle to 6.3 (#65)

* feat: upgrade to spring 2.3, gradle to 6.3
dietmap · Jan 30, 2023 · a2fc614 · a2fc614
1 parent 3eb380f
commit a2fc614
Show file tree

Hide file tree

Showing 10 changed files with 265 additions and 200 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,10 +6,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
+          distribution: 'adopt'
+          cache: 'gradle'
       - name: Build with Gradle
-        run: ./gradlew clean build check
+        run: ./gradlew clean build check
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -9,11 +9,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: 11
+          distribution: 'adopt'
+          cache: 'gradle'
       - name: Build & push docker image
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,11 +1,11 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	id("org.springframework.boot") version "2.2.4.RELEASE"
-	id("io.spring.dependency-management") version "1.0.9.RELEASE"
-	kotlin("jvm") version "1.3.61"
-	kotlin("plugin.spring") version "1.3.61"
-	id("com.google.cloud.tools.jib") version "1.8.0"
+	id("org.springframework.boot") version "2.3.12.RELEASE"
+	id("io.spring.dependency-management") version "1.1.0"
+	kotlin("jvm") version "1.6.21"
+	kotlin("plugin.spring") version "1.6.21"
+	id("com.google.cloud.tools.jib") version "2.8.0"
 	id("pl.allegro.tech.build.axion-release") version "1.11.0"
 	id("com.gorylenko.gradle-git-properties") version "2.2.0"
 }
@@ -38,6 +38,7 @@ dependencies {
 	implementation("org.springframework.security:spring-security-oauth2-resource-server")
 	implementation("org.springframework.boot:spring-boot-starter-webflux")
 	implementation("org.springframework:spring-webflux")
+	implementation("javax.validation:validation-api:2.0.1.Final")
 	implementation("org.springframework.retry:spring-retry:1.3.3")
 	implementation("net.logstash.logback:logstash-logback-encoder:7.2")
 
@@ -88,6 +89,6 @@ jib {
 		)
 		jvmFlags = listOf("-Djava.awt.headless=true")
 		mainClass = "com.dietmap.yaak.YaakApplicationKt"
-		ports = listOf("8080", "8778", "9090")
+		ports = listOf("8080", "8081")
 	}
-}
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists