Updated and upgraded deps and config the props for openapi docs and modified for spring web modules
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Sambo Chea 2022-06-13 19:50:22 +07:00
parent a9a52132a4
commit 3de92f48d9
Signed by: sombochea
GPG Key ID: 3C7CF22A05D95490
8 changed files with 18 additions and 11 deletions

View File

@ -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")
}

View File

@ -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",

View File

@ -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

View File

@ -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

View File

@ -0,0 +1 @@
# Custom props with dev's profile

View File

@ -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

View File

@ -20,7 +20,6 @@ allprojects {
tasks.withType<JavaCompile> {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
}
tasks.withType<KotlinCompile> {

View File

@ -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