Skip to content

Commit

Permalink
Change boot-test to only execute when Java 7 or higher is available
Browse files Browse the repository at this point in the history
Since 1.4.0.RELEASE the spring-boot-gradle plugin requires at least
Java 7 so we decided to follow this version requirement for this
subproject.
  • Loading branch information
leonard84 committed Aug 8, 2016
1 parent 849abe4 commit 5bf0f67
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
5 changes: 4 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
include "spock-core"
include "spock-specs"
include "spock-spring"
include "spock-spring:boot-test"
include "spock-guice"
include "spock-tapestry"
include "spock-unitils"
include "spock-report"
include "spock-gradle"

if (JavaVersion.current().java7Compatible) {
include "spock-spring:boot-test"
}

rootProject.name = "spock"
nameBuildScriptsAfterProjectNames(rootProject.children)

Expand Down
10 changes: 1 addition & 9 deletions spock-spring/boot-test/boot-test.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,10 @@ apply plugin: 'spring-boot'



ext['tomcat.version'] = '7.0.59' // use Tomcat 7 to ensure Java 6 compatibility
dependencies {
compile("org.springframework.boot:spring-boot-starter-data-jpa") {
// for Java 6 compatibility, see http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#how-to-use-java-6-jta-api
exclude group: "javax.transaction", module: "javax.transaction-api"
}

compile "org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Final"

compile "org.springframework.boot:spring-boot-starter-data-jpa"
compile "org.springframework.boot:spring-boot-starter-web"


testCompile "org.springframework.boot:spring-boot-starter-test"
testCompile project(":spock-core")

Expand Down

0 comments on commit 5bf0f67

Please sign in to comment.