From 6ca7d68e8931b7db0d262ec66b192c7832304af7 Mon Sep 17 00:00:00 2001
From: 2293736867 <2293736867@qq.com>
Date: Wed, 24 Feb 2021 02:49:24 +0800
Subject: [PATCH] Update Spring Boot 2.4.3 and Gradle 6.8.2 Docker

---
 Docker/demo/.gitignore                        |   3 ++
 Docker/demo/build.gradle.kts                  |  30 +++++++++++-------
 Docker/demo/gradle/wrapper/gradle-wrapper.jar | Bin
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 Docker/demo/gradlew.bat                       |   0
 Docker/demo/settings.gradle.kts               |   0
 .../com/example/demo/DemoApplication.kt       |   2 +-
 ...application.properties => application.yml} |   0
 .../com/example/demo/DemoApplicationTests.kt  |   0
 9 files changed, 23 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 Docker/demo/.gitignore
 mode change 100755 => 100644 Docker/demo/build.gradle.kts
 mode change 100755 => 100644 Docker/demo/gradle/wrapper/gradle-wrapper.jar
 mode change 100755 => 100644 Docker/demo/gradle/wrapper/gradle-wrapper.properties
 mode change 100755 => 100644 Docker/demo/gradlew.bat
 mode change 100755 => 100644 Docker/demo/settings.gradle.kts
 mode change 100755 => 100644 Docker/demo/src/main/kotlin/com/example/demo/DemoApplication.kt
 rename Docker/demo/src/main/resources/{application.properties => application.yml} (100%)
 mode change 100755 => 100644
 mode change 100755 => 100644 Docker/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt

diff --git a/Docker/demo/.gitignore b/Docker/demo/.gitignore
old mode 100755
new mode 100644
index 84695dc..c2065bc
--- a/Docker/demo/.gitignore
+++ b/Docker/demo/.gitignore
@@ -13,6 +13,9 @@ build/
 .settings
 .springBeans
 .sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
 
 ### IntelliJ IDEA ###
 .idea
diff --git a/Docker/demo/build.gradle.kts b/Docker/demo/build.gradle.kts
old mode 100755
new mode 100644
index 02f020f..962214a
--- a/Docker/demo/build.gradle.kts
+++ b/Docker/demo/build.gradle.kts
@@ -1,16 +1,22 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "2.3.3.RELEASE"
-    id("io.spring.dependency-management") version "1.0.10.RELEASE"
-    kotlin("jvm") version "1.3.72"
-    kotlin("plugin.spring") version "1.3.72"
+    id("org.springframework.boot") version "2.4.3"
+    id("io.spring.dependency-management") version "1.0.11.RELEASE"
+    kotlin("jvm") version "1.4.30"
+    kotlin("plugin.spring") version "1.4.30"
 }
 
 group = "com.example"
-version = ""
+version = "0.0.1-SNAPSHOT"
 java.sourceCompatibility = JavaVersion.VERSION_11
 
+configurations {
+    compileOnly {
+        extendsFrom(configurations.annotationProcessor.get())
+    }
+}
+
 repositories {
     mavenCentral()
 }
@@ -20,13 +26,9 @@ dependencies {
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    testImplementation("org.springframework.boot:spring-boot-starter-test") {
-        exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
-    }
-}
-
-tasks.withType<Test> {
-    useJUnitPlatform()
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
 
 tasks.withType<KotlinCompile> {
@@ -35,3 +37,7 @@ tasks.withType<KotlinCompile> {
         jvmTarget = "11"
     }
 }
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+}
diff --git a/Docker/demo/gradle/wrapper/gradle-wrapper.jar b/Docker/demo/gradle/wrapper/gradle-wrapper.jar
old mode 100755
new mode 100644
diff --git a/Docker/demo/gradle/wrapper/gradle-wrapper.properties b/Docker/demo/gradle/wrapper/gradle-wrapper.properties
old mode 100755
new mode 100644
index 12d38de..2a56324
--- a/Docker/demo/gradle/wrapper/gradle-wrapper.properties
+++ b/Docker/demo/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Docker/demo/gradlew.bat b/Docker/demo/gradlew.bat
old mode 100755
new mode 100644
diff --git a/Docker/demo/settings.gradle.kts b/Docker/demo/settings.gradle.kts
old mode 100755
new mode 100644
diff --git a/Docker/demo/src/main/kotlin/com/example/demo/DemoApplication.kt b/Docker/demo/src/main/kotlin/com/example/demo/DemoApplication.kt
old mode 100755
new mode 100644
index f7fb544..8cbb60b
--- a/Docker/demo/src/main/kotlin/com/example/demo/DemoApplication.kt
+++ b/Docker/demo/src/main/kotlin/com/example/demo/DemoApplication.kt
@@ -14,4 +14,4 @@ class DemoApplication{
 
 fun main(args: Array<String>) {
     runApplication<DemoApplication>(*args)
-}
+}
\ No newline at end of file
diff --git a/Docker/demo/src/main/resources/application.properties b/Docker/demo/src/main/resources/application.yml
old mode 100755
new mode 100644
similarity index 100%
rename from Docker/demo/src/main/resources/application.properties
rename to Docker/demo/src/main/resources/application.yml
diff --git a/Docker/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt b/Docker/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt
old mode 100755
new mode 100644
-- 
GitLab