iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade and cleanup

Browse Source
This commit is contained in:
DOHA 2016-12-05 21:56:34 +02:00
parent 5d4f0c0ae6
commit c00f163aaa
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-security-custom-permission/pom.xml
View File

@ -14,7 +14,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>1.3.8.RELEASE</version> <version>1.4.2.RELEASE</version>
</parent> </parent>
<dependencies> <dependencies>
@ -101,38 +101,38 @@
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<version>10.12.1.1</version> <version>${derby.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId> <artifactId>derbyclient</artifactId>
<version>10.12.1.1</version> <version>${derby.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId> <artifactId>derbynet</artifactId>
<version>10.12.1.1</version> <version>${derby.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId> <artifactId>derbytools</artifactId>
<version>10.12.1.1</version> <version>${derby.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>taglibs</groupId> <groupId>taglibs</groupId>
<artifactId>standard</artifactId> <artifactId>standard</artifactId>
<version>1.1.2</version> <version>${taglibs-standard.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId> <artifactId>spring-security-taglibs</artifactId>
<version>4.1.3.RELEASE</version> <version>${spring-security-taglibs.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet.jsp.jstl</groupId> <groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl-api</artifactId> <artifactId>jstl-api</artifactId>
<version>1.2</version> <version>${jstl.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -245,8 +245,12 @@
<!--<start-class>org.baeldung.voter.VoterApplication</start-class>--> <!--<start-class>org.baeldung.voter.VoterApplication</start-class>-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<derby.version>10.13.1.1</derby.version>
<taglibs-standard.version>1.1.2</taglibs-standard.version>
<spring-security-taglibs.version>4.2.0.RELEASE</spring-security-taglibs.version>
<jstl.version>1.2</jstl.version>
<rest-assured.version>2.4.0</rest-assured.version> <rest-assured.version>2.4.0</rest-assured.version>
<cargo-maven2-plugin.version>1.6.0</cargo-maven2-plugin.version> <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
</properties> </properties>
</project> </project>

3
spring-security-custom-permission/src/main/java/org/baeldung/persistence/SetupData.java
View File

@ -27,8 +27,8 @@ public class SetupData {
@PostConstruct @PostConstruct
public void init() { public void init() {
initPrivileges();
initOrganizations(); initOrganizations();
initPrivileges();
initUsers(); initUsers();
} }
@ -57,7 +57,6 @@ public class SetupData {
// //
final Organization org2 = new Organization("SecondOrg"); final Organization org2 = new Organization("SecondOrg");
organizationRepository.save(org2); organizationRepository.save(org2);
} }
private void initPrivileges() { private void initPrivileges() {

2
spring-security-custom-permission/src/main/resources/spring-security.xml
View File

@ -4,7 +4,7 @@
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation=" xsi:schemaLocation="
http://www.springframework.org/schema/security 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
http://www.springframework.org/schema/beans/spring-beans.xsd"> http://www.springframework.org/schema/beans/spring-beans.xsd">