Merge pull request #9006 from kwoyke/JAVA-42

JAVA-42: Move all spring-security-... modules to Boot 2

spring-security-modules/spring-security-acl/pom.xml

@@ -10,9 +10,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-security-modules/spring-security-cache-control/pom.xml

@@ -8,9 +8,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -23,41 +23,15 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.security</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-security-core</artifactId>
+            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax.servlet-api.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.hamcrest</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>hamcrest</artifactId>
+            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

spring-security-modules/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java

@@ -4,8 +4,8 @@ import static io.restassured.RestAssured.given;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.context.embedded.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import io.restassured.http.ContentType;

spring-security-modules/spring-security-kerberos/pom.xml

@@ -10,9 +10,9 @@
 	
 	<parent>
 		<groupId>com.baeldung</groupId>
-		<artifactId>parent-boot-1</artifactId>
+		<artifactId>parent-boot-2</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../../parent-boot-1</relativePath>
+		<relativePath>../../parent-boot-2</relativePath>
 	</parent>
 	
 	<dependencies>

spring-security-modules/spring-security-ldap/pom.xml

@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -21,6 +21,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>

spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/SampleLDAPApplication.java

@@ -2,7 +2,7 @@ package com.baeldung;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@@ -19,15 +19,4 @@ public class SampleLDAPApplication extends SpringBootServletInitializer {
         SpringApplication.run(SampleLDAPApplication.class, args);
     }
 
-    @Bean
-    public WebMvcConfigurerAdapter adapter() {
-        return new WebMvcConfigurerAdapter() {
-            @Override
-            public void addViewControllers(ViewControllerRegistry registry) {
-                registry.addViewController("/login")
-                    .setViewName("login");
-            }
-        };
-    }
-
 }

spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/config/SecurityConfig.java

@@ -1,4 +1,4 @@
-package com.baeldung.security;
+package com.baeldung.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
@@ -14,13 +14,26 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.ldapAuthentication().userSearchBase("ou=people").userSearchFilter("(uid={0})").groupSearchBase("ou=groups").groupSearchFilter("(member={0})").contextSource().root("dc=baeldung,dc=com").ldif("classpath:users.ldif");
+        auth.ldapAuthentication()
+                .userSearchBase("ou=people")
+                .userSearchFilter("(uid={0})")
+                .groupSearchBase("ou=groups")
+                .groupSearchFilter("(member={0})")
+                .contextSource()
+                .root("dc=baeldung,dc=com")
+                .ldif("classpath:users.ldif");
     }
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().antMatchers("/", "/home").permitAll().anyRequest().authenticated();
+        http
-        http.formLogin().loginPage("/login").permitAll().and().logout().logoutSuccessUrl("/");
+                .authorizeRequests()
+                .antMatchers("/", "/home", "/css/**")
+                .permitAll()
+                .anyRequest()
+                .authenticated()
+                .and().formLogin().loginPage("/login").permitAll()
+                .and().logout().logoutSuccessUrl("/");
     }
 
 }

spring-security-modules/spring-security-ldap/src/main/java/com/baeldung/config/WebConfig.java

@@ -0,0 +1,16 @@
+package com.baeldung.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addViewControllers(ViewControllerRegistry registry) {
+        registry.addViewController("/login")
+                .setViewName("login");
+    }
+}

spring-security-modules/spring-security-ldap/src/main/resources/application.properties

@@ -0,0 +1 @@
+management.health.ldap.enabled=false

spring-security-modules/spring-security-ldap/src/main/resources/webSecurityConfig.xml

@@ -10,6 +10,7 @@
     <http auto-config="true" use-expressions="true">
         <intercept-url pattern="/" access="permitAll"/>
         <intercept-url pattern="/home" access="permitAll"/>
+        <intercept-url pattern="/css/**" access="permitAll"/>
         <intercept-url pattern="/login" access="permitAll"/>
         <intercept-url pattern="/secure" access="isAuthenticated()"/>
         

spring-security-modules/spring-security-x509/pom.xml

@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-1</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <modules>

spring-security-modules/spring-security-x509/spring-security-x509-basic-auth/src/main/resources/application.properties

@@ -1,8 +1,8 @@
-server.ssl.key-store=../keystore/keystore.jks
+server.ssl.key-store=keystore/keystore.jks
 server.ssl.key-store-password=changeit
 server.ssl.key-alias=localhost
 server.ssl.key-password=changeit
 server.ssl.enabled=true
 server.port=8443
-security.user.name=Admin
+spring.security.user.name=Admin
-security.user.password=admin
+spring.security.user.password=admin

spring-security-modules/spring-security-x509/spring-security-x509-client-auth/src/main/resources/application.properties

@@ -4,8 +4,8 @@ server.ssl.key-alias=localhost
 server.ssl.key-password=changeit
 server.ssl.enabled=true
 server.port=8443
-security.user.name=Admin
+spring.security.user.name=Admin
-security.user.password=admin
+spring.security.user.password=admin
 server.ssl.trust-store=../keystore/truststore.jks
 server.ssl.trust-store-password=changeit
 server.ssl.client-auth=need