From 6b4816d9a6c70f3100d5cbbaf61e24463b029589 Mon Sep 17 00:00:00 2001 From: Andrea Tabone Date: Wed, 28 Feb 2024 15:09:47 +0100 Subject: [PATCH 1/8] Upgrade logback Signed-off-by: at670475 --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 4c1c6e8..69035f5 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -4,7 +4,7 @@ ext { springFrameworkVersion = '5.3.30!!' springDocVersion = '1.6.9' guavaVersion = '32.0.1-jre' - logbackVersion = '1.2.9' + logbackVersion = '1.2.13' lombokVersion = '1.18.20' mockitoCoreVersion = '2.23.4' powerMockVersion = "2.0.0-RC.1" From db08f7b9d0300ea58f55536475bcd1d3b5a70fc9 Mon Sep 17 00:00:00 2001 From: Andrea Tabone Date: Thu, 29 Feb 2024 15:12:15 +0100 Subject: [PATCH 2/8] Upgrade tomcat Signed-off-by: at670475 --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 69035f5..abd9ec3 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -21,7 +21,7 @@ ext { restAssuredVersion = "4.3.0" javaxValidationApiVersion= "2.0.1.Final" explorerApiCommonVersion = "1.1.20" - tomcatVersion = "9.0.82" + tomcatVersion = "9.0.85" libraries = [ lombok : "org.projectlombok:lombok:${lombokVersion}", From 79686da659a62c614acab40b786abdcbe443c029 Mon Sep 17 00:00:00 2001 From: achmelo Date: Thu, 28 Mar 2024 18:11:13 +0100 Subject: [PATCH 3/8] latest tomcat --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index abd9ec3..ebf10d3 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -21,7 +21,7 @@ ext { restAssuredVersion = "4.3.0" javaxValidationApiVersion= "2.0.1.Final" explorerApiCommonVersion = "1.1.20" - tomcatVersion = "9.0.85" + tomcatVersion = "9.0.87" libraries = [ lombok : "org.projectlombok:lombok:${lombokVersion}", From a3a4092349654a852dc849ea4098b1ab2850b645 Mon Sep 17 00:00:00 2001 From: achmelo Date: Tue, 2 Apr 2024 10:02:38 +0200 Subject: [PATCH 4/8] try different zosmf host --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index bbf1c7a..94df554 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -12,7 +12,7 @@ on: workflow_dispatch: env: - MARIST_HOST: 'zzow04.zowe.marist.cloud' + MARIST_HOST: 'zzow08.zowe.marist.cloud' ZOSMF_PORT: 10443 GATEWAY_PORT: 7554 JOBS_PORT: 8443 From bf850c5ff52407d1bdc549735ce90c517ba58862 Mon Sep 17 00:00:00 2001 From: achmelo Date: Tue, 2 Apr 2024 10:08:51 +0200 Subject: [PATCH 5/8] use secret --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 94df554..87d2735 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -12,7 +12,7 @@ on: workflow_dispatch: env: - MARIST_HOST: 'zzow08.zowe.marist.cloud' + MARIST_HOST: ${{ secrets.SSH_MARIST_RACF_HOST }} ZOSMF_PORT: 10443 GATEWAY_PORT: 7554 JOBS_PORT: 8443 From 5b4cb1354f2723824867b4043778802f197e413e Mon Sep 17 00:00:00 2001 From: achmelo Date: Tue, 2 Apr 2024 10:16:08 +0200 Subject: [PATCH 6/8] 7 --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 87d2735..24a6113 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -12,7 +12,7 @@ on: workflow_dispatch: env: - MARIST_HOST: ${{ secrets.SSH_MARIST_RACF_HOST }} + MARIST_HOST: 'zzow07.zowe.marist.cloud' ZOSMF_PORT: 10443 GATEWAY_PORT: 7554 JOBS_PORT: 8443 From 4b28fe019103ac4262d391e09b8947ea3ef0d9c6 Mon Sep 17 00:00:00 2001 From: achmelo Date: Tue, 2 Apr 2024 10:24:12 +0200 Subject: [PATCH 7/8] revert zosmf host --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 24a6113..bbf1c7a 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -12,7 +12,7 @@ on: workflow_dispatch: env: - MARIST_HOST: 'zzow07.zowe.marist.cloud' + MARIST_HOST: 'zzow04.zowe.marist.cloud' ZOSMF_PORT: 10443 GATEWAY_PORT: 7554 JOBS_PORT: 8443 From 3915107145daca1829693ed1cfe797301dba0b2a Mon Sep 17 00:00:00 2001 From: achmelo Date: Tue, 2 Apr 2024 10:37:37 +0200 Subject: [PATCH 8/8] separate zosmf host from marist host --- .github/workflows/ci-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index bbf1c7a..bb316c8 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -14,6 +14,7 @@ on: env: MARIST_HOST: 'zzow04.zowe.marist.cloud' ZOSMF_PORT: 10443 + ZOSMF_HOST: zzow08.zowe.marist.cloud GATEWAY_PORT: 7554 JOBS_PORT: 8443 JOBS_LOG_DIR: .apiml/jobs-api.log @@ -63,7 +64,7 @@ jobs: - name: Run APIML containers run: | chmod +x scripts/run-containerized-apiml.sh - ./scripts/run-containerized-apiml.sh -h ${{ env.MARIST_HOST }} -p ${{ env.ZOSMF_PORT }} -f ${{ env.JOBS_PORT }} -l + ./scripts/run-containerized-apiml.sh -h ${{ env.ZOSMF_HOST }} -p ${{ env.ZOSMF_PORT }} -f ${{ env.JOBS_PORT }} -l env: GATEWAY_PORT: ${{ env.GATEWAY_PORT }}