From 09bb3623a082883a8006190c0077ab20d0b61af1 Mon Sep 17 00:00:00 2001 From: Cheryl King Date: Tue, 8 Oct 2024 16:16:21 -0500 Subject: [PATCH 1/2] Versionless feature updates and prep 3.11.0 release --- .github/workflows/maven.yml | 9 +++++---- docs/dev.md | 2 +- liberty-maven-app-parent/pom.xml | 4 ++-- liberty-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f1cefc2b9..3ae2b75a5 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,7 +22,7 @@ jobs: matrix: # test against latest update of each major Java version, as well as specific updates of LTS versions: RUNTIME: [ol, wlp] - RUNTIME_VERSION: [24.0.0.9] + RUNTIME_VERSION: [24.0.0.10] java: [21, 17, 11, 8] exclude: - java: 8 @@ -48,7 +48,8 @@ jobs: - name: Checkout ci.common uses: actions/checkout@v3 with: - repository: OpenLiberty/ci.common + repository: cherylking/ci.common + ref: changeMinVersionForVersionlessFeatures path: ci.common - name: Checkout ci.ant uses: actions/checkout@v3 @@ -80,7 +81,7 @@ jobs: matrix: # test against latest update of each major Java version, as well as specific updates of LTS versions: RUNTIME: [ol, wlp] - RUNTIME_VERSION: [24.0.0.9] + RUNTIME_VERSION: [24.0.0.10] java: [21, 17, 11, 8] exclude: - java: 8 @@ -102,7 +103,7 @@ jobs: - name: Clone ci.ant, ci.common, ci.maven repos to C drive run: | cp -r D:/a/ci.maven/ci.maven C:/ci.maven - git clone https://github.com/OpenLiberty/ci.common.git C:/ci.common + git clone https://github.com/cherylking/ci.common.git --branch changeMinVersionForVersionlessFeatures --single-branch C:/ci.common git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant - name: Set up Maven uses: stCarolas/setup-maven@v4.5 diff --git a/docs/dev.md b/docs/dev.md index 14e43453d..e18095c79 100644 --- a/docs/dev.md +++ b/docs/dev.md @@ -97,7 +97,7 @@ The following are the parameters supported by this goal in addition to the [comm | Parameter | Description | Required | | -------- | ----------- | ------- | -| changeOnDemandTestsAction | If set to `true`, change the action for running on demand tests from `Enter` to type `t` and press `Enter`. The default value is `false`. This parameter is introduced in version 3.10.4. | No | +| changeOnDemandTestsAction | If set to `true`, change the action for running on demand tests from `Enter` to type `t` and press `Enter`. The default value is `false`. This parameter is introduced in version 3.11. | No | | compileWait | Time in seconds to wait before processing Java changes. If you encounter compile errors while refactoring, increase this value to allow all files to be saved before compilation occurs. The default value is `0.5` seconds. | No | | debug | Whether to allow attaching a debugger to the running server. The default value is `true`. | No | | debugPort | The debug port that you can attach a debugger to. The default value is `7777`. | No | diff --git a/liberty-maven-app-parent/pom.xml b/liberty-maven-app-parent/pom.xml index 7d81b4c0f..4af904009 100644 --- a/liberty-maven-app-parent/pom.xml +++ b/liberty-maven-app-parent/pom.xml @@ -20,7 +20,7 @@ io.openliberty.tools liberty-maven - 3.10.4-SNAPSHOT + 3.11-SNAPSHOT liberty-maven-app-parent @@ -44,7 +44,7 @@ io.openliberty.tools liberty-maven-plugin - 3.10.4-SNAPSHOT + 3.11-SNAPSHOT stop-before-clean diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml index 915c8dc25..97869cffb 100644 --- a/liberty-maven-plugin/pom.xml +++ b/liberty-maven-plugin/pom.xml @@ -6,7 +6,7 @@ io.openliberty.tools liberty-maven - 3.10.4-SNAPSHOT + 3.11-SNAPSHOT liberty-maven-plugin diff --git a/pom.xml b/pom.xml index f3359d51e..1ed1e89d5 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ io.openliberty.tools liberty-maven - 3.10.4-SNAPSHOT + 3.11-SNAPSHOT pom Liberty Tools for Maven @@ -67,7 +67,7 @@ org.apache.maven.plugins maven-invoker-plugin - 3.6.0 + 3.8.0 org.apache.maven.plugins From a309a97aaab20511d091ff3851c5ca8a53381ee7 Mon Sep 17 00:00:00 2001 From: Cheryl King Date: Wed, 9 Oct 2024 13:37:38 -0500 Subject: [PATCH 2/2] Remove temp yaml changes --- .github/workflows/maven.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 3ae2b75a5..7e4df153b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -48,8 +48,7 @@ jobs: - name: Checkout ci.common uses: actions/checkout@v3 with: - repository: cherylking/ci.common - ref: changeMinVersionForVersionlessFeatures + repository: OpenLiberty/ci.common path: ci.common - name: Checkout ci.ant uses: actions/checkout@v3 @@ -103,7 +102,7 @@ jobs: - name: Clone ci.ant, ci.common, ci.maven repos to C drive run: | cp -r D:/a/ci.maven/ci.maven C:/ci.maven - git clone https://github.com/cherylking/ci.common.git --branch changeMinVersionForVersionlessFeatures --single-branch C:/ci.common + git clone https://github.com/OpenLiberty/ci.common.git C:/ci.common git clone https://github.com/OpenLiberty/ci.ant.git C:/ci.ant - name: Set up Maven uses: stCarolas/setup-maven@v4.5