diff --git a/Docker/demo/.gitignore b/Docker/demo/.gitignore old mode 100755 new mode 100644 index 84695dca6f17aa4b4a227875433580b67ad91a29..c2065bc26202b2d072aca3efc3d1c2efad3afcbf --- 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 02f020f257eb28c1f776c8eb0bc2c15806e37f4b..962214acd32dbd6c276bc7045747399f80912cc1 --- 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 { - 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 { @@ -35,3 +37,7 @@ tasks.withType { jvmTarget = "11" } } + +tasks.withType { + 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 12d38de6a487379bb3664c6ac06e21443d977e2e..2a563242c11316831a57f9a5df4bfab13a1d21e3 --- 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 f7fb54443312bf3bd53a329a2c13a9fb75c1f94b..8cbb60b3ef4a4d4818ce256ac2e94ab1117720ec --- 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) { runApplication(*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