From f0853cb31f889472d5655ec7f20c881b37dc370e Mon Sep 17 00:00:00 2001 From: Remko Popma Date: Wed, 20 Dec 2023 11:07:14 +0900 Subject: [PATCH 1/4] BUILD testing gradle/gradle-build-action#1007 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70ebf1922..17b12b4fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -148,7 +148,7 @@ jobs: cache: gradle - name: Build - uses: gradle/gradle-build-action@8cbcb9948b5892387aed077daf6f90e1f0ba5b27 # v2 + uses: gradle/gradle-build-action@prerelease/v2.11.1 # v2 with: gradle-version: 1.12 build-root-directory: picocli-tests-java567/ From d0c87fd8b11f2ff3680ac217c25f23e823f2aa8e Mon Sep 17 00:00:00 2001 From: Remko Popma Date: Wed, 20 Dec 2023 11:18:57 +0900 Subject: [PATCH 2/4] BUILD remove unnecessary gradle-build-action configuration Removed `-Pgradle-enterprise.injection-enabled=false` argument --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17b12b4fc..5cd8f9bea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -152,4 +152,4 @@ jobs: with: gradle-version: 1.12 build-root-directory: picocli-tests-java567/ - arguments: -Pgradle-enterprise.injection-enabled=false clean build --no-daemon + arguments: clean build --no-daemon From abde04246dcda74ad16c8f0d61d8ac5424fe29e9 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Tue, 19 Dec 2023 21:48:21 +0100 Subject: [PATCH 3/4] Mark GROOVY_CLOSURE_CLASS as final and private --- src/main/java/picocli/CommandLine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/picocli/CommandLine.java b/src/main/java/picocli/CommandLine.java index 88d7fe1bd..e4b730511 100644 --- a/src/main/java/picocli/CommandLine.java +++ b/src/main/java/picocli/CommandLine.java @@ -5610,7 +5610,7 @@ public interface IFactory { * @since 4.0 */ public static IFactory defaultFactory() { return new DefaultFactory(); } private static class DefaultFactory implements IFactory { - static Class GROOVY_CLOSURE_CLASS = loadClosureClass(); + private static final Class GROOVY_CLOSURE_CLASS = loadClosureClass(); private static Class loadClosureClass() { if (Boolean.getBoolean("picocli.disable.closures")) { tracer().info("DefaultFactory: groovy Closures in annotations are disabled and will not be loaded"); From 3c49ad0663d739667c1ae9945bce8413bbf3e116 Mon Sep 17 00:00:00 2001 From: Remko Popma Date: Wed, 20 Dec 2023 14:27:32 +0900 Subject: [PATCH 4/4] Update ci.yml [BUILD] DEP: Bump gradle-build-action from 2.11 to 2.11.1 --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cd8f9bea..897258d4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,18 +15,18 @@ jobs: continue-on-error: ${{ matrix.os == 'macos-latest' || matrix.java-version == '9' || matrix.java-version == '10' || matrix.java-version == '12' || matrix.java-version == '13' || matrix.java-version == '14' || matrix.java-version == '15' || matrix.java-version == '16' || matrix.java-version == '19' }} steps: - name: Harden Runner - uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1 + uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 with: egress-policy: audit - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1 + uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 - name: Configure JDK ${{ matrix.java-version }} - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v2 + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 with: distribution: 'zulu' java-version: ${{ matrix.java-version }} @@ -130,25 +130,25 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Harden Runner - uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v1 + uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 with: egress-policy: audit - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v2 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1 + uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 - name: Configure JDK ${{ matrix.java-version }} - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v2 + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 with: distribution: 'zulu' java-version: ${{ matrix.java-version }} cache: gradle - name: Build - uses: gradle/gradle-build-action@prerelease/v2.11.1 # v2 + uses: gradle/gradle-build-action@v2.11.1 # v2.11.1 with: gradle-version: 1.12 build-root-directory: picocli-tests-java567/