From cb6f5c958831fe469eb4bc55ba10ed09dbb432cd Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Fri, 16 Sep 2022 13:24:27 +0200 Subject: [PATCH] Align dependency versions in samples This commit aligns dependency versions used across different samples application by leveraging Spring Boot's BOM, rather than manually managing dependency versions for samples that are not Spring Boot based. --- .../gradle/dependency-management.gradle | 9 +-------- .../spring-session-sample-javaconfig-hazelcast.gradle | 1 - .../spring-session-sample-javaconfig-security.gradle | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 59d108bd..f8ae6d79 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -1,17 +1,10 @@ dependencyManagement { imports { - mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.1' + mavenBom "org.springframework.boot:spring-boot-dependencies:$springBootVersion" } dependencies { - dependency 'ch.qos.logback:logback-classic:1.2.10' dependency 'com.maxmind.geoip2:geoip2:2.16.1' - dependency 'jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:2.0.0' - dependency 'jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.0.0' - dependency 'org.glassfish.web:jakarta.servlet.jsp.jstl:2.0.0' - dependency 'org.seleniumhq.selenium:htmlunit-driver:3.61.0' - dependency 'org.slf4j:jcl-over-slf4j:1.7.33' - dependency 'org.slf4j:log4j-over-slf4j:1.7.33' dependency 'org.webjars:bootstrap:2.3.2' dependency 'org.webjars:html5shiv:3.7.3-1' dependency 'org.webjars:jquery:3.6.0' diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle index 178ab6d0..fcdf9116 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle @@ -15,7 +15,6 @@ dependencies { implementation "ch.qos.logback:logback-classic" providedCompile "jakarta.servlet:jakarta.servlet-api" - providedCompile "jakarta.servlet.jsp:jakarta.servlet.jsp-api" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" testImplementation "org.assertj:assertj-core" diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle index 545b92f3..09b0ee5c 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle +++ b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle @@ -16,7 +16,6 @@ dependencies { implementation "org.testcontainers:testcontainers" providedCompile "jakarta.servlet:jakarta.servlet-api" - providedCompile "jakarta.servlet.jsp:jakarta.servlet.jsp-api" providedCompile "org.glassfish.web:jakarta.servlet.jsp.jstl" testImplementation "org.assertj:assertj-core"