From b5a34c60453393f759ae8c246d0ce3cdcf09f047 Mon Sep 17 00:00:00 2001 From: Chris Richardson Date: Mon, 5 Jan 2015 15:35:27 -0800 Subject: [PATCH] Various cleanups Changed gradle-all.sh so that Gradle JVM settings are picked up from grade.properties Added Gradle plugin that verifies that SPRING_DATA_MONGODB_URI is set before running any tests that need MongoDB --- gradle-all.sh | 2 +- .../backend-integration-tests/build.gradle | 2 ++ .../VerifyMongoDBConfigurationPlugin.groovy | 15 +++++++++++++++ java-spring/gradle.properties | 1 - java-spring/monolithic-web/build.gradle | 2 ++ .../backend-integration-tests/build.gradle | 1 + .../VerifyMongoDBConfigurationPlugin.groovy | 15 +++++++++++++++ scala-spring/gradle.properties | 1 - scala-spring/monolithic-web/build.gradle | 1 + 9 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 java-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy create mode 100644 scala-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy diff --git a/gradle-all.sh b/gradle-all.sh index 7d56595..6a47aed 100755 --- a/gradle-all.sh +++ b/gradle-all.sh @@ -1,6 +1,6 @@ #! /bin/bash -e for dir in java-spring scala-spring; do - $dir/gradlew -b $dir/build.gradle $* + (cd $dir ; ./gradlew -b build.gradle $*) done diff --git a/java-spring/backend-integration-tests/build.gradle b/java-spring/backend-integration-tests/build.gradle index b28e243..dee4c2f 100644 --- a/java-spring/backend-integration-tests/build.gradle +++ b/java-spring/backend-integration-tests/build.gradle @@ -1,3 +1,5 @@ +apply plugin: VerifyMongoDBConfigurationPlugin + dependencies { testCompile project(":commandside-backend-accounts") diff --git a/java-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy b/java-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy new file mode 100644 index 0000000..1486a0d --- /dev/null +++ b/java-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy @@ -0,0 +1,15 @@ +import org.gradle.api.* + + +class VerifyMongoDBConfigurationPlugin implements Plugin { + void apply(Project project) { + project.test { + beforeSuite { x -> + if (x.parent == null) { + if (System.getenv("SPRING_DATA_MONGODB_URI") == null) + throw new RuntimeException("Please make sure that the environment variable SPRING_DATA_MONGODB_URI is set, e.g. export SPRING_DATA_MONGODB_URI=mongodb://192.168.59.103/mydb") + } + } + } + } +} \ No newline at end of file diff --git a/java-spring/gradle.properties b/java-spring/gradle.properties index 090af82..03a293b 100644 --- a/java-spring/gradle.properties +++ b/java-spring/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-XX:MaxPermSize=512m -rxJavaVersion=0.20.4 scalaTestDependency=org.scalatest:scalatest_2.10:2.0 diff --git a/java-spring/monolithic-web/build.gradle b/java-spring/monolithic-web/build.gradle index 0c1ed7e..9748591 100644 --- a/java-spring/monolithic-web/build.gradle +++ b/java-spring/monolithic-web/build.gradle @@ -1,3 +1,5 @@ +apply plugin: VerifyMongoDBConfigurationPlugin + apply plugin: 'spring-boot' dependencies { diff --git a/scala-spring/backend-integration-tests/build.gradle b/scala-spring/backend-integration-tests/build.gradle index e533c95..608eb53 100644 --- a/scala-spring/backend-integration-tests/build.gradle +++ b/scala-spring/backend-integration-tests/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'scala' +apply plugin: VerifyMongoDBConfigurationPlugin dependencies { diff --git a/scala-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy b/scala-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy new file mode 100644 index 0000000..1486a0d --- /dev/null +++ b/scala-spring/buildSrc/src/main/groovy/VerifyMongoDBConfigurationPlugin.groovy @@ -0,0 +1,15 @@ +import org.gradle.api.* + + +class VerifyMongoDBConfigurationPlugin implements Plugin { + void apply(Project project) { + project.test { + beforeSuite { x -> + if (x.parent == null) { + if (System.getenv("SPRING_DATA_MONGODB_URI") == null) + throw new RuntimeException("Please make sure that the environment variable SPRING_DATA_MONGODB_URI is set, e.g. export SPRING_DATA_MONGODB_URI=mongodb://192.168.59.103/mydb") + } + } + } + } +} \ No newline at end of file diff --git a/scala-spring/gradle.properties b/scala-spring/gradle.properties index 090af82..03a293b 100644 --- a/scala-spring/gradle.properties +++ b/scala-spring/gradle.properties @@ -1,6 +1,5 @@ org.gradle.jvmargs=-XX:MaxPermSize=512m -rxJavaVersion=0.20.4 scalaTestDependency=org.scalatest:scalatest_2.10:2.0 diff --git a/scala-spring/monolithic-web/build.gradle b/scala-spring/monolithic-web/build.gradle index e1b7548..f27fcae 100644 --- a/scala-spring/monolithic-web/build.gradle +++ b/scala-spring/monolithic-web/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'scala' apply plugin: 'spring-boot' +apply plugin: VerifyMongoDBConfigurationPlugin dependencies { compile "org.scala-lang:scala-library:2.10.2"