From ed26a592f8096fca54eba653a587f41cfc13cc48 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 14 Nov 2024 12:14:16 -0500 Subject: [PATCH 1/6] use versionless feature Signed-off-by: Gilbert Kwan --- .github/workflows/test.yml | 5 +++-- finish/src/main/liberty/config/server.xml | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 675005c..a16533c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,9 +12,9 @@ jobs: canSkip: ${{ steps.Checker.outputs.canSkip }} steps: - name: Get files - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Get tools - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: tools/ repository: openliberty/guides-common @@ -51,6 +51,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v3 with: + distribution: 'semeru' distribution: 'semeru' java-version: 17 - run: unset _JAVA_OPTIONS diff --git a/finish/src/main/liberty/config/server.xml b/finish/src/main/liberty/config/server.xml index 07e7668..960dc2f 100644 --- a/finish/src/main/liberty/config/server.xml +++ b/finish/src/main/liberty/config/server.xml @@ -2,8 +2,9 @@ + jakartaee-10.0 - servlet-6.0 + servlet springBoot-3.0 From 52a6d5ea1e24e67da5a36bd95b7d454a70fd44a8 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 14 Nov 2024 13:01:30 -0500 Subject: [PATCH 2/6] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a16533c..2cbfe5d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'semeru' distribution: 'semeru' From 812a6c31a3a3bfc766fdbe42cf12614b4e547777 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Thu, 14 Nov 2024 13:06:06 -0500 Subject: [PATCH 3/6] Update test.yml --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2cbfe5d..e99c00f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,7 +51,6 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@v4 with: - distribution: 'semeru' distribution: 'semeru' java-version: 17 - run: unset _JAVA_OPTIONS From 0ce75c8f1bda15631fe93109edc973123c0e86f4 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Fri, 15 Nov 2024 10:38:19 -0500 Subject: [PATCH 4/6] Update test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e99c00f..e932d57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,6 +59,7 @@ jobs: - name: Post tests if: always() run: | + uname -r logsPath=$(sudo find . -name "console.log"); sudo cat "$logsPath" | sudo grep Launching - name: Archive server logs if failed From 53dfc57f87fb7571de07fe3759b2204c01aae7e9 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Fri, 15 Nov 2024 11:08:39 -0500 Subject: [PATCH 5/6] Update test.yml --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e932d57..e99c00f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,7 +59,6 @@ jobs: - name: Post tests if: always() run: | - uname -r logsPath=$(sudo find . -name "console.log"); sudo cat "$logsPath" | sudo grep Launching - name: Archive server logs if failed From b12fa336fd2deab62ac0b2fde83c7104e4b9a3ac Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Fri, 22 Nov 2024 12:27:02 -0500 Subject: [PATCH 6/6] use versionless feature Signed-off-by: Gilbert Kwan --- finish/.mvn/wrapper/maven-wrapper.properties | 2 +- start/.mvn/wrapper/maven-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/finish/.mvn/wrapper/maven-wrapper.properties b/finish/.mvn/wrapper/maven-wrapper.properties index 7174b43..207aa43 100644 --- a/finish/.mvn/wrapper/maven-wrapper.properties +++ b/finish/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/start/.mvn/wrapper/maven-wrapper.properties b/start/.mvn/wrapper/maven-wrapper.properties index 7174b43..207aa43 100644 --- a/start/.mvn/wrapper/maven-wrapper.properties +++ b/start/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar