Updated for CSW-3.0.0-RC1

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [csw-c v3.0.0-RC1] - 2020-12-01
+
+### Changed
+
+- Updated test version to CSW-3.0.0-RC1
+
 ## [csw-c v3.0.0-M1] - 2020-09-29
 
 ### Changed

test/runTests.sh

@@ -3,14 +3,20 @@
 # Script that starts the CSW services, compiles and runs the test assembly and then runs the C based tests.
 # Assumes that csw-services.sh and sbt are all in your shell path.
 
+CSW_VERSION=3.0.0-RC1
 logfile=test.log
-if ! hash csw-services.sh 2>/dev/null ; then
-    echo >&2 "Please install csw-services.sh (from csw sources or download csw-apps zip from csw GitHub release).  Aborting."
+if ! hash csw-services 2>/dev/null ; then
+    echo >&2 "Please install csw-services (run: cs install csw-services $CSW_VERSION).  Aborting."
+    exit 1
+fi
+csw_services_version=`csw-services --help | grep Main | sed -e 's/Main //'`
+if test "$csw_services_version" != "$CSW_VERSION"; then
+    echo >&2 "CSW services version $csw_services_version != $CSW_VERSION: Please install csw-services (run: cs install csw-services $CSW_VERSION).  Aborting."
     exit 1
 fi
 set -v
-csw-services.sh --version v3.0.0-M1 start -e > $logfile 2>&1 &
-#csw-services.sh start -e > $logfile 2>&1 &
+csw-services start -e > $logfile 2>&1 &
+cswServicesPid=$!
 cd testSupport || exit 1
 sbt stage  >> $logfile 2>&1
 test-deploy/target/universal/stage/bin/test-container-cmd-app --local test-deploy/src/main/resources/TestContainer.conf >> $logfile 2>&1 &
@@ -21,4 +27,5 @@ sleep 30
 # Run the C based tests
 ../build/test/testPublisher
 kill $assemblyPid
-csw-services.sh stop >> $logfile 2>&1
+#csw-services stop  >> $logfile 2>&1
+kill $cswServicesPid

test/testSupport/project/Libs.scala

@@ -16,7 +16,7 @@ object AkkaHttp {
 }
 
 object CSW {
-  val Version = "3.0.0-M1"
+  val Version = "3.0.0-RC1"
 //  val Version = "0.1.0-SNAPSHOT"
 
   val `csw-framework` = "com.github.tmtsoftware.csw" %% "csw-framework" % Version