Merge branch '3.0.x' into 3.1.x

tolbertam · tolbertam · commit cbf4095e2c51 · 2017-03-06T14:19:49.000-06:00
diff --git a/ci/appveyor.yml b/ci/appveyor.yml
@@ -9,13 +9,9 @@ platform: x64
 install:
   - ps: .\ci\appveyor.ps1
 build_script:
-  - ps: |
-      $env:JAVA_HOME="$($env:JAVA_8_HOME)"
-      mvn install -DskipTests=true -D"maven.javadoc.skip"=true -B -V
+  - "set \"JAVA_HOME=%JAVA_8_HOME%\" && mvn install -DskipTests=true -D\"maven.javadoc.skip\"=true -B -V"
 test_script:
-  - ps: |
-      $env:JAVA_HOME="$($env:JAVA_PLATFORM_HOME)"
-      mvn -B -D"ccm.java.home"="$($env:JAVA_8_HOME)" -D"ccm.maxNumberOfNodes"=1 -D"cassandra.version"=$($env:cassandra_version) test -P $($env:test_profile)
+  - "set \"JAVA_HOME=%JAVA_PLATFORM_HOME%\" && mvn -B -D\"ccm.java.home\"=\"%JAVA_8_HOME%\" -D\"ccm.maxNumberOfNodes\"=1 -D\"cassandra.version\"=%cassandra_version% test -P %test_profile%"
 on_finish:
   - ps: .\ci\uploadtests.ps1
 cache:
