Merge pull request #267 from zowe/reboot/dep-upgrade

chore: dependency update for 2.18.0
zowe · Aug 14, 2024 · 4cf3378 · 4cf3378
2 parents 554d807 + 1682151
commit 4cf3378
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -148,7 +148,7 @@ jobs:
 
       - name: Output APIML logs
         if: always()
-        run: docker-compose -f .apiml/docker-compose.yml logs
+        run: docker compose -f .apiml/docker-compose.yml logs
 
       - name: Store test results
         uses: actions/upload-artifact@v2

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -18,8 +18,8 @@
         jsonPathVersion = "2.9.0"
         junitVersion = "4.13.2"
         restAssuredVersion = "4.5.1"
-        explorerApiCommonVersion = "2.0.33"
-        tomcatVersion = "9.0.90"
+        explorerApiCommonVersion = "2.0.34"
+        tomcatVersion = "9.0.93"
 
         activationApiVersion = "1.2.2"
         xmlBindApiVersion = "2.3.3"

diff --git a/scripts/run-containerized-apiml.sh b/scripts/run-containerized-apiml.sh
@@ -53,8 +53,8 @@ fi
 if [ -z "${HOST_OS}" ]; then
   HOST_OS="not-linux"
 fi
-if [ -z $(command -v docker-compose) ]; then
-  echo "[${SCRIPT_NAME}][error] docker-compose is required."
+if [ -z $(command -v docker) ]; then
+  echo "[${SCRIPT_NAME}][error] docker is required."
   exit 1
 fi
 
@@ -176,7 +176,7 @@ sed -e "s|{WORKSPACE}|${WORKSPACE}|g" \
   -e "s|{DISCOVERY_PORT}|${DISCOVERY_PORT}|g" \
   -e "s|{GATEWAY_PORT}|${GATEWAY_PORT}|g" \
   "scripts/containerized-apiml/$dockerComposeTemplate" > "${WORKSPACE}/docker-compose.yml"
-docker-compose -f "${WORKSPACE}/docker-compose.yml" up -d
+docker compose -f "${WORKSPACE}/docker-compose.yml" up -d
 ###################################################################
 echo "[${SCRIPT_NAME}] done."
 exit 0