From 8d8bed2216395d7f29c9213f6aa9af14205f9a14 Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sat, 10 Aug 2019 17:53:14 +0530
Subject: [PATCH] [BAEL-15958] - Upgraded spring-security-core to Boot 2

---
 spring-security-core/pom.xml                              | 8 ++++++--
 .../src/main/java/org/baeldung/app/App.java               | 2 +-
 .../src/main/java/org/baeldung/service/TaskService.java   | 2 +-
 .../src/main/resources/application.properties             | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 spring-security-core/src/main/resources/application.properties

diff --git a/spring-security-core/pom.xml b/spring-security-core/pom.xml
index 41dea087d3..b144357e25 100644
--- a/spring-security-core/pom.xml
+++ b/spring-security-core/pom.xml
@@ -9,10 +9,10 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-1</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -36,6 +36,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
diff --git a/spring-security-core/src/main/java/org/baeldung/app/App.java b/spring-security-core/src/main/java/org/baeldung/app/App.java
index db0c9135c4..bf719b3b12 100644
--- a/spring-security-core/src/main/java/org/baeldung/app/App.java
+++ b/spring-security-core/src/main/java/org/baeldung/app/App.java
@@ -5,7 +5,7 @@ import javax.servlet.Filter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.web.filter.DelegatingFilterProxy;
diff --git a/spring-security-core/src/main/java/org/baeldung/service/TaskService.java b/spring-security-core/src/main/java/org/baeldung/service/TaskService.java
index 4a0dae3aac..4efa3b0294 100644
--- a/spring-security-core/src/main/java/org/baeldung/service/TaskService.java
+++ b/spring-security-core/src/main/java/org/baeldung/service/TaskService.java
@@ -20,7 +20,7 @@ public class TaskService {
 
     @PreFilter("hasRole('MANAGER') or filterObject.assignee == authentication.name")
     public Iterable<Task> save(Iterable<Task> entities) {
-        return taskRepository.save(entities);
+        return taskRepository.saveAll(entities);
     }
 
 }
diff --git a/spring-security-core/src/main/resources/application.properties b/spring-security-core/src/main/resources/application.properties
new file mode 100644
index 0000000000..709574239b
--- /dev/null
+++ b/spring-security-core/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file