Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor spring version dependency #2659

Merged
merged 1 commit into from
Dec 28, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ versions.apacheDsVersion = "2.0.0.AM27"
versions.bouncyCastleVersion = "1.77"
versions.hamcrestVersion = "2.2"
versions.springBootVersion = "2.7.18"
versions.springFrameworkVersion = "5.3.31"
versions.springSecurityVersion = "5.7.11"
versions.springSecurityJwtVersion = "1.1.1.RELEASE"
versions.springSecurityOAuthVersion = "2.5.2.RELEASE"
versions.springSecuritySamlVersion = "1.0.10.RELEASE"
Expand All @@ -25,6 +27,8 @@ ext["snakeyaml.version"] = "2.2" // manual update, see because of missing in spr
ext["jackson-bom.version"] = "${versions.jacksonVersion}" // Bumping to latest version because of compatiblity to snakeyaml 2.0
ext["hsqldb.version"] = "2.7.2" // HSQL-DB used for tests but not supported for productive usage
ext["selenium.version"] = "${versions.seleniumVersion}" // Selenium for integration tests only
ext["spring-framework.version"] = "${versions.springFrameworkVersion}" // Maintain spring until upgrade to spring boot 3.x, https://github.com/cloudfoundry/uaa/issues/2115
ext["spring-security.version"] = "${versions.springSecurityVersion}" // Maintain spring until upgrade to spring boot 3.x, https://github.com/cloudfoundry/uaa/issues/2115

ext {
tomcatCargoVersion = "${versions.tomcatCargoVersion}"
Expand Down Expand Up @@ -80,35 +84,35 @@ libraries.seleniumHttp = "org.seleniumhq.selenium:selenium-http-jdk-client:${ver
libraries.slf4jApi = "org.slf4j:slf4j-api"
libraries.slf4jImpl = "org.apache.logging.log4j:log4j-slf4j-impl"
libraries.snakeyaml = "org.yaml:snakeyaml"
libraries.springBeans = "org.springframework:spring-beans"
libraries.springBeans = "org.springframework:spring-beans:${versions.springFrameworkVersion}"
libraries.springBootBom = "org.springframework.boot:spring-boot-dependencies:${versions.springBootVersion}"
libraries.springBootStarter = "org.springframework.boot:spring-boot-starter"
libraries.springBootStarterLog4j2 = "org.springframework.boot:spring-boot-starter-log4j2"
libraries.springBootStarterTest = "org.springframework.boot:spring-boot-starter-test"
libraries.springBootStarterTomcat = "org.springframework.boot:spring-boot-starter-tomcat"
libraries.springBootStarterWeb = "org.springframework.boot:spring-boot-starter-web"
libraries.springBootStarterMail = "org.springframework.boot:spring-boot-starter-mail"
libraries.springContext = "org.springframework:spring-context"
libraries.springContextSupport = "org.springframework:spring-context-support"
libraries.springJdbc = "org.springframework:spring-jdbc"
libraries.springContext = "org.springframework:spring-context:${versions.springFrameworkVersion}"
libraries.springContextSupport = "org.springframework:spring-context-support:${versions.springFrameworkVersion}"
libraries.springJdbc = "org.springframework:spring-jdbc:${versions.springFrameworkVersion}"
libraries.springLdapCore = "org.springframework.ldap:spring-ldap-core"
libraries.springLdapCoreTiger = "org.springframework.ldap:spring-ldap-core-tiger"
libraries.springRestdocs = "org.springframework.restdocs:spring-restdocs-mockmvc"
libraries.springRetry = "org.springframework.retry:spring-retry"
libraries.springSecurityConfig = "org.springframework.security:spring-security-config"
libraries.springSecurityCore = "org.springframework.security:spring-security-core"
libraries.springSecurityConfig = "org.springframework.security:spring-security-config:${versions.springSecurityVersion}"
libraries.springSecurityCore = "org.springframework.security:spring-security-core:${versions.springSecurityVersion}"
libraries.springSecurityJwt = "org.springframework.security:spring-security-jwt:${versions.springSecurityJwtVersion}"
libraries.springSecurityLdap = "org.springframework.security:spring-security-ldap"
libraries.springSecurityLdap = "org.springframework.security:spring-security-ldap:${versions.springSecurityVersion}"
libraries.springSecurityOauth = "org.springframework.security.oauth:spring-security-oauth2:${versions.springSecurityOAuthVersion}"
libraries.springSecuritySaml = "org.springframework.security.extensions:spring-security-saml2-core:${versions.springSecuritySamlVersion}"
libraries.springSecurityTaglibs = "org.springframework.security:spring-security-taglibs"
libraries.springSecurityTest = "org.springframework.security:spring-security-test"
libraries.springSecurityWeb = "org.springframework.security:spring-security-web"
libraries.springSecurityTaglibs = "org.springframework.security:spring-security-taglibs:${versions.springSecurityVersion}"
libraries.springSecurityTest = "org.springframework.security:spring-security-test:${versions.springSecurityVersion}"
libraries.springSecurityWeb = "org.springframework.security:spring-security-web:${versions.springSecurityVersion}"
libraries.springSessionJdbc = "org.springframework.session:spring-session-jdbc"
libraries.springTest = "org.springframework:spring-test"
libraries.springTx = "org.springframework:spring-tx"
libraries.springWeb = "org.springframework:spring-web"
libraries.springWebMvc = "org.springframework:spring-webmvc"
libraries.springTest = "org.springframework:spring-test:${versions.springFrameworkVersion}"
libraries.springTx = "org.springframework:spring-tx:${versions.springFrameworkVersion}"
libraries.springWeb = "org.springframework:spring-web:${versions.springFrameworkVersion}"
libraries.springWebMvc = "org.springframework:spring-webmvc:${versions.springFrameworkVersion}"
libraries.statsdClient = "com.timgroup:java-statsd-client:3.1.0"
libraries.thymeleafDialect = "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
libraries.thymeleafExtrasSpringSecurity5 = "org.thymeleaf.extras:thymeleaf-extras-springsecurity5"
Expand Down