From 674e76dd902b151b4b07b95bb37f29561b84b457 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Fri, 16 Sep 2022 13:22:44 +0200 Subject: [PATCH 1/2] Use Spring Security auto-configuration in MongoDB samples --- .../examples/config/SecurityConfig.java | 37 ------------------- .../src/main/resources/application.properties | 2 +- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/java/org/springframework/session/mongodb/examples/config/SecurityConfig.java diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/java/org/springframework/session/mongodb/examples/config/SecurityConfig.java b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/java/org/springframework/session/mongodb/examples/config/SecurityConfig.java deleted file mode 100644 index af02daafa..000000000 --- a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/java/org/springframework/session/mongodb/examples/config/SecurityConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2014-2022 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.session.mongodb.examples.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.core.userdetails.User; - -/** - * @author Rob Winch - */ -@EnableWebSecurity -public class SecurityConfig { - - @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - - auth.inMemoryAuthentication() - .withUser(User.withUsername("user").password("{noop}password").roles("USER").build()); - } - -} diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties index b8ff4f23b..54416d87f 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties +++ b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.thymeleaf.cache=false -spring.template.cache=false +spring.security.user.password=password logging.level.org.springframework.data.mongodb=DEBUG logging.level.org.springframework.session=DEBUG From be1172ba922a2153a0315d2760ea272459b7216f Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Fri, 16 Sep 2022 13:24:27 +0200 Subject: [PATCH 2/2] 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 59d108bd7..f8ae6d79d 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 178ab6d0c..fcdf91165 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 545b92f30..09b0ee5c9 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"