diff --git a/spring-security-custom-permission/pom.xml b/spring-security-custom-permission/pom.xml index 288cc3d6ba..b28c0877c4 100644 --- a/spring-security-custom-permission/pom.xml +++ b/spring-security-custom-permission/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.3.8.RELEASE + 1.4.2.RELEASE @@ -101,38 +101,38 @@ org.apache.derby derby - 10.12.1.1 + ${derby.version} org.apache.derby derbyclient - 10.12.1.1 + ${derby.version} org.apache.derby derbynet - 10.12.1.1 + ${derby.version} org.apache.derby derbytools - 10.12.1.1 + ${derby.version} taglibs standard - 1.1.2 + ${taglibs-standard.version} org.springframework.security spring-security-taglibs - 4.1.3.RELEASE + ${spring-security-taglibs.version} javax.servlet.jsp.jstl jstl-api - 1.2 + ${jstl.version} @@ -245,8 +245,12 @@ UTF-8 1.8 + 10.13.1.1 + 1.1.2 + 4.2.0.RELEASE + 1.2 2.4.0 - 1.6.0 + 1.6.1 diff --git a/spring-security-custom-permission/src/main/java/org/baeldung/persistence/SetupData.java b/spring-security-custom-permission/src/main/java/org/baeldung/persistence/SetupData.java index 47616ca61a..631c8dfc58 100644 --- a/spring-security-custom-permission/src/main/java/org/baeldung/persistence/SetupData.java +++ b/spring-security-custom-permission/src/main/java/org/baeldung/persistence/SetupData.java @@ -27,8 +27,8 @@ public class SetupData { @PostConstruct public void init() { - initPrivileges(); initOrganizations(); + initPrivileges(); initUsers(); } @@ -57,7 +57,6 @@ public class SetupData { // final Organization org2 = new Organization("SecondOrg"); organizationRepository.save(org2); - } private void initPrivileges() { diff --git a/spring-security-custom-permission/src/main/resources/spring-security.xml b/spring-security-custom-permission/src/main/resources/spring-security.xml index 382dbf5dff..83bc14dda7 100644 --- a/spring-security-custom-permission/src/main/resources/spring-security.xml +++ b/spring-security-custom-permission/src/main/resources/spring-security.xml @@ -4,7 +4,7 @@ xmlns:beans="http://www.springframework.org/schema/beans" xsi:schemaLocation=" http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-4.0.xsd + http://www.springframework.org/schema/security/spring-security-4.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">