From 3de92f48d9766fec74c53b715c9959b196526faf Mon Sep 17 00:00:00 2001 From: Sambo Chea Date: Mon, 13 Jun 2022 19:50:22 +0700 Subject: [PATCH] Updated and upgraded deps and config the props for openapi docs and modified for spring web modules --- api/build.gradle.kts | 6 +++--- .../kotlin/com/cubetiqs/web/config/OpenApiDocConfig.kt | 3 +++ .../cubetiqs/web/modules/uploader/UploaderModule.kt | 2 +- .../kotlin/com/cubetiqs/web/modules/user/UserModule.kt | 2 +- api/src/main/resources/application-demo.yml | 1 + api/src/main/resources/application.yml | 10 +++++++--- build.gradle.kts | 1 - gradle/wrapper/gradle-wrapper.properties | 4 ++-- 8 files changed, 18 insertions(+), 11 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index da963db..10dc7a1 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -8,8 +8,8 @@ plugins { kotlin("plugin.jpa") } -val kotlinVersion = "1.6.21" -val springBootVersion = "2.6.7" +val kotlinVersion = "1.7.0" +val springBootVersion = "2.7.0" // find the last commit fun getGitHashLastCommit(): String { @@ -51,7 +51,7 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") runtimeOnly("com.h2database:h2") - runtimeOnly("org.postgresql:postgresql") + // runtimeOnly("org.postgresql:postgresql") testImplementation("org.springframework.boot:spring-boot-starter-test") } diff --git a/api/src/main/kotlin/com/cubetiqs/web/config/OpenApiDocConfig.kt b/api/src/main/kotlin/com/cubetiqs/web/config/OpenApiDocConfig.kt index 4fb275d..523f701 100644 --- a/api/src/main/kotlin/com/cubetiqs/web/config/OpenApiDocConfig.kt +++ b/api/src/main/kotlin/com/cubetiqs/web/config/OpenApiDocConfig.kt @@ -12,10 +12,13 @@ import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import io.swagger.v3.oas.annotations.OpenAPIDefinition import io.swagger.v3.oas.annotations.servers.Server +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty + //import org.springdoc.core.SpringDocUtils //import org.springdoc.core.converters.models.Pageable //import javax.servlet.http.HttpServletRequest +@ConditionalOnProperty(name = ["springdoc.api-docs.enabled"], havingValue = "true") @Configuration @SecurityScheme( name = "bearerAuth", diff --git a/api/src/main/kotlin/com/cubetiqs/web/modules/uploader/UploaderModule.kt b/api/src/main/kotlin/com/cubetiqs/web/modules/uploader/UploaderModule.kt index 7ee84dd..8e4e262 100644 --- a/api/src/main/kotlin/com/cubetiqs/web/modules/uploader/UploaderModule.kt +++ b/api/src/main/kotlin/com/cubetiqs/web/modules/uploader/UploaderModule.kt @@ -2,5 +2,5 @@ package com.cubetiqs.web.modules.uploader import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty -@ConditionalOnProperty(name = ["module.uploader.enabled", "spring.datasource.enabled"], havingValue = "true") +@ConditionalOnProperty(name = ["modules.uploader.enabled", "spring.datasource.enabled"], havingValue = "true") annotation class UploaderModule \ No newline at end of file diff --git a/api/src/main/kotlin/com/cubetiqs/web/modules/user/UserModule.kt b/api/src/main/kotlin/com/cubetiqs/web/modules/user/UserModule.kt index 3ed8336..17e2468 100644 --- a/api/src/main/kotlin/com/cubetiqs/web/modules/user/UserModule.kt +++ b/api/src/main/kotlin/com/cubetiqs/web/modules/user/UserModule.kt @@ -2,5 +2,5 @@ package com.cubetiqs.web.modules.user import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty -@ConditionalOnProperty(name = ["module.user.enabled", "spring.datasource.enabled"], havingValue = "true") +@ConditionalOnProperty(name = ["modules.user.enabled", "spring.datasource.enabled"], havingValue = "true") annotation class UserModule \ No newline at end of file diff --git a/api/src/main/resources/application-demo.yml b/api/src/main/resources/application-demo.yml index e69de29..e8501c6 100644 --- a/api/src/main/resources/application-demo.yml +++ b/api/src/main/resources/application-demo.yml @@ -0,0 +1 @@ +# Custom props with dev's profile \ No newline at end of file diff --git a/api/src/main/resources/application.yml b/api/src/main/resources/application.yml index 0621ebc..9cf6b43 100644 --- a/api/src/main/resources/application.yml +++ b/api/src/main/resources/application.yml @@ -28,8 +28,12 @@ spring: jpa: hibernate: ddl-auto: ${JPA_HIBERNATE_DDL_AUTO:update} - -module: + open-in-view: ${JPA_OPEN_IN_VIEW:false} + data: + redis: + repositories: + enabled: ${DATA_REDIS_REPOSITORIES_ENABLED:false} +modules: user: enabled: ${MODULE_USER_ENABLED:true} uploader: @@ -50,6 +54,6 @@ logging: springdoc: api-docs: - enabled: true + enabled: ${API_DOCS_ENABLED:true} swagger-ui: path: /swagger-ui diff --git a/build.gradle.kts b/build.gradle.kts index 34276c6..0f77dc7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,6 @@ allprojects { tasks.withType { sourceCompatibility = javaVersion - targetCompatibility = javaVersion } tasks.withType { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 72e3dee..4605298 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://mirror.ctdn.net/gradle/gradle-7.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStorePath=wrapper/dists \ No newline at end of file