diff --git a/README.md b/README.md index f8e276d..570ab47 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # GraphQL & Spring Boot (Demo Project) -- Spring Boot (2.6) -- DGS Framework (4.5.0) -- Kotlin (1.5.21) +- Spring Boot (2.7) +- DGS Framework (4.10.4) +- Kotlin (1.6.21) # Contributors - Sambo Chea \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 48cca32..c4d76dd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,13 +11,13 @@ plugins { allprojects { repositories { - maven { url = uri("https://m.ctdn.net") } + mavenCentral() } group = "com.cubetiqs" version = "0.0.1-SNAPSHOT" - val javaVersion = "11" + val javaVersion = "17" tasks.withType { sourceCompatibility = javaVersion diff --git a/dgs-graphql/build.gradle.kts b/dgs-graphql/build.gradle.kts index a6088e6..7b403de 100644 --- a/dgs-graphql/build.gradle.kts +++ b/dgs-graphql/build.gradle.kts @@ -7,13 +7,12 @@ plugins { id("com.netflix.dgs.codegen") } -extra["dgsVersion"] = "4.5.0" - dependencies { api(project(":cubetiq-security-jwt")) - implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:${property("dgsVersion")}") - runtimeOnly("com.netflix.graphql.dgs:graphql-dgs-subscriptions-websockets-autoconfigure:${property("dgsVersion")}") + implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:4.10.4")) + implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter") + runtimeOnly("com.netflix.graphql.dgs:graphql-dgs-subscriptions-websockets-autoconfigure") implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-actuator") diff --git a/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebSecurityConfig.kt b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebSecurityConfig.kt index 9eda151..10fb1fe 100644 --- a/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebSecurityConfig.kt +++ b/dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebSecurityConfig.kt @@ -9,6 +9,7 @@ import org.springframework.security.config.annotation.method.configuration.Enabl import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter +import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer import org.springframework.security.config.http.SessionCreationPolicy @Configuration diff --git a/dgs-graphql/src/main/resources/.gitignore b/dgs-graphql/src/main/resources/.gitignore new file mode 100644 index 0000000..105c9d4 --- /dev/null +++ b/dgs-graphql/src/main/resources/.gitignore @@ -0,0 +1 @@ +application-local.yml \ No newline at end of file diff --git a/dgs-graphql/src/main/resources/application.yml b/dgs-graphql/src/main/resources/application.yml index 959c78a..87cd9a1 100644 --- a/dgs-graphql/src/main/resources/application.yml +++ b/dgs-graphql/src/main/resources/application.yml @@ -3,6 +3,8 @@ server: # Spring Boot spring: + profiles: + active: ${APP_PROFILE:} datasource: url: jdbc:postgresql://${DB_HOST:localhost}:5432/${DB_NAME:graphql-demo} username: ${DB_USER:your-username} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc..00e33ed 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\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 7bfbdfb..0205eff 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "graphql-demo" +rootProject.name = "spring-graphql-demo" include("dgs-graphql") include("cubetiq-security-jwt") \ No newline at end of file