Skip to content

Executable Jar Maven#752

Merged
pivovarit merged 29 commits intoeugenp:masterfrom
maibin:master
Oct 17, 2016
Merged

Executable Jar Maven#752
pivovarit merged 29 commits intoeugenp:masterfrom
maibin:master

Conversation

@maibin
Copy link
Collaborator

@maibin maibin commented Oct 16, 2016

No description provided.

michal and others added 29 commits July 15, 2016 17:37
PermitAll, hasRole, hasAnyRole etc.
I modified classes regards to Security
Conflicts:
	spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/LoggerInterceptor.java
	spring-security-rest-full/src/main/resources/webSecurityConfig.xml
Conflicts:
	spring-security-rest-full/src/main/java/org/baeldung/spring/WebConfig.java
Conflicts:
	spring-security-rest-full/src/main/java/org/baeldung/web/interceptor/UserInterceptor.java
	spring-security-rest-full/src/test/java/org/baeldung/web/interceptor/UserInterceptorTest.java
Conflicts:
	spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java
Conflicts:
	spring-thymeleaf/pom.xml
	spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
	spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCSecurity.java
Conflicts:
	spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
@pivovarit pivovarit merged commit 04482ef into eugenp:master Oct 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants