cleanup publish scripts

locationtech · Oct 6, 2016 · 5c5ec22 · 5c5ec22
1 parent 56cf355
commit 5c5ec22
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/.travis/build-and-test-set-1.sh b/.travis/build-and-test-set-1.sh
@@ -7,6 +7,4 @@
 ./sbt -J-Xmx2G "++$TRAVIS_SCALA_VERSION" "project proj4" test || { exit 1; }
 ./sbt -J-Xmx2G "++$TRAVIS_SCALA_VERSION" "project geotools" test || { exit 1; }
 ./sbt -J-Xmx2G "++$TRAVIS_SCALA_VERSION" "project shapefile" test || { exit 1; }
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
-  ./sbt -J-Xmx2G "++$TRAVIS_SCALA_VERSION" "project geomesa" test  || { exit 1; }
-fi
+./sbt -J-Xmx2G "++$TRAVIS_SCALA_VERSION" "project geomesa" test  || { exit 1; }
diff --git a/.travis/build-and-test-set-2.sh b/.travis/build-and-test-set-2.sh
@@ -8,6 +8,3 @@
 ./sbt -J-Xmx2G "++$TRAVIS_SCALA_VERSION" "project spark-etl" compile  || { exit 1; }
 ./sbt -J-Xmx2G "++$TRAVIS_SCALA_VERSION" "project slick" test || { exit 1; }
 ./sbt -J-Xmx2G "++$TRAVIS_SCALA_VERSION" "project vectortile" test || { exit 1; }
-if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
-  ./sbt -J-Xmx2G "++$TRAVIS_SCALA_VERSION" "project geomesa" test  || { exit 1; }
-fi
diff --git a/.travis/deploy.sh b/.travis/deploy.sh
@@ -22,14 +22,12 @@ EOF
   && ./sbt "++$TRAVIS_SCALA_VERSION" "project cassandra" publish \
   && ./sbt "++$TRAVIS_SCALA_VERSION" "project hbase" publish \
   && ./sbt "++$TRAVIS_SCALA_VERSION" "project spark-etl" publish \
+  && ./sbt "++$TRAVIS_SCALA_VERSION" "project geomesa" publish \
   && ./sbt "++$TRAVIS_SCALA_VERSION" "project geotools" publish \
+  && ./sbt "++$TRAVIS_SCALA_VERSION" "project geowave" publish \
   && ./sbt "++$TRAVIS_SCALA_VERSION" "project shapefile" publish \
   && ./sbt "++$TRAVIS_SCALA_VERSION" "project slick" publish \
   && ./sbt "++$TRAVIS_SCALA_VERSION" "project util" publish \
   && ./sbt "++$TRAVIS_SCALA_VERSION" "project raster-testkit" publish \
   && ./sbt "++$TRAVIS_SCALA_VERSION" "project vector-testkit" publish \
-  && ./sbt "++$TRAVIS_SCALA_VERSION" "project spark-testkit" publish
-
-if [ "$TRAVIS_SCALA_VERSION" == "2.11.8" && "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
-  ./sbt "++$TRAVIS_SCALA_VERSION" "project geomesa" publish
-fi
+  && ./sbt "++$TRAVIS_SCALA_VERSION" "project spark-testkit" publish
diff --git a/scripts/cleanall.sh b/scripts/cleanall.sh
@@ -19,6 +19,7 @@ rm -r accumulo/target
 rm -r cassandra/target
 rm -r geomesa/target
 rm -r geotools/target
+rm -r geowave/target
 rm -r hbase/target
 rm -r macros/target
 rm -r proj4/target

diff --git a/scripts/publish-m2.sh b/scripts/publish-m2.sh
@@ -4,17 +4,17 @@
       "project cassandra" +publish-m2 \
       "project geomesa" +publish-m2 \
       "project geotools" +publish-m2 \
+      "project geowave" +publish-m2 \
       "project hbase" +publish-m2 \
       "project macros" +publish-m2 \
       "project proj4" +publish-m2 \
       "project raster" +publish-m2 \
       "project raster-testkit" +publish-m2 \
       "project s3" +publish-m2 \
       "project shapefile" +publish-m2 \
-      "project geotools" +publish-m2 \
-      "project geowave" +publish-m2 \
       "project slick" +publish-m2 \
       "project spark" +publish-m2 \
+      "project spark-etl" +publish-m2 \
       "project spark-testkit" +publish-m2 \
       "project util" +publish-m2 \
       "project vector" +publish-m2 \