From a8f4275fcdfd734896acfc5e16f7ecd258c75e74 Mon Sep 17 00:00:00 2001 From: "mohammadfaisalkhatri@gmail.com" Date: Wed, 7 Aug 2024 11:00:43 +0530 Subject: [PATCH 1/4] updated dependency version in pom.xml and updated docker compose command in yml file --- docker-compose-restfulbooker.yml | 4 ++-- pom.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose-restfulbooker.yml b/docker-compose-restfulbooker.yml index e86efa0..e46e9b4 100644 --- a/docker-compose-restfulbooker.yml +++ b/docker-compose-restfulbooker.yml @@ -1,6 +1,6 @@ -# To execute this docker-compose yml file use `docker-compose -f docker-compose-restfulbooker.yml up -d` +# To execute this docker-compose yml file use `docker compose -f docker-compose-restfulbooker.yml up -d` # Add the `-d` flag at the end for detached execution -# To stop the execution, hit Ctrl+C, and then `docker-compose -f docker-compose-restfulbooker.yml down` +# To stop the execution, hit Ctrl+C, and then `docker compose -f docker-compose-restfulbooker.yml down` version: "3" services: restful-booker: diff --git a/pom.xml b/pom.xml index ed2febe..9ab46c2 100644 --- a/pom.xml +++ b/pom.xml @@ -12,17 +12,17 @@ UTF-8 - 1.41.2 - 7.9.0 + 1.45.1 + 7.10.2 1.3 1.1.1 - 1.18.28 - 2.1.0 - 20230618 - 3.11.0 - 3.1.0 + 1.18.34 + 2.3.1 + 20240303 + 3.13.0 + 3.3.1 17 - 3.4.0 + 3.5.0 test-suite/testng.xml From f3292512c51cdf1dd94f9582901ce5a401b2b10d Mon Sep 17 00:00:00 2001 From: "mohammadfaisalkhatri@gmail.com" Date: Wed, 7 Aug 2024 11:01:58 +0530 Subject: [PATCH 2/4] updated maven.yml to use docker compose instead of docker-compose command --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 52f5eaa..44a8c1b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: cache: maven - name: Start restful booker service - run: docker-compose -f ./docker-compose-restfulbooker.yml up -d + run: docker compose -f ./docker-compose-restfulbooker.yml up -d - name: Build Project run: mvn clean install -DskipTests @@ -44,7 +44,7 @@ jobs: run: mvn clean test - name: Stop restful booker service - run: docker-compose -f ./docker-compose-restfulbooker.yml down --remove-orphans + run: docker compose -f ./docker-compose-restfulbooker.yml down --remove-orphans - name: Test Reporter uses: dorny/test-reporter@v1.6.0 From 78c5f21205427624c795bac212571ac1e4ee34ee Mon Sep 17 00:00:00 2001 From: "mohammadfaisalkhatri@gmail.com" Date: Wed, 7 Aug 2024 11:06:02 +0530 Subject: [PATCH 3/4] updated to use ubuntu-22.04 as runner in GitHub Actions --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 44a8c1b..ed723c1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,7 +23,7 @@ permissions: jobs: build: name: Build and Test - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 From 24d9ac9b04683d6336a927c6aaf57b3ee58d5cf2 Mon Sep 17 00:00:00 2001 From: "mohammadfaisalkhatri@gmail.com" Date: Wed, 7 Aug 2024 11:08:46 +0530 Subject: [PATCH 4/4] reverted back to use ubuntu-latest --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ed723c1..44a8c1b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,7 +23,7 @@ permissions: jobs: build: name: Build and Test - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3