100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Gradle updates for build ordering
Rich Turner17c2ef2cabe3
diff --git a/gradle.properties b/gradle.propertiesindex 07d0b45c1..b1ff068cf 100644--- a/gradle.properties+++ b/gradle.properties@@ -30,7 +30,7 @@ hikaricpVersion = 2.7.2junitVersion = 4.12spockVersion = 1.3-groovy-2.5byteBuddyVersion = 1.9.3-objenesisVersion = 2.2+objenesisVersion = 2.6camelVersion = 2.19.0tyrusVersion = 1.10sunriseSunsetCalculatorVersion = 1.2diff --git a/project.gradle b/project.gradleindex 343e7887c..2a60cbc9d 100644--- a/project.gradle+++ b/project.gradle@@ -102,6 +102,7 @@ task npmClean(type: Exec){commandLine npmCommand("npm"), "run-script", "clean"}task npmBuild(type: Exec){+ mustRunAfter npmCleandependsOn tasks.getByPath(":yarnInstall")commandLine npmCommand("npm"), "run-script", "build"}diff --git a/test/build.gradle b/test/build.gradleindex c4341aa2e..f90258d29 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -14,7 +14,7 @@ dependencies {compile "org.glassfish.tyrus:tyrus-client:$tyrusVersion"compile "org.glassfish.tyrus:tyrus-container-grizzly-client:$tyrusVersion"compile "org.objenesis:objenesis:$objenesisVersion"- testRuntime "net.bytebuddy:byte-buddy:$byteBuddyVersion"+ compile "net.bytebuddy:byte-buddy:$byteBuddyVersion"// We must have this on the regular classpath because we do weird// things with GWT in tests, but without the transitive runtimediff --git a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovyindex de8fd3593..30238df40 100644--- a/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/BasicRulesProcessingTest.groovy@@ -188,7 +188,7 @@ class BasicRulesProcessingTest extends Specification implements ManagerContainerdef "Handle asset create, update, delete"() {given: "expected conditions"- def conditions = new PollingConditions(timeout: 10, initialDelay: 0.5, delay: 0.5)+ def conditions = new PollingConditions(timeout: 15, initialDelay: 0.5, delay: 0.5)and: "the container is started"def serverPort = findEphemeralPort()