Browse Source

Merge branch '1.0.x'

pull/1105/head
Joe Grandja 3 years ago
parent
commit
911ceba36b
  1. 2
      buildSrc/build.gradle
  2. 4
      dependencies/spring-authorization-server-dependencies.gradle
  3. 8
      gradle.properties

2
buildSrc/build.gradle

@ -23,5 +23,5 @@ dependencies { @@ -23,5 +23,5 @@ dependencies {
implementation "org.hidetake:gradle-ssh-plugin:2.10.1"
implementation "org.jfrog.buildinfo:build-info-extractor-gradle:4.26.1"
implementation "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1"
implementation "org.springframework:spring-core:6.0.0"
implementation "org.springframework:spring-core:6.0.5"
}

4
dependencies/spring-authorization-server-dependencies.gradle vendored

@ -9,11 +9,11 @@ javaPlatform { @@ -9,11 +9,11 @@ javaPlatform {
dependencies {
api platform("org.springframework:spring-framework-bom:$springFrameworkVersion")
api platform("org.springframework.security:spring-security-bom:$springSecurityVersion")
api platform("com.fasterxml.jackson:jackson-bom:2.14.0")
api platform("com.fasterxml.jackson:jackson-bom:2.14.2")
constraints {
api "com.nimbusds:nimbus-jose-jwt:9.24.4"
api "jakarta.servlet:jakarta.servlet-api:6.0.0"
api "org.junit.jupiter:junit-jupiter:5.9.1"
api "org.junit.jupiter:junit-jupiter:5.9.2"
api "org.assertj:assertj-core:3.23.1"
api "org.mockito:mockito-core:4.8.1"
api "com.squareup.okhttp3:mockwebserver:4.10.0"

8
gradle.properties

@ -2,10 +2,10 @@ version=1.1.0-SNAPSHOT @@ -2,10 +2,10 @@ version=1.1.0-SNAPSHOT
org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
org.gradle.parallel=true
org.gradle.caching=true
springFrameworkVersion=6.0.0
springSecurityVersion=6.0.0
springJavaformatVersion=0.0.31
springFrameworkVersion=6.0.5
springSecurityVersion=6.0.2
springJavaformatVersion=0.0.35
springJavaformatExcludePackages=org/springframework/security/config org/springframework/security/oauth2
checkstyleToolVersion=8.34
nohttpCheckstyleVersion=0.0.10
nohttpCheckstyleVersion=0.0.11
jacocoToolVersion=0.8.7

Loading…
Cancel
Save