From 0c11911fb786e9f6fb5370f152e4a3e488cf72d8 Mon Sep 17 00:00:00 2001
From: ekoby <7406535+ekoby@users.noreply.github.com>
Date: Tue, 28 May 2024 15:39:59 -0400
Subject: [PATCH] Consolidate springboot version (#583)

* update actions
* fix version refs
* use setup-gradle
---
 .github/dependabot.yml                |  8 +++++++-
 .github/workflows/gradle-build.yml    | 10 ++++++----
 .github/workflows/publish-release.yml |  9 ++++++---
 gradle/libs.versions.toml             |  2 ++
 ziti-springboot-client/build.gradle   |  2 +-
 ziti-springboot/build.gradle          |  6 +++---
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1ea3e929..309a637e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,6 +2,12 @@
 version: 2
 updates:
   - package-ecosystem: "gradle"
+    open-pull-requests-limit: 10
     directory: "."
     schedule:
-      interval: daily
\ No newline at end of file
+      interval: daily
+
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index bc569b73..347b9e76 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -13,15 +13,17 @@ jobs:
       BUILD_NUMBER: ${{ github.GITHUB_RUN_NUMBER }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
-          cache: gradle
-
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          dependency-graph: generate-and-submit
       - name: Check
         run: ./gradlew -S --info check
         timeout-minutes: 10
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 9725986e..846e6829 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -14,15 +14,18 @@ jobs:
       BUILD_NUMBER: ${{ github.GITHUB_RUN_NUMBER }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: temurin
-          cache: gradle
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          dependency-graph: generate-and-submit
       - name: Show Info
         run: ./gradlew :showInfo
       - name: Build with Gradle
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 50f4c176..92a21bb8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,6 +13,7 @@ gson = "2.10.1"
 tls-channel = "0.8.1"
 jjwt = "0.12.5"
 netty = "4.1.107.Final"
+springboot = "3.2.5"
 
 [libraries]
 
@@ -39,6 +40,7 @@ netty-http = { group = "io.netty", name = "netty-codec-http", version.ref = "net
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-spring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
 semver-git = { id = "io.wusa.semver-git-plugin", version.ref = "semver-git" }
diff --git a/ziti-springboot-client/build.gradle b/ziti-springboot-client/build.gradle
index 8aa688a8..d291e85b 100644
--- a/ziti-springboot-client/build.gradle
+++ b/ziti-springboot-client/build.gradle
@@ -22,7 +22,6 @@ plugins {
 
 ext {
     description "Ziti adapter for Spring Boot Client(s)"
-    springbootVersion = '3.2.4'
 }
 
 repositories {
@@ -30,6 +29,7 @@ repositories {
 }
 
 dependencies {
+    def springbootVersion = libs.versions.springboot.get()
     implementation("org.springframework.boot:spring-boot:${springbootVersion}")
     implementation("org.springframework.boot:spring-boot-autoconfigure:${springbootVersion}")
     implementation("org.springframework.boot:spring-boot-starter-web:${springbootVersion}")
diff --git a/ziti-springboot/build.gradle b/ziti-springboot/build.gradle
index 4f2389a9..51cbb2dd 100644
--- a/ziti-springboot/build.gradle
+++ b/ziti-springboot/build.gradle
@@ -19,13 +19,11 @@ plugins {
     alias(libs.plugins.dokka)
     id 'maven-publish'
 
-    id("org.jetbrains.kotlin.plugin.spring") version "1.9.23"
-
+    alias(libs.plugins.kotlin.spring)
 }
 
 ext {
     description "Ziti adapter for Spring Boot"
-    springbootVersion = '3.2.4'
 }
 
 repositories {
@@ -34,6 +32,8 @@ repositories {
 
 dependencies {
     implementation(libs.kotlin.lib)
+
+    def springbootVersion = libs.versions.springboot.get()
     implementation("org.springframework.boot:spring-boot:${springbootVersion}")
     implementation("org.springframework.boot:spring-boot-autoconfigure:${springbootVersion}")
     implementation("org.springframework.boot:spring-boot-starter-tomcat:${springbootVersion}")