This commit is contained in:
Janne Valkealahti
2016-03-20 09:46:08 +00:00
parent 272749bb87
commit 5ec61f35d9
4 changed files with 8 additions and 13 deletions

View File

@@ -40,10 +40,11 @@ a cross-platform, self-contained bootstrap mechanism for the build.
=== Prerequisites
http://help.github.com/set-up-git-redirect[Git] and the
http://www.oracle.com/technetwork/java/javase/downloads[JDK7 build].
http://www.oracle.com/technetwork/java/javase/downloads[JDK8 build].
Be sure that your `JAVA_HOME` environment variable points to the
`jdk1.7.0` folder extracted from the JDK download.
`jdk` folder extracted from the JDK download. While build requires
`JDK8`, created artifacts are with `JDK7` compatible.
=== Check out sources
[indent=0]

View File

@@ -55,13 +55,6 @@ configure(allprojects) {
test {
exclude '**/*IntegrationTests.*'
}
// servlet-api (2.5) and tomcat-servlet-api (3.0) classpath entries should not be
// exported to dependent projects in Eclipse to avoid false compilation errors due
// to changing APIs across these versions
// eclipse.classpath.file.whenMerged { classpath ->
// classpath.entries.findAll { entry -> entry.path.contains('servlet-api') }*.exported = false
// }
}
configure(subprojects) { subproject ->
@@ -226,7 +219,6 @@ configure(sampleProjects()) {
configurations.archives.artifacts.removeAll { it.archiveTask.is jar }
tasks.findByPath("artifactoryPublish")?.enabled = false
dependencies {
// compile project(":spring-statemachine-samples-common")
compile project(":spring-statemachine-core")
compile "org.springframework:spring-context-support:$springVersion"
testCompile "org.springframework:spring-test:$springVersion"

View File

@@ -14,3 +14,6 @@ springSessionVersion=1.0.2.RELEASE
curatorVersion=2.8.0
tomcatEmbedVersion=8.0.30
servletApiVersion=3.0.1
commonsPool2Version=2.4.2
hsqlVersion=2.3.1

View File

@@ -48,7 +48,7 @@ project('spring-statemachine-samples-persist') {
dependencies {
compile project(":spring-statemachine-samples-common")
compile project(":spring-statemachine-recipes-common")
compile ("org.hsqldb:hsqldb:2.3.1")
compile ("org.hsqldb:hsqldb:$hsqlVersion")
compile ("org.springframework:spring-jdbc:$springVersion")
}
}
@@ -89,7 +89,6 @@ project('spring-statemachine-samples-eventservice') {
dependencies {
compile project(":spring-statemachine-redis")
compile("org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion")
// compile("org.springframework.boot:spring-boot-starter-redis:$springBootVersion")
compile("org.apache.commons:commons-pool2:2.4.2")
compile("org.apache.commons:commons-pool2:$commonsPool2Version")
}
}