Standardize Build
The build now uses spring build conventions to simplify the build Fixes gh-4284
This commit is contained in:
@@ -1,9 +0,0 @@
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-core'),
|
||||
project(':spring-security-config')
|
||||
|
||||
aspectpath project(':spring-security-aspects')
|
||||
|
||||
runtime project(':spring-security-aspects')
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample'
|
||||
apply plugin: 'aspectj'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
|
||||
aspectpath project(':spring-security-aspects')
|
||||
|
||||
runtime project(':spring-security-aspects')
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
|
||||
|
||||
runtime 'ch.qos.logback:logback-classic'
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
dependencies {
|
||||
compile project(':spring-security-data'),
|
||||
project(':spring-security-config'),
|
||||
"org.springframework.data:spring-data-jpa:$springDataJpaVersion",
|
||||
"org.eclipse.persistence:javax.persistence:$javaPersistenceVersion",
|
||||
"org.hibernate:hibernate-entitymanager:$hibernateVersion",
|
||||
"org.hsqldb:hsqldb:$hsqlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-data')
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.eclipse.persistence:javax.persistence'
|
||||
compile 'org.hibernate:hibernate-entitymanager'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.hsqldb:hsqldb'
|
||||
compile 'org.springframework.data:spring-data-jpa'
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion",
|
||||
"com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'com.fasterxml.jackson.core:jackson-databind'
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -17,6 +17,7 @@ package org.springframework.security.samples.mvc;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
@@ -51,9 +52,9 @@ public class MessageJsonController {
|
||||
}
|
||||
|
||||
@RequestMapping("{id}")
|
||||
public ResponseEntity<Message> view(@PathVariable Long id) {
|
||||
Message message = messageRepository.findOne(id);
|
||||
return new ResponseEntity<Message>(message, HttpStatus.OK);
|
||||
public ResponseEntity<Optional<Message>> view(@PathVariable Long id) {
|
||||
Optional<Message> message = messageRepository.findOne(id);
|
||||
return new ResponseEntity<>(message, HttpStatus.OK);
|
||||
}
|
||||
|
||||
@RequestMapping(method = RequestMethod.POST, consumes = "application/json")
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
|
||||
testCompile project(":spring-security-test")
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
|
||||
testCompile project(':spring-security-test')
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-web"),
|
||||
jstlDependencies,
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion"
|
||||
|
||||
runtime "ch.qos.logback:logback-classic:$logbackVersion"
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-web')
|
||||
compile jstlDependencies
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
|
||||
testCompile project(":spring-security-test")
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
|
||||
testCompile project(':spring-security-test')
|
||||
}
|
||||
@@ -1,27 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-ldap"),
|
||||
apachedsDependencies,
|
||||
project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-ldap')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile apachedsDependencies
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
|
||||
integrationTestCompile gebDependencies
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
sonarqube.skipProject = true
|
||||
|
||||
dependencies {
|
||||
provided "javax.servlet:javax.servlet-api:$servletApiVersion"
|
||||
|
||||
compile project(":spring-security-web"),
|
||||
project(":spring-security-config"),
|
||||
"org.hsqldb:hsqldb:$hsqlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion",
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-orm:$springVersion",
|
||||
"org.springframework:spring-context:$springVersion",
|
||||
"org.springframework:spring-aop:$springVersion",
|
||||
"org.springframework:spring-tx:$springVersion",
|
||||
"org.springframework:spring-beans:$springVersion",
|
||||
"org.springframework:spring-instrument:$springVersion",
|
||||
"org.springframework:spring-core:$springVersion",
|
||||
"org.springframework:spring-aspects:$springVersion",
|
||||
"org.thymeleaf:thymeleaf-spring4:$thymeleafVersion",
|
||||
"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.0.4",
|
||||
"org.eclipse.persistence:javax.persistence:$javaPersistenceVersion"
|
||||
compile("org.hibernate:hibernate-entitymanager:$hibernateVersion") {
|
||||
exclude group:'javassist', module: 'javassist'
|
||||
}
|
||||
compile("org.springframework.data:spring-data-jpa:$springDataJpaVersion") {
|
||||
exclude group:'org.aspectj', module:'aspectjrt'
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.0.4'
|
||||
compile 'org.eclipse.persistence:javax.persistence'
|
||||
compile('org.hibernate:hibernate-entitymanager') {
|
||||
exclude group:'javassist', module: 'javassist'
|
||||
}
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.hsqldb:hsqldb'
|
||||
compile('org.springframework.data:spring-data-jpa') {
|
||||
exclude group:'org.aspectj', module:'aspectjrt'
|
||||
}
|
||||
compile 'org.springframework:spring-aop'
|
||||
compile 'org.springframework:spring-aspects'
|
||||
compile 'org.springframework:spring-beans'
|
||||
compile 'org.springframework:spring-context'
|
||||
compile 'org.springframework:spring-core'
|
||||
compile 'org.springframework:spring-instrument'
|
||||
compile 'org.springframework:spring-orm'
|
||||
compile 'org.springframework:spring-tx'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile 'org.thymeleaf:thymeleaf-spring5'
|
||||
|
||||
provided 'javax.servlet:javax.servlet-api'
|
||||
}
|
||||
@@ -28,9 +28,9 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
|
||||
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
|
||||
import org.thymeleaf.TemplateEngine;
|
||||
import org.thymeleaf.spring4.SpringTemplateEngine;
|
||||
import org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver;
|
||||
import org.thymeleaf.spring4.view.ThymeleafViewResolver;
|
||||
import org.thymeleaf.spring5.SpringTemplateEngine;
|
||||
import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver;
|
||||
import org.thymeleaf.spring5.view.ThymeleafViewResolver;
|
||||
import org.thymeleaf.templatemode.TemplateMode;
|
||||
|
||||
@EnableWebMvc
|
||||
@@ -65,7 +65,7 @@ public class WebMvcConfiguration extends WebMvcConfigurerAdapter {
|
||||
}
|
||||
|
||||
@Bean
|
||||
public TemplateEngine templateEngine() {
|
||||
public SpringTemplateEngine templateEngine() {
|
||||
SpringTemplateEngine engine = new SpringTemplateEngine();
|
||||
engine.setEnableSpringELCompiler(true);
|
||||
engine.setTemplateResolver(templateResolver());
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-openid"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30',
|
||||
"net.sourceforge.nekohtml:nekohtml:1.9.10"
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-openid')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'net.sourceforge.nekohtml:nekohtml'
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
compile slf4jDependencies
|
||||
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
apply from: WAR_SAMPLE_GRADLE
|
||||
|
||||
|
||||
dependencies {
|
||||
|
||||
providedCompile "javax.servlet:javax.servlet-api:3.0.1",
|
||||
'javax.servlet.jsp:jsp-api:2.1'
|
||||
|
||||
compile project(":spring-security-config"),
|
||||
project(":spring-security-samples-javaconfig-messages"),
|
||||
project(":spring-security-core"),
|
||||
project(":spring-security-web"),
|
||||
"org.springframework:spring-webmvc:$springVersion",
|
||||
"org.springframework:spring-jdbc:$springVersion",
|
||||
"org.slf4j:slf4j-api:$slf4jVersion",
|
||||
"org.slf4j:log4j-over-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jul-to-slf4j:$slf4jVersion",
|
||||
"org.slf4j:jcl-over-slf4j:$slf4jVersion",
|
||||
"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
|
||||
"javax.validation:validation-api:$validationApiVersion",
|
||||
"org.hibernate:hibernate-validator:$hibernateValidatorVersion"
|
||||
|
||||
runtime "opensymphony:sitemesh:2.4.2",
|
||||
"cglib:cglib-nodep:$cglibVersion",
|
||||
'ch.qos.logback:logback-classic:0.9.30'
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
apply plugin: 'io.spring.convention.spring-sample-war'
|
||||
|
||||
dependencies {
|
||||
compile project(':spring-security-config')
|
||||
compile project(':spring-security-core')
|
||||
compile project(':spring-security-samples-javaconfig-messages')
|
||||
compile project(':spring-security-web')
|
||||
compile 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api'
|
||||
compile 'javax.validation:validation-api'
|
||||
compile 'org.hibernate:hibernate-validator'
|
||||
compile 'org.slf4j:jcl-over-slf4j'
|
||||
compile 'org.slf4j:jul-to-slf4j'
|
||||
compile 'org.slf4j:log4j-over-slf4j'
|
||||
compile 'org.slf4j:slf4j-api'
|
||||
compile 'org.springframework:spring-jdbc'
|
||||
compile 'org.springframework:spring-webmvc'
|
||||
|
||||
providedCompile 'javax.servlet:javax.servlet-api'
|
||||
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
|
||||
|
||||
runtime 'opensymphony:sitemesh'
|
||||
}
|
||||
Reference in New Issue
Block a user