fix issues after merge

spring-jpa/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="wst.jsdt.web" version="1.0"/>
+  <fixed facet="wst.jsdt.web"/>
   <installed facet="java" version="1.8"/>
-  <installed facet="jpt.jpa" version="2.1"/>
   <installed facet="jst.web" version="3.1"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="jpt.jpa" version="2.1"/>
 </faceted-project>

spring-jpa/pom.xml

@@ -268,7 +268,7 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.security.version>4.0.4.RELEASE</org.springframework.security.version>
+        <org.springframework.security.version>4.1.3.RELEASE</org.springframework.security.version>
         <org.springframework.version>4.3.2.RELEASE</org.springframework.version>
         <javassist.version>3.20.0-GA</javassist.version>
 

spring-jpa/src/main/java/org/baeldung/custom/config/PersistenceDerbyJPAConfig.java

@@ -75,6 +75,8 @@ public class PersistenceDerbyJPAConfig {
         final Properties hibernateProperties = new Properties();
         hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
         hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
+        hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", env.getProperty("hibernate.cache.use_second_level_cache"));
+        hibernateProperties.setProperty("hibernate.cache.use_query_cache", env.getProperty("hibernate.cache.use_query_cache"));
         // hibernateProperties.setProperty("hibernate.globally_quoted_identifiers", "true");
         return hibernateProperties;
     }

spring-jpa/src/main/java/org/baeldung/user/service/MyUserService.java

@@ -1,13 +1,12 @@
 package org.baeldung.user.service;
 
-import javax.transaction.Transactional;
-
 import org.baeldung.persistence.model.MyUser;
 import org.baeldung.user.dao.MyUserDAO;
 import org.baeldung.web.MyUserDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Transactional

spring-jpa/src/main/resources/persistence-derby.properties

@@ -7,4 +7,6 @@ jdbc.pass=tutorialpass
 # hibernate.X
 hibernate.dialect=org.hibernate.dialect.DerbyDialect
 hibernate.show_sql=false
-hibernate.hbm2ddl.auto=create
+hibernate.hbm2ddl.auto=create
+hibernate.cache.use_second_level_cache=false
+hibernate.cache.use_query_cache=false

spring-jpa/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml

@@ -5,7 +5,7 @@
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:security="http://www.springframework.org/schema/security"
 	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.0.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-4.1.xsd
 		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd
@@ -65,6 +65,8 @@
             <props>
                 <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
                 <prop key="hibernate.dialect">${hibernate.dialect}</prop>
+                <prop key="hibernate.cache.use_second_level_cache">${hibernate.cache.use_second_level_cache}</prop>
+                <prop key="hibernate.cache.use_query_cache">${hibernate.cache.use_query_cache}</prop>
             </props>
         </property>
     </bean>