diff --git a/build.gradle b/build.gradle index 71315dc8..4547ebde 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,16 @@ allprojects { apply plugin: "propdeps" apply plugin: "java" apply from: "${rootProject.projectDir}/ide.gradle" + + repositories { + mavenCentral() + if (!version.endsWith('RELEASE')) { + maven { url "https://repo.spring.io/milestone" } + } + if (version.endsWith('SNAPSHOT')) { + maven { url "https://repo.spring.io/snapshot" } + } + } } subprojects { subproject -> @@ -29,11 +39,6 @@ subprojects { subproject -> sourceSets.test.resources.srcDirs = ["src/main/java", "src/test/resources", "src/test/java"] - repositories { - maven { url "https://repo.spring.io/libs-release" } - maven { url "https://repo.spring.io/libs-snapshot" } - } - jar { manifest.attributes["Implementation-Title"] = subproject.name manifest.attributes["Implementation-Version"] = subproject.version @@ -118,74 +123,6 @@ configure(subprojects.findAll { } } -project("spring-binding") { - description = "Spring Binding" -} - -project("spring-webflow") { - description = "Spring Web Flow" - - dependencies { - compile(project(":spring-binding")) - compile("org.springframework:spring-web:$springVersion") - compile("org.springframework:spring-webmvc:$springVersion") - provided("javax.servlet:javax.servlet-api:$servletVersion") - optional("org.hibernate:hibernate-core:$hibernate5Version") - optional("org.springframework.security:spring-security-core:$springSecurityVersion") - optional("org.springframework:spring-orm:$springVersion") - optional("org.springframework:spring-tx:$springVersion") - optional("org.apache.tiles:tiles-api:$tiles3Version") - optional("org.apache.tiles:tiles-core:$tiles3Version") - optional("org.apache.tiles:tiles-servlet:$tiles3Version") - optional("org.apache.tiles:tiles-jsp:$tiles3Version") - optional("org.apache.tiles:tiles-el:$tiles3Version") - optional("org.apache.tiles:tiles-extras:$tiles3Version") { - exclude group: "org.springframework", module: "spring-web" - } - provided("junit:junit:4.12") - testCompile("org.springframework:spring-aop:$springVersion") - testCompile("org.springframework:spring-jdbc:$springVersion") - testCompile("org.springframework:spring-test:$springVersion") - testCompile("javax.validation:validation-api:2.0.1.Final") - testCompile("org.hibernate:hibernate-entitymanager:$hibernate5Version") - testCompile("org.hibernate:hibernate-validator:6.1.4.Final") - testCompile("org.hsqldb:hsqldb:2.5.0") - testCompile("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02") - testCompile("javax.servlet:jstl:1.2") - } -} - -project("spring-faces") { - description = "Spring Faces" - - dependencies { - compile(project(":spring-binding")) - compile(project(":spring-webflow")) - compile("org.springframework:spring-web:$springVersion") - compile("org.springframework:spring-webmvc:$springVersion") - provided("javax.servlet:javax.servlet-api:$servletVersion") - provided("com.sun.faces:jsf-api:2.2.16") - provided("com.sun.faces:jsf-impl:2.2.16") - provided("org.apache.myfaces.core:myfaces-impl:2.2.12") - optional("com.sun.facelets:jsf-facelets:1.1.14") - optional("org.springframework.security:spring-security-core:$springSecurityVersion") - optional("org.springframework.security:spring-security-web:$springSecurityVersion") - optional("org.springframework.security:spring-security-taglibs:$springSecurityVersion") - testCompile("org.apache.myfaces.test:myfaces-test22:1.0.8") - testCompile("org.springframework:spring-test:$springVersion") - } -} - -project("spring-js-resources") { - description = "Spring JS Resources" - - apply from: "spring-js-resources.gradle" - - jar { - dependsOn prepareResources - } -} - configure(rootProject) { description = "Spring Web Flow" diff --git a/settings.gradle b/settings.gradle index 30428e63..0ce0fbbf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,17 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { url 'https://repo.spring.io/plugins-release' } + } +} + rootProject.name = 'webflow' include 'spring-binding' include 'spring-webflow' include 'spring-faces' include 'spring-js-resources' + +rootProject.children.each {project -> + project.buildFileName = "${project.name}.gradle" +} diff --git a/spring-binding/spring-binding.gradle b/spring-binding/spring-binding.gradle new file mode 100644 index 00000000..e4a088c1 --- /dev/null +++ b/spring-binding/spring-binding.gradle @@ -0,0 +1 @@ +description = "Spring Binding" \ No newline at end of file diff --git a/spring-faces/spring-faces.gradle b/spring-faces/spring-faces.gradle new file mode 100644 index 00000000..b6a4daad --- /dev/null +++ b/spring-faces/spring-faces.gradle @@ -0,0 +1,18 @@ +description = "Spring Faces" + +dependencies { + compile(project(":spring-binding")) + compile(project(":spring-webflow")) + compile("org.springframework:spring-web:$springVersion") + compile("org.springframework:spring-webmvc:$springVersion") + provided("javax.servlet:javax.servlet-api:$servletVersion") + provided("com.sun.faces:jsf-api:2.2.16") + provided("com.sun.faces:jsf-impl:2.2.16") + provided("org.apache.myfaces.core:myfaces-impl:2.2.12") + optional("com.sun.facelets:jsf-facelets:1.1.14") + optional("org.springframework.security:spring-security-core:$springSecurityVersion") + optional("org.springframework.security:spring-security-web:$springSecurityVersion") + optional("org.springframework.security:spring-security-taglibs:$springSecurityVersion") + testCompile("org.apache.myfaces.test:myfaces-test22:1.0.8") + testCompile("org.springframework:spring-test:$springVersion") +} diff --git a/spring-js-resources/spring-js-resources.gradle b/spring-js-resources/spring-js-resources.gradle index 26e79392..d232cad7 100644 --- a/spring-js-resources/spring-js-resources.gradle +++ b/spring-js-resources/spring-js-resources.gradle @@ -1,3 +1,5 @@ +description = "Spring JS Resources" + configurations { shrinksafe } @@ -40,3 +42,7 @@ void minify(fileName) { } } +jar { + dependsOn prepareResources +} + diff --git a/spring-webflow/spring-webflow.gradle b/spring-webflow/spring-webflow.gradle new file mode 100644 index 00000000..e8b3b1a3 --- /dev/null +++ b/spring-webflow/spring-webflow.gradle @@ -0,0 +1,30 @@ +description = "Spring Web Flow" + +dependencies { + compile(project(":spring-binding")) + compile("org.springframework:spring-web:$springVersion") + compile("org.springframework:spring-webmvc:$springVersion") + provided("javax.servlet:javax.servlet-api:$servletVersion") + optional("org.hibernate:hibernate-core:$hibernate5Version") + optional("org.springframework.security:spring-security-core:$springSecurityVersion") + optional("org.springframework:spring-orm:$springVersion") + optional("org.springframework:spring-tx:$springVersion") + optional("org.apache.tiles:tiles-api:$tiles3Version") + optional("org.apache.tiles:tiles-core:$tiles3Version") + optional("org.apache.tiles:tiles-servlet:$tiles3Version") + optional("org.apache.tiles:tiles-jsp:$tiles3Version") + optional("org.apache.tiles:tiles-el:$tiles3Version") + optional("org.apache.tiles:tiles-extras:$tiles3Version") { + exclude group: "org.springframework", module: "spring-web" + } + provided("junit:junit:4.12") + testCompile("org.springframework:spring-aop:$springVersion") + testCompile("org.springframework:spring-jdbc:$springVersion") + testCompile("org.springframework:spring-test:$springVersion") + testCompile("javax.validation:validation-api:2.0.1.Final") + testCompile("org.hibernate:hibernate-entitymanager:$hibernate5Version") + testCompile("org.hibernate:hibernate-validator:6.1.4.Final") + testCompile("org.hsqldb:hsqldb:2.5.0") + testCompile("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02") + testCompile("javax.servlet:jstl:1.2") +} \ No newline at end of file