(groovy) branch danielsun/exclude-gradle-commits deleted (was d54ca19ac4)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/exclude-gradle-commits in repository https://gitbox.apache.org/repos/asf/groovy.git was d54ca19ac4 GROOVY-10378: coerce iterable to array or collection The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(groovy) branch master updated: Bump com.gradle.develocity from 3.17.3 to 3.17.4
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new ea4b1efad7 Bump com.gradle.develocity from 3.17.3 to 3.17.4
ea4b1efad7 is described below
commit ea4b1efad7dcb805b4f4fa6454fc95fa338147cb
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon May 20 01:21:50 2024 +
Bump com.gradle.develocity from 3.17.3 to 3.17.4
Bumps com.gradle.develocity from 3.17.3 to 3.17.4.
---
updated-dependencies:
- dependency-name: com.gradle.develocity
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
settings.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/settings.gradle b/settings.gradle
index cebaf1edc9..dab76fc025 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,7 +31,7 @@ pluginManagement {
// check https://gradle.com/enterprise/releases with new versions. GE plugin
version should not lag behind Gradle version
plugins {
// Before updating this, please check the compatibility from
https://docs.gradle.com/enterprise/compatibility/#develocity_compatibility and
https://ge.apache.org/scans.
-id "com.gradle.develocity" version "3.17.3"
+id "com.gradle.develocity" version "3.17.4"
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.1'
}
(groovy) branch master updated: Disable micronaut joint validation build for now
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new 55ababc445 Disable micronaut joint validation build for now 55ababc445 is described below commit 55ababc44546d2f459824ccae1313db8d93c1ae3 Author: Daniel Sun AuthorDate: Tue May 21 00:37:07 2024 +0900 Disable micronaut joint validation build for now --- .github/workflows/micronaut-joint-validation.yml | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/micronaut-joint-validation.yml b/.github/workflows/micronaut-joint-validation.yml index 88629810e5..24b062754b 100644 --- a/.github/workflows/micronaut-joint-validation.yml +++ b/.github/workflows/micronaut-joint-validation.yml @@ -15,7 +15,13 @@ name: "Micronaut Joint Validation Build" -on: [push, pull_request] +on: + push: +branches: + - disableForNowDueToFreakyDependency + pull_request: +branches: + - disableForNowDueToFreakyDependency permissions: contents: read
(groovy) branch GROOVY_4_0_X updated: Restore gradle-wrapper.jar
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
new b323abdcbe Restore gradle-wrapper.jar
b323abdcbe is described below
commit b323abdcbebcc216d80412fa014cdb26f5ff2143
Author: Daniel Sun
AuthorDate: Sun May 19 15:32:28 2024 +0900
Restore gradle-wrapper.jar
---
.github/workflows/grails-joint-validation.yml| 4 +---
.github/workflows/groovy-build-coverage.yml | 4 +---
.github/workflows/groovy-build-dist.yml | 4 +---
.github/workflows/groovy-build-test-19.yml | 4 +---
.github/workflows/groovy-build-test-ea.yml | 4 +---
.github/workflows/groovy-build-test.yml | 4 +---
.github/workflows/micronaut-joint-validation.yml | 3 ---
.gitignore | 1 -
gradle/wrapper/gradle-wrapper.jar| Bin 0 -> 43462 bytes
9 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/grails-joint-validation.yml
b/.github/workflows/grails-joint-validation.yml
index 768a0e100d..d16a4a0bf3 100644
--- a/.github/workflows/grails-joint-validation.yml
+++ b/.github/workflows/grails-joint-validation.yml
@@ -44,9 +44,7 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- - uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
+ - uses: gradle/gradle-build-action@v2
- name: env
run: env
diff --git a/.github/workflows/groovy-build-coverage.yml
b/.github/workflows/groovy-build-coverage.yml
index 38a3d3681c..d6d48f494c 100644
--- a/.github/workflows/groovy-build-coverage.yml
+++ b/.github/workflows/groovy-build-coverage.yml
@@ -38,9 +38,7 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
check-latest: true
- - uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
+ - uses: gradle/gradle-build-action@v2
- name: Test with Gradle
run: ./gradlew -Pcoverage=true jacocoAllReport
timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-dist.yml
b/.github/workflows/groovy-build-dist.yml
index e9d47b7dd6..3af37bc48f 100644
--- a/.github/workflows/groovy-build-dist.yml
+++ b/.github/workflows/groovy-build-dist.yml
@@ -35,9 +35,7 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
check-latest: true
- - uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
+ - uses: gradle/gradle-build-action@v2
- name: Install graphviz
run: sudo apt-get install -y graphviz
- name: Build and package
diff --git a/.github/workflows/groovy-build-test-19.yml
b/.github/workflows/groovy-build-test-19.yml
index 5406c5c02a..97491a9a76 100644
--- a/.github/workflows/groovy-build-test-19.yml
+++ b/.github/workflows/groovy-build-test-19.yml
@@ -39,9 +39,7 @@ jobs:
19
17
check-latest: true
- - uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
+ - uses: gradle/gradle-build-action@v2
- name: Test with Gradle
run: ./gradlew test -Ptarget.java.home=${{ env.JAVA_HOME_19_X64 }}
timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-test-ea.yml
b/.github/workflows/groovy-build-test-ea.yml
index d6ac8f03e2..700a02253e 100644
--- a/.github/workflows/groovy-build-test-ea.yml
+++ b/.github/workflows/groovy-build-test-ea.yml
@@ -45,9 +45,7 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
check-latest: true
- - uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
+ - uses: gradle/gradle-build-action@v2
- name: Test with Gradle
run: ./gradlew test -Ptarget.java.home=/home/runner/openjdk
timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index fc8c4ec18d..fdc3d7faf0 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -35,9 +35,7 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
check-latest: true
- - uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
+ - uses: gradle/gradle-build-action@v2
- name: Test with Gradle
run: ./gradlew test
timeout-minutes: 60
diff --git a/.github/workflows/micronaut-joint-validation.yml
b/.github/workflows/micronaut-joint-validation.yml
index 4165b2..4d496510cc 100644
--- a/.github/workflows/micronaut-joint-validation.
(groovy) branch master updated: Restore gradle-wrapper.jar
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 7ea128ee01 Restore gradle-wrapper.jar
7ea128ee01 is described below
commit 7ea128ee0186bdaa7193970b0eaaa4ad68624615
Author: Daniel Sun
AuthorDate: Sun May 19 15:30:41 2024 +0900
Restore gradle-wrapper.jar
---
.github/workflows/groovy-build-coverage.yml | 2 --
.github/workflows/groovy-build-dist.yml | 3 ---
.github/workflows/groovy-build-test.yml | 6 --
.github/workflows/groovy-rat-check.yml | 2 --
.github/workflows/micronaut-joint-validation.yml | 2 --
.gitignore | 1 -
gradle/wrapper/gradle-wrapper.jar| Bin 0 -> 61574 bytes
7 files changed, 16 deletions(-)
diff --git a/.github/workflows/groovy-build-coverage.yml
b/.github/workflows/groovy-build-coverage.yml
index 4b64332090..b9fbfffaa1 100644
--- a/.github/workflows/groovy-build-coverage.yml
+++ b/.github/workflows/groovy-build-coverage.yml
@@ -37,8 +37,6 @@ jobs:
java-version: 21
check-latest: true
- uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew -Pcoverage=true jacocoAllReport
timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-dist.yml
b/.github/workflows/groovy-build-dist.yml
index 50e0df155b..b52ab4961c 100644
--- a/.github/workflows/groovy-build-dist.yml
+++ b/.github/workflows/groovy-build-dist.yml
@@ -38,9 +38,6 @@ jobs:
java-version: 21
check-latest: true
- uses: actions/checkout@v4
- - uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
- name: Build and package
run: ./gradlew clean dist --no-build-cache --no-scan
--refresh-dependencies
timeout-minutes: 90
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index 05439d54b0..e78f7de114 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -39,8 +39,6 @@ jobs:
java-version: ${{ matrix.java }}
check-latest: true
- uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew test
timeout-minutes: 60
@@ -61,8 +59,6 @@ jobs:
java-version: ${{ matrix.java }}
check-latest: true
- uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew test
timeout-minutes: 60
@@ -89,8 +85,6 @@ jobs:
java-version: 21
check-latest: true
- uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew test -Ptarget.java.home=/home/runner/openjdk
timeout-minutes: 60
diff --git a/.github/workflows/groovy-rat-check.yml
b/.github/workflows/groovy-rat-check.yml
index 8cbc8488a3..c2e05872af 100644
--- a/.github/workflows/groovy-rat-check.yml
+++ b/.github/workflows/groovy-rat-check.yml
@@ -37,8 +37,6 @@ jobs:
java-version: 21
check-latest: true
- uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
- name: Check licenses with rat
run: ./gradlew rat
timeout-minutes: 60
diff --git a/.github/workflows/micronaut-joint-validation.yml
b/.github/workflows/micronaut-joint-validation.yml
index a85cc1c316..88629810e5 100644
--- a/.github/workflows/micronaut-joint-validation.yml
+++ b/.github/workflows/micronaut-joint-validation.yml
@@ -35,8 +35,6 @@ jobs:
java-version: 17
check-latest: true
- uses: gradle/actions/setup-gradle@v3
- - name: Bootstrap Gradle
-run: gradle -p bootstrap
- name: env
run: env
diff --git a/.gitignore b/.gitignore
index 4836f4fae4..c2473deabc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,3 @@ out/
.vscode
.jqwik-database
verification-metadata.dryrun.xml
-gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00..943f0cbfa7
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
(groovy) branch danielsun/exclude-gradle-commits created (now d54ca19ac4)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/exclude-gradle-commits in repository https://gitbox.apache.org/repos/asf/groovy.git at d54ca19ac4 GROOVY-10378: coerce iterable to array or collection No new revisions were added by this update.
(groovy) branch GROOVY_4_0_X updated: Bootstrap gradle
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
new 74f7c82b63 Bootstrap gradle
74f7c82b63 is described below
commit 74f7c82b63e87e418b76a9bd39318e444bb1bfd3
Author: Daniel Sun
AuthorDate: Sat May 18 23:25:28 2024 +0900
Bootstrap gradle
---
.github/workflows/grails-joint-validation.yml| 4 +++-
.github/workflows/groovy-build-coverage.yml | 4 +++-
.github/workflows/groovy-build-dist.yml | 4 +++-
.github/workflows/groovy-build-test-19.yml | 4 +++-
.github/workflows/groovy-build-test-ea.yml | 4 +++-
.github/workflows/groovy-build-test.yml | 4 +++-
.github/workflows/micronaut-joint-validation.yml | 3 +++
7 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/grails-joint-validation.yml
b/.github/workflows/grails-joint-validation.yml
index d16a4a0bf3..768a0e100d 100644
--- a/.github/workflows/grails-joint-validation.yml
+++ b/.github/workflows/grails-joint-validation.yml
@@ -44,7 +44,9 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- - uses: gradle/gradle-build-action@v2
+ - uses: gradle/actions/setup-gradle@v3
+ - name: Bootstrap Gradle
+run: gradle -p bootstrap
- name: env
run: env
diff --git a/.github/workflows/groovy-build-coverage.yml
b/.github/workflows/groovy-build-coverage.yml
index d6d48f494c..38a3d3681c 100644
--- a/.github/workflows/groovy-build-coverage.yml
+++ b/.github/workflows/groovy-build-coverage.yml
@@ -38,7 +38,9 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
check-latest: true
- - uses: gradle/gradle-build-action@v2
+ - uses: gradle/actions/setup-gradle@v3
+ - name: Bootstrap Gradle
+run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew -Pcoverage=true jacocoAllReport
timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-dist.yml
b/.github/workflows/groovy-build-dist.yml
index 3af37bc48f..e9d47b7dd6 100644
--- a/.github/workflows/groovy-build-dist.yml
+++ b/.github/workflows/groovy-build-dist.yml
@@ -35,7 +35,9 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
check-latest: true
- - uses: gradle/gradle-build-action@v2
+ - uses: gradle/actions/setup-gradle@v3
+ - name: Bootstrap Gradle
+run: gradle -p bootstrap
- name: Install graphviz
run: sudo apt-get install -y graphviz
- name: Build and package
diff --git a/.github/workflows/groovy-build-test-19.yml
b/.github/workflows/groovy-build-test-19.yml
index 97491a9a76..5406c5c02a 100644
--- a/.github/workflows/groovy-build-test-19.yml
+++ b/.github/workflows/groovy-build-test-19.yml
@@ -39,7 +39,9 @@ jobs:
19
17
check-latest: true
- - uses: gradle/gradle-build-action@v2
+ - uses: gradle/actions/setup-gradle@v3
+ - name: Bootstrap Gradle
+run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew test -Ptarget.java.home=${{ env.JAVA_HOME_19_X64 }}
timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-test-ea.yml
b/.github/workflows/groovy-build-test-ea.yml
index 700a02253e..d6ac8f03e2 100644
--- a/.github/workflows/groovy-build-test-ea.yml
+++ b/.github/workflows/groovy-build-test-ea.yml
@@ -45,7 +45,9 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
check-latest: true
- - uses: gradle/gradle-build-action@v2
+ - uses: gradle/actions/setup-gradle@v3
+ - name: Bootstrap Gradle
+run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew test -Ptarget.java.home=/home/runner/openjdk
timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index fdc3d7faf0..fc8c4ec18d 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -35,7 +35,9 @@ jobs:
distribution: 'zulu'
java-version: ${{ matrix.java }}
check-latest: true
- - uses: gradle/gradle-build-action@v2
+ - uses: gradle/actions/setup-gradle@v3
+ - name: Bootstrap Gradle
+run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew test
timeout-minutes: 60
diff --git a/.github/workflows/micronaut-joint-validation.yml
b/.github/workflows/micronaut-joint-validation.yml
index 4d496510cc..4165b2 100644
--- a/.github/workflows/micronaut-joint-validation.yml
+++ b/.github/workflows/micronaut-joint-validation.yml
@@ -34,6 +34,9 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 17
(groovy) branch master updated: Bootstrap gradle
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new 45644abae9 Bootstrap gradle 45644abae9 is described below commit 45644abae965050d281626a70d6315e180c74094 Author: Daniel Sun AuthorDate: Sat May 18 22:54:22 2024 +0900 Bootstrap gradle --- .github/workflows/groovy-build-coverage.yml | 2 ++ .github/workflows/groovy-build-dist.yml | 3 +++ .github/workflows/groovy-rat-check.yml | 2 ++ .github/workflows/micronaut-joint-validation.yml | 2 ++ 4 files changed, 9 insertions(+) diff --git a/.github/workflows/groovy-build-coverage.yml b/.github/workflows/groovy-build-coverage.yml index b9fbfffaa1..4b64332090 100644 --- a/.github/workflows/groovy-build-coverage.yml +++ b/.github/workflows/groovy-build-coverage.yml @@ -37,6 +37,8 @@ jobs: java-version: 21 check-latest: true - uses: gradle/actions/setup-gradle@v3 + - name: Bootstrap Gradle +run: gradle -p bootstrap - name: Test with Gradle run: ./gradlew -Pcoverage=true jacocoAllReport timeout-minutes: 60 diff --git a/.github/workflows/groovy-build-dist.yml b/.github/workflows/groovy-build-dist.yml index b52ab4961c..50e0df155b 100644 --- a/.github/workflows/groovy-build-dist.yml +++ b/.github/workflows/groovy-build-dist.yml @@ -38,6 +38,9 @@ jobs: java-version: 21 check-latest: true - uses: actions/checkout@v4 + - uses: gradle/actions/setup-gradle@v3 + - name: Bootstrap Gradle +run: gradle -p bootstrap - name: Build and package run: ./gradlew clean dist --no-build-cache --no-scan --refresh-dependencies timeout-minutes: 90 diff --git a/.github/workflows/groovy-rat-check.yml b/.github/workflows/groovy-rat-check.yml index c2e05872af..8cbc8488a3 100644 --- a/.github/workflows/groovy-rat-check.yml +++ b/.github/workflows/groovy-rat-check.yml @@ -37,6 +37,8 @@ jobs: java-version: 21 check-latest: true - uses: gradle/actions/setup-gradle@v3 + - name: Bootstrap Gradle +run: gradle -p bootstrap - name: Check licenses with rat run: ./gradlew rat timeout-minutes: 60 diff --git a/.github/workflows/micronaut-joint-validation.yml b/.github/workflows/micronaut-joint-validation.yml index 88629810e5..a85cc1c316 100644 --- a/.github/workflows/micronaut-joint-validation.yml +++ b/.github/workflows/micronaut-joint-validation.yml @@ -35,6 +35,8 @@ jobs: java-version: 17 check-latest: true - uses: gradle/actions/setup-gradle@v3 + - name: Bootstrap Gradle +run: gradle -p bootstrap - name: env run: env
(groovy) branch master updated: Bootstrap gradle
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 9be17090a8 Bootstrap gradle
9be17090a8 is described below
commit 9be17090a8ec35a4378bb419ea4c5a301fedf847
Author: Daniel Sun
AuthorDate: Sat May 18 22:46:46 2024 +0900
Bootstrap gradle
---
.github/workflows/groovy-build-test.yml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index e78f7de114..05439d54b0 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -39,6 +39,8 @@ jobs:
java-version: ${{ matrix.java }}
check-latest: true
- uses: gradle/actions/setup-gradle@v3
+ - name: Bootstrap Gradle
+run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew test
timeout-minutes: 60
@@ -59,6 +61,8 @@ jobs:
java-version: ${{ matrix.java }}
check-latest: true
- uses: gradle/actions/setup-gradle@v3
+ - name: Bootstrap Gradle
+run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew test
timeout-minutes: 60
@@ -85,6 +89,8 @@ jobs:
java-version: 21
check-latest: true
- uses: gradle/actions/setup-gradle@v3
+ - name: Bootstrap Gradle
+run: gradle -p bootstrap
- name: Test with Gradle
run: ./gradlew test -Ptarget.java.home=/home/runner/openjdk
timeout-minutes: 60
(groovy) branch GROOVY_4_0_X updated: Remove gradle-wrapper.jar
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push: new 3fcf955d6d Remove gradle-wrapper.jar 3fcf955d6d is described below commit 3fcf955d6df8e965825bcfaa9f0a5efe13a9974c Author: Daniel Sun AuthorDate: Sat May 18 22:33:39 2024 +0900 Remove gradle-wrapper.jar --- gradle/wrapper/gradle-wrapper.jar | Bin 43462 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index d64cd49177..00 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
(groovy) branch master updated: Remove gradle-wrapper.jar
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new 7674de6f30 Remove gradle-wrapper.jar 7674de6f30 is described below commit 7674de6f300c17a508705c01e5b51e96ba035e0c Author: Daniel Sun AuthorDate: Sat May 18 22:32:23 2024 +0900 Remove gradle-wrapper.jar --- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 943f0cbfa7..00 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
(groovy) branch GROOVY_4_0_X updated: Ignore gradle-wrapper.jar
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push: new 8a7b6f5658 Ignore gradle-wrapper.jar 8a7b6f5658 is described below commit 8a7b6f5658836a835e7be315b8d6f8dc5cb37676 Author: Daniel Sun AuthorDate: Sat May 18 22:16:28 2024 +0900 Ignore gradle-wrapper.jar --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c2473deabc..4836f4fae4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ out/ .vscode .jqwik-database verification-metadata.dryrun.xml +gradle/wrapper/gradle-wrapper.jar
(groovy) branch master updated: Ignore gradle-wrapper.jar
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new 9e461c68df Ignore gradle-wrapper.jar 9e461c68df is described below commit 9e461c68dfe72a75f624a151c6b822ed3600a1ac Author: Daniel Sun AuthorDate: Sat May 18 22:15:09 2024 +0900 Ignore gradle-wrapper.jar --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c2473deabc..4836f4fae4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ out/ .vscode .jqwik-database verification-metadata.dryrun.xml +gradle/wrapper/gradle-wrapper.jar
(groovy) branch danielsun/grace-joint-validation-build updated (bc7f9a731e -> 039e48b19a)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/grace-joint-validation-build in repository https://gitbox.apache.org/repos/asf/groovy.git discard bc7f9a731e Add grace joint validation build new 039e48b19a Add grace joint validation build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bc7f9a731e) \ N -- N -- N refs/heads/danielsun/grace-joint-validation-build (039e48b19a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/grace-joint-validation.yml | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)
(groovy) 01/01: Add grace joint validation build
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/grace-joint-validation-build
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 039e48b19aec2db6b4da3a0022bdedd2fa4a1c94
Author: Daniel Sun
AuthorDate: Sat May 18 21:44:01 2024 +0900
Add grace joint validation build
---
.github/workflows/grace-joint-validation.yml | 59
1 file changed, 59 insertions(+)
diff --git a/.github/workflows/grace-joint-validation.yml
b/.github/workflows/grace-joint-validation.yml
new file mode 100644
index 00..d0d48a935e
--- /dev/null
+++ b/.github/workflows/grace-joint-validation.yml
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "Grace Joint Validation Build"
+
+on: [push, pull_request]
+
+permissions:
+ contents: read
+
+jobs:
+ build:
+strategy:
+ fail-fast: true
+runs-on: ubuntu-latest
+env:
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
+with:
+ distribution: 'zulu'
+ java-version: 17
+ check-latest: true
+ - uses: gradle/actions/setup-gradle@v3
+ - name: env
+run: env
+
+ # Select correct Grace branch for this build:
+ - name: Checkout Grace 2023.0.x
+run: cd .. && git clone --depth 1
https://github.com/graceframework/grace-framework.git -b release/2023.0.0-M6
+
+ - name: Build and install groovy (no docs)
+run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x
groovydocAll -x asciidoc -x docGDK --no-build-cache --no-scan --no-daemon
+timeout-minutes: 60
+
+ - name: Set CI_GROOVY_VERSION for Grace
+run: |
+ echo 'CI_GROOVY_VERSION<> $GITHUB_ENV
+ echo "$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 |
tr -d '[:space:]' >> $GITHUB_ENV)" >> $GITHUB_ENV
+ echo 'EOF' >> $GITHUB_ENV
+
+ - name: echo CI_GROOVY_VERSION
+run: echo $CI_GROOVY_VERSION
+ - name: Build Grace
+run: cd ../grace-framework && ./gradlew clean build test -x groovydoc
-x codenarcMain -x codenarcTest -x checkstyleMain -x checkstyleTest
--no-build-cache --no-scan --no-daemon
+timeout-minutes: 60
(groovy) 01/01: Add grace joint validation build
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/grace-joint-validation-build
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit bc7f9a731e0a65afd76fdf1db54416171872d4b6
Author: Daniel Sun
AuthorDate: Sat May 18 21:44:01 2024 +0900
Add grace joint validation build
---
.github/workflows/grace-joint-validation.yml | 55
1 file changed, 55 insertions(+)
diff --git a/.github/workflows/grace-joint-validation.yml
b/.github/workflows/grace-joint-validation.yml
new file mode 100644
index 00..99266381f6
--- /dev/null
+++ b/.github/workflows/grace-joint-validation.yml
@@ -0,0 +1,55 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "Grace Joint Validation Build"
+
+on: [push, pull_request]
+
+permissions:
+ contents: read
+
+jobs:
+ build:
+strategy:
+ fail-fast: true
+runs-on: ubuntu-latest
+env:
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
+with:
+ distribution: 'zulu'
+ java-version: 17
+ check-latest: true
+ - uses: gradle/actions/setup-gradle@v3
+ - name: env
+run: env
+
+ # Select correct Grace branch for this build:
+ - name: Checkout Grace 2023.0.x
+run: cd .. && git clone --depth 1
https://github.com/graceframework/grace-framework.git -b release/2023.0.0-M6
+
+ - name: Build and install groovy (no docs)
+run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x
groovydocAll -x asciidoc -x docGDK --no-build-cache --no-scan --no-daemon
+timeout-minutes: 60
+
+ - name: Set CI_GROOVY_VERSION for Grace
+run: echo "CI_GROOVY_VERSION=$(cat gradle.properties | grep
groovyVersion | cut -d\= -f2 | tr -d '[:space:]')" >> $GITHUB_ENV
+ - name: echo CI_GROOVY_VERSION
+run: echo $CI_GROOVY_VERSION
+ - name: Build Grace
+run: cd ../grace-framework && ./gradlew clean build test -x groovydoc
-x codenarcMain -x codenarcTest -x checkstyleMain -x checkstyleTest
--no-build-cache --no-scan --no-daemon
+timeout-minutes: 60
(groovy) branch danielsun/grace-joint-validation-build created (now bc7f9a731e)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/grace-joint-validation-build in repository https://gitbox.apache.org/repos/asf/groovy.git at bc7f9a731e Add grace joint validation build This branch includes the following new commits: new bc7f9a731e Add grace joint validation build The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(groovy) branch master updated: Bump com.gradle.develocity from 3.17.2 to 3.17.3
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 26851b8757 Bump com.gradle.develocity from 3.17.2 to 3.17.3
26851b8757 is described below
commit 26851b875702655cf62eeca5026a4f56036e773f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon May 13 01:24:52 2024 +
Bump com.gradle.develocity from 3.17.2 to 3.17.3
Bumps com.gradle.develocity from 3.17.2 to 3.17.3.
---
updated-dependencies:
- dependency-name: com.gradle.develocity
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
settings.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/settings.gradle b/settings.gradle
index 79cd093bb7..cebaf1edc9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,7 +31,7 @@ pluginManagement {
// check https://gradle.com/enterprise/releases with new versions. GE plugin
version should not lag behind Gradle version
plugins {
// Before updating this, please check the compatibility from
https://docs.gradle.com/enterprise/compatibility/#develocity_compatibility and
https://ge.apache.org/scans.
-id "com.gradle.develocity" version "3.17.2"
+id "com.gradle.develocity" version "3.17.3"
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.1'
}
(groovy) branch danielsun/micronaut-joint-build-for-master deleted (was 2121e37f1e)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/micronaut-joint-build-for-master in repository https://gitbox.apache.org/repos/asf/groovy.git was 2121e37f1e Bump micronaut-groovy to 4.3.x This change permanently discards the following revisions: discard 2121e37f1e Bump micronaut-groovy to 4.3.x discard 6886215c05 Enable micronaut joint build validation
(groovy) branch master updated: Enable micronaut joint validation build
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new e15f8fce2a Enable micronaut joint validation build
e15f8fce2a is described below
commit e15f8fce2a5a762e60f1aa4fa26404cb4a816169
Author: Daniel Sun
AuthorDate: Mon May 13 03:40:12 2024 +0900
Enable micronaut joint validation build
---
.github/workflows/micronaut-joint-validation.yml | 30 ++--
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/micronaut-joint-validation.yml
b/.github/workflows/micronaut-joint-validation.yml
index 219180d8f9..88629810e5 100644
--- a/.github/workflows/micronaut-joint-validation.yml
+++ b/.github/workflows/micronaut-joint-validation.yml
@@ -14,13 +14,9 @@
# limitations under the License.
name: "Micronaut Joint Validation Build"
-on:
- push:
-branches:
- - GROOVY_3_0_X
- pull_request:
-branches:
- - GROOVY_3_0_X
+
+on: [push, pull_request]
+
permissions:
contents: read
@@ -28,16 +24,16 @@ jobs:
build:
strategy:
fail-fast: true
- matrix:
-os: [ubuntu-latest]
-runs-on: ${{ matrix.os }}
+runs-on: ubuntu-latest
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
- java-version: 11
+ distribution: 'zulu'
+ java-version: 17
+ check-latest: true
- uses: gradle/actions/setup-gradle@v3
- name: env
run: env
@@ -48,13 +44,13 @@ jobs:
# Clone Micronaut Repos
- name: Checkout Micronaut Core
-run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-core -b 2.3.x
+run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-core -b 4.4.x
- name: Checkout Micronaut Groovy
-run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-groovy -b master
+run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-groovy -b 4.3.x
- name: Build and install groovy (no docs)
-run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x
groovydocAll -x asciidoc -x docGDK --no-build-cache --no-scan --no-daemon
+run: ./gradlew --no-build-cache --no-daemon --no-scan clean install -x
asciidoc -x docGDK -x groovydoc -x javadoc -x javadocAll -x groovydocAll
timeout-minutes: 60
- name: Set CI_GROOVY_VERSION
@@ -62,10 +58,10 @@ jobs:
- name: echo CI_GROOVY_VERSION
run: echo $CI_GROOVY_VERSION
- - name: Check Micronaut Core
-run: cd ../micronaut-core && ./gradlew clean check --no-build-cache
--no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script
../maven-local-init.gradle
+ - name: Test Micronaut Core
+run: cd ../micronaut-core && ./gradlew --init-script
../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean test -x
:test-suite-kotlin-ksp:test -x :discovery-core:test -x
:test-suite-netty-ssl-graalvm:test -x :test-suite-kotlin:test -x
:inject-kotlin:test -x :inject-kotlin-test:test
-PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
- name: Check Micronaut Groovy
-run: cd ../micronaut-groovy && ./gradlew clean check --no-build-cache
--no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script
../maven-local-init.gradle
+run: cd ../micronaut-groovy && ./gradlew --init-script
../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean check
-PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
(groovy) branch danielsun/micronaut-joint-build-for-master updated: Bump micronaut-groovy to 4.3.x
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch danielsun/micronaut-joint-build-for-master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/danielsun/micronaut-joint-build-for-master by this push: new 2121e37f1e Bump micronaut-groovy to 4.3.x 2121e37f1e is described below commit 2121e37f1ee3196d6c49d383b54ccb4de2fcf739 Author: Daniel Sun AuthorDate: Mon May 13 03:29:31 2024 +0900 Bump micronaut-groovy to 4.3.x --- .github/workflows/micronaut-joint-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/micronaut-joint-validation.yml b/.github/workflows/micronaut-joint-validation.yml index 77a7c6973f..88629810e5 100644 --- a/.github/workflows/micronaut-joint-validation.yml +++ b/.github/workflows/micronaut-joint-validation.yml @@ -47,7 +47,7 @@ jobs: run: cd .. && git clone --depth 1 https://github.com/micronaut-projects/micronaut-core -b 4.4.x - name: Checkout Micronaut Groovy -run: cd .. && git clone --depth 1 https://github.com/micronaut-projects/micronaut-groovy -b 4.1.x +run: cd .. && git clone --depth 1 https://github.com/micronaut-projects/micronaut-groovy -b 4.3.x - name: Build and install groovy (no docs) run: ./gradlew --no-build-cache --no-daemon --no-scan clean install -x asciidoc -x docGDK -x groovydoc -x javadoc -x javadocAll -x groovydocAll
(groovy) branch danielsun/micronaut-joint-build-for-master updated (b5ed743403 -> 6886215c05)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/micronaut-joint-build-for-master in repository https://gitbox.apache.org/repos/asf/groovy.git discard b5ed743403 Enable micronaut joint build validation new 6886215c05 Enable micronaut joint build validation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b5ed743403) \ N -- N -- N refs/heads/danielsun/micronaut-joint-build-for-master (6886215c05) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/micronaut-joint-validation.yml | 12 +++- 1 file changed, 3 insertions(+), 9 deletions(-)
(groovy) 01/01: Enable micronaut joint build validation
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/micronaut-joint-build-for-master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 6886215c05ade8efb84268eb07ed077ed0859cdd
Author: Daniel Sun
AuthorDate: Mon May 13 02:29:49 2024 +0900
Enable micronaut joint build validation
---
.github/workflows/micronaut-joint-validation.yml | 30 ++--
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/micronaut-joint-validation.yml
b/.github/workflows/micronaut-joint-validation.yml
index 219180d8f9..77a7c6973f 100644
--- a/.github/workflows/micronaut-joint-validation.yml
+++ b/.github/workflows/micronaut-joint-validation.yml
@@ -14,13 +14,9 @@
# limitations under the License.
name: "Micronaut Joint Validation Build"
-on:
- push:
-branches:
- - GROOVY_3_0_X
- pull_request:
-branches:
- - GROOVY_3_0_X
+
+on: [push, pull_request]
+
permissions:
contents: read
@@ -28,16 +24,16 @@ jobs:
build:
strategy:
fail-fast: true
- matrix:
-os: [ubuntu-latest]
-runs-on: ${{ matrix.os }}
+runs-on: ubuntu-latest
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
- java-version: 11
+ distribution: 'zulu'
+ java-version: 17
+ check-latest: true
- uses: gradle/actions/setup-gradle@v3
- name: env
run: env
@@ -48,13 +44,13 @@ jobs:
# Clone Micronaut Repos
- name: Checkout Micronaut Core
-run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-core -b 2.3.x
+run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-core -b 4.4.x
- name: Checkout Micronaut Groovy
-run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-groovy -b master
+run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-groovy -b 4.1.x
- name: Build and install groovy (no docs)
-run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x
groovydocAll -x asciidoc -x docGDK --no-build-cache --no-scan --no-daemon
+run: ./gradlew --no-build-cache --no-daemon --no-scan clean install -x
asciidoc -x docGDK -x groovydoc -x javadoc -x javadocAll -x groovydocAll
timeout-minutes: 60
- name: Set CI_GROOVY_VERSION
@@ -62,10 +58,10 @@ jobs:
- name: echo CI_GROOVY_VERSION
run: echo $CI_GROOVY_VERSION
- - name: Check Micronaut Core
-run: cd ../micronaut-core && ./gradlew clean check --no-build-cache
--no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script
../maven-local-init.gradle
+ - name: Test Micronaut Core
+run: cd ../micronaut-core && ./gradlew --init-script
../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean test -x
:test-suite-kotlin-ksp:test -x :discovery-core:test -x
:test-suite-netty-ssl-graalvm:test -x :test-suite-kotlin:test -x
:inject-kotlin:test -x :inject-kotlin-test:test
-PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
- name: Check Micronaut Groovy
-run: cd ../micronaut-groovy && ./gradlew clean check --no-build-cache
--no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script
../maven-local-init.gradle
+run: cd ../micronaut-groovy && ./gradlew --init-script
../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean check
-PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
(groovy) 01/01: Enable micronaut joint build validation
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/micronaut-joint-build-for-master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit b5ed743403bb8546d4b376cdcc2a490069631a8f
Author: Daniel Sun
AuthorDate: Mon May 13 02:29:49 2024 +0900
Enable micronaut joint build validation
---
.github/workflows/micronaut-joint-validation.yml | 26 +---
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/micronaut-joint-validation.yml
b/.github/workflows/micronaut-joint-validation.yml
index 219180d8f9..7f45473bf9 100644
--- a/.github/workflows/micronaut-joint-validation.yml
+++ b/.github/workflows/micronaut-joint-validation.yml
@@ -17,10 +17,12 @@ name: "Micronaut Joint Validation Build"
on:
push:
branches:
- - GROOVY_3_0_X
+ - master
+ - danielsun/micronaut-joint-build-for-master
pull_request:
branches:
- - GROOVY_3_0_X
+ - master
+ - danielsun/micronaut-joint-build-for-master
permissions:
contents: read
@@ -28,16 +30,16 @@ jobs:
build:
strategy:
fail-fast: true
- matrix:
-os: [ubuntu-latest]
-runs-on: ${{ matrix.os }}
+runs-on: ubuntu-latest
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
- java-version: 11
+ distribution: 'zulu'
+ java-version: 17
+ check-latest: true
- uses: gradle/actions/setup-gradle@v3
- name: env
run: env
@@ -48,13 +50,13 @@ jobs:
# Clone Micronaut Repos
- name: Checkout Micronaut Core
-run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-core -b 2.3.x
+run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-core -b 4.4.x
- name: Checkout Micronaut Groovy
-run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-groovy -b master
+run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-groovy -b 4.1.x
- name: Build and install groovy (no docs)
-run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x
groovydocAll -x asciidoc -x docGDK --no-build-cache --no-scan --no-daemon
+run: ./gradlew --no-build-cache --no-daemon --no-scan clean install -x
asciidoc -x docGDK -x groovydoc -x javadoc -x javadocAll -x groovydocAll
timeout-minutes: 60
- name: Set CI_GROOVY_VERSION
@@ -62,10 +64,10 @@ jobs:
- name: echo CI_GROOVY_VERSION
run: echo $CI_GROOVY_VERSION
- - name: Check Micronaut Core
-run: cd ../micronaut-core && ./gradlew clean check --no-build-cache
--no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script
../maven-local-init.gradle
+ - name: Test Micronaut Core
+run: cd ../micronaut-core && ./gradlew --init-script
../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean test -x
:test-suite-kotlin-ksp:test -x :discovery-core:test -x
:test-suite-netty-ssl-graalvm:test -x :test-suite-kotlin:test -x
:inject-kotlin:test -x :inject-kotlin-test:test
-PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
- name: Check Micronaut Groovy
-run: cd ../micronaut-groovy && ./gradlew clean check --no-build-cache
--no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script
../maven-local-init.gradle
+run: cd ../micronaut-groovy && ./gradlew --init-script
../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean check
-PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
(groovy) branch danielsun/micronaut-joint-build-for-master updated (bf119d8d76 -> b5ed743403)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/micronaut-joint-build-for-master in repository https://gitbox.apache.org/repos/asf/groovy.git discard bf119d8d76 Enable micronaut joint build validation new b5ed743403 Enable micronaut joint build validation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bf119d8d76) \ N -- N -- N refs/heads/danielsun/micronaut-joint-build-for-master (b5ed743403) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/micronaut-joint-validation.yml | 2 ++ 1 file changed, 2 insertions(+)
(groovy) 01/01: Enable micronaut joint build validation
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/micronaut-joint-build-for-master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit bf119d8d7634cccfafc7d513f96361813cce5e7e
Author: Daniel Sun
AuthorDate: Mon May 13 02:29:49 2024 +0900
Enable micronaut joint build validation
---
.github/workflows/micronaut-joint-validation.yml | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/micronaut-joint-validation.yml
b/.github/workflows/micronaut-joint-validation.yml
index 219180d8f9..a77379480c 100644
--- a/.github/workflows/micronaut-joint-validation.yml
+++ b/.github/workflows/micronaut-joint-validation.yml
@@ -17,10 +17,12 @@ name: "Micronaut Joint Validation Build"
on:
push:
branches:
- - GROOVY_3_0_X
+ - master
+ - danielsun/micronaut-joint-build-for-master
pull_request:
branches:
- - GROOVY_3_0_X
+ - master
+ - danielsun/micronaut-joint-build-for-master
permissions:
contents: read
@@ -28,16 +30,14 @@ jobs:
build:
strategy:
fail-fast: true
- matrix:
-os: [ubuntu-latest]
-runs-on: ${{ matrix.os }}
+runs-on: ubuntu-latest
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
- java-version: 11
+ java-version: 17
- uses: gradle/actions/setup-gradle@v3
- name: env
run: env
@@ -48,13 +48,13 @@ jobs:
# Clone Micronaut Repos
- name: Checkout Micronaut Core
-run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-core -b 2.3.x
+run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-core -b 4.4.x
- name: Checkout Micronaut Groovy
-run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-groovy -b master
+run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-groovy -b 4.1.x
- name: Build and install groovy (no docs)
-run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x
groovydocAll -x asciidoc -x docGDK --no-build-cache --no-scan --no-daemon
+run: ./gradlew --no-build-cache --no-daemon --no-scan clean install -x
asciidoc -x docGDK -x groovydoc -x javadoc -x javadocAll -x groovydocAll
timeout-minutes: 60
- name: Set CI_GROOVY_VERSION
@@ -62,10 +62,10 @@ jobs:
- name: echo CI_GROOVY_VERSION
run: echo $CI_GROOVY_VERSION
- - name: Check Micronaut Core
-run: cd ../micronaut-core && ./gradlew clean check --no-build-cache
--no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script
../maven-local-init.gradle
+ - name: Test Micronaut Core
+run: cd ../micronaut-core && ./gradlew --init-script
../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean test -x
:test-suite-kotlin-ksp:test -x :discovery-core:test -x
:test-suite-netty-ssl-graalvm:test -x :test-suite-kotlin:test -x
:inject-kotlin:test -x :inject-kotlin-test:test
-PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
- name: Check Micronaut Groovy
-run: cd ../micronaut-groovy && ./gradlew clean check --no-build-cache
--no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script
../maven-local-init.gradle
+run: cd ../micronaut-groovy && ./gradlew --init-script
../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean check
-PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
(groovy) branch danielsun/micronaut-joint-build-for-master updated (47de3bbe8b -> bf119d8d76)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/micronaut-joint-build-for-master in repository https://gitbox.apache.org/repos/asf/groovy.git discard 47de3bbe8b Enable micronaut joint build validation discard 2274e60a6f Enable micronaut joint build validation new bf119d8d76 Enable micronaut joint build validation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (47de3bbe8b) \ N -- N -- N refs/heads/danielsun/micronaut-joint-build-for-master (bf119d8d76) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/micronaut-joint-validation.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
(groovy) branch danielsun/micronaut-joint-build-for-master updated: Enable micronaut joint build validation
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch danielsun/micronaut-joint-build-for-master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/danielsun/micronaut-joint-build-for-master by this push: new 47de3bbe8b Enable micronaut joint build validation 47de3bbe8b is described below commit 47de3bbe8b8891ea8ad720c973d136386c973433 Author: Daniel Sun AuthorDate: Mon May 13 02:25:42 2024 +0900 Enable micronaut joint build validation --- .github/workflows/micronaut-joint-validation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/micronaut-joint-validation.yml b/.github/workflows/micronaut-joint-validation.yml index fb3215e537..f738939f4b 100644 --- a/.github/workflows/micronaut-joint-validation.yml +++ b/.github/workflows/micronaut-joint-validation.yml @@ -18,9 +18,11 @@ on: push: branches: - master + - danielsun/micronaut-joint-build-for-master pull_request: branches: - master + - danielsun/micronaut-joint-build-for-master permissions: contents: read
(groovy) branch danielsun/micronaut-joint-build-for-master created (now 2274e60a6f)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/micronaut-joint-build-for-master in repository https://gitbox.apache.org/repos/asf/groovy.git at 2274e60a6f Enable micronaut joint build validation This branch includes the following new commits: new 2274e60a6f Enable micronaut joint build validation The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(groovy) 01/01: Enable micronaut joint build validation
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/micronaut-joint-build-for-master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 2274e60a6f80581ae349b27af5336549faa85026
Author: Daniel Sun
AuthorDate: Sun Feb 12 03:34:08 2023 +0900
Enable micronaut joint build validation
---
.github/workflows/micronaut-joint-validation.yml | 25
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/micronaut-joint-validation.yml
b/.github/workflows/micronaut-joint-validation.yml
index 219180d8f9..fb3215e537 100644
--- a/.github/workflows/micronaut-joint-validation.yml
+++ b/.github/workflows/micronaut-joint-validation.yml
@@ -17,10 +17,10 @@ name: "Micronaut Joint Validation Build"
on:
push:
branches:
- - GROOVY_3_0_X
+ - master
pull_request:
branches:
- - GROOVY_3_0_X
+ - master
permissions:
contents: read
@@ -28,16 +28,15 @@ jobs:
build:
strategy:
fail-fast: true
- matrix:
-os: [ubuntu-latest]
-runs-on: ${{ matrix.os }}
+runs-on: ubuntu-latest
env:
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@v4
- - uses: actions/setup-java@v4
+ - name: Set up JDK
+uses: actions/setup-java@v4
with:
- java-version: 11
+ java-version: 17
- uses: gradle/actions/setup-gradle@v3
- name: env
run: env
@@ -48,13 +47,13 @@ jobs:
# Clone Micronaut Repos
- name: Checkout Micronaut Core
-run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-core -b 2.3.x
+run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-core -b 4.4.x
- name: Checkout Micronaut Groovy
-run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-groovy -b master
+run: cd .. && git clone --depth 1
https://github.com/micronaut-projects/micronaut-groovy -b 4.1.x
- name: Build and install groovy (no docs)
-run: ./gradlew clean install -x groovydoc -x javadoc -x javadocAll -x
groovydocAll -x asciidoc -x docGDK --no-build-cache --no-scan --no-daemon
+run: ./gradlew --no-build-cache --no-daemon --no-scan clean install -x
asciidoc -x docGDK -x groovydoc -x javadoc -x javadocAll -x groovydocAll
timeout-minutes: 60
- name: Set CI_GROOVY_VERSION
@@ -62,10 +61,10 @@ jobs:
- name: echo CI_GROOVY_VERSION
run: echo $CI_GROOVY_VERSION
- - name: Check Micronaut Core
-run: cd ../micronaut-core && ./gradlew clean check --no-build-cache
--no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script
../maven-local-init.gradle
+ - name: Test Micronaut Core
+run: cd ../micronaut-core && ./gradlew --init-script
../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean test -x
:test-suite-kotlin-ksp:test -x :discovery-core:test -x
:test-suite-netty-ssl-graalvm:test -x :test-suite-kotlin:test -x
:inject-kotlin:test -x :inject-kotlin-test:test
-PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
- name: Check Micronaut Groovy
-run: cd ../micronaut-groovy && ./gradlew clean check --no-build-cache
--no-scan --no-daemon -PgroovyVersion=$CI_GROOVY_VERSION --init-script
../maven-local-init.gradle
+run: cd ../micronaut-groovy && ./gradlew --init-script
../maven-local-init.gradle --no-build-cache --no-daemon --no-scan clean check
-PgroovyVersion=$CI_GROOVY_VERSION
timeout-minutes: 60
(groovy) branch GROOVY-11354 deleted (was 8f33faae50)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch GROOVY-11354 in repository https://gitbox.apache.org/repos/asf/groovy.git was 8f33faae50 GROOVY-11354: Bump javaparser to 3.25.10 This change permanently discards the following revisions: discard 8f33faae50 GROOVY-11354: Bump javaparser to 3.25.10
(groovy) branch danielsun/ga-codeql deleted (was 48160c1207)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/ga-codeql in repository https://gitbox.apache.org/repos/asf/groovy.git was 48160c1207 Support CodeQL Analysis The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(groovy) branch master updated: Try to support CodeQL analysis (#2079)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 2989653924 Try to support CodeQL analysis (#2079)
2989653924 is described below
commit 298965392466bf4bbe1248d6e1adb74215d2ee6f
Author: Daniel Sun
AuthorDate: Sat Apr 20 09:35:31 2024 +0800
Try to support CodeQL analysis (#2079)
---
.github/workflows/codeql-analysis.yml | 77 +++
1 file changed, 77 insertions(+)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 00..a547355e84
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,77 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "CodeQL"
+
+on: [push, pull_request]
+
+jobs:
+ analyze:
+name: Analyze
+runs-on: ubuntu-latest
+permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+strategy:
+ fail-fast: false
+ matrix:
+language: [ 'java' ]
+# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript',
'python', 'ruby' ]
+# Learn more about CodeQL language support at
https://git.io/codeql-language-support
+java: [21]
+
+steps:
+- name: Checkout repository
+ uses: actions/checkout@v4
+
+
+- name: Install Java
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'zulu'
+ java-version: ${{ matrix.java }}
+ check-latest: true
+
+
+# Initializes the CodeQL tools for scanning.
+- name: Initialize CodeQL
+ uses: github/codeql-action/init@v3
+ with:
+languages: ${{ matrix.language }}
+# If you wish to specify custom queries, you can do so here or in a
config file.
+# By default, queries listed here will override any specified in a
config file.
+# Prefix the list here with "+" to use these queries and those in the
config file.
+# queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+# If this step fails, then you should remove it and run the build manually
(see below)
+- name: Autobuild
+ uses: github/codeql-action/autobuild@v3
+
+# ℹ️ Command-line programs to run using the OS shell.
+# https://git.io/JvXDl
+
+# ✏️ If the Autobuild fails above, remove it and uncomment the following
three lines
+#and modify them (or add more) to build your code if your project
+#uses a compiled language
+
+#- run: |
+# make bootstrap
+# make release
+
+- name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v3
(groovy) branch danielsun/ga-codeql created (now 0b303ea036)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/ga-codeql in repository https://gitbox.apache.org/repos/asf/groovy.git at 0b303ea036 revert: deprecated build usage (needs further work) No new revisions were added by this update.
(groovy) branch danielsun/ga-codeql updated: Support CodeQL Analysis
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/ga-codeql
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/danielsun/ga-codeql by this
push:
new 48160c1207 Support CodeQL Analysis
48160c1207 is described below
commit 48160c1207d318030d5410310ba010004e063000
Author: Daniel Sun
AuthorDate: Sat Apr 20 09:13:19 2024 +0800
Support CodeQL Analysis
---
.github/workflows/codeql-analysis.yml | 77 +++
1 file changed, 77 insertions(+)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 00..a547355e84
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,77 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: "CodeQL"
+
+on: [push, pull_request]
+
+jobs:
+ analyze:
+name: Analyze
+runs-on: ubuntu-latest
+permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+strategy:
+ fail-fast: false
+ matrix:
+language: [ 'java' ]
+# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript',
'python', 'ruby' ]
+# Learn more about CodeQL language support at
https://git.io/codeql-language-support
+java: [21]
+
+steps:
+- name: Checkout repository
+ uses: actions/checkout@v4
+
+
+- name: Install Java
+ uses: actions/setup-java@v4
+ with:
+ distribution: 'zulu'
+ java-version: ${{ matrix.java }}
+ check-latest: true
+
+
+# Initializes the CodeQL tools for scanning.
+- name: Initialize CodeQL
+ uses: github/codeql-action/init@v3
+ with:
+languages: ${{ matrix.language }}
+# If you wish to specify custom queries, you can do so here or in a
config file.
+# By default, queries listed here will override any specified in a
config file.
+# Prefix the list here with "+" to use these queries and those in the
config file.
+# queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+# If this step fails, then you should remove it and run the build manually
(see below)
+- name: Autobuild
+ uses: github/codeql-action/autobuild@v3
+
+# ℹ️ Command-line programs to run using the OS shell.
+# https://git.io/JvXDl
+
+# ✏️ If the Autobuild fails above, remove it and uncomment the following
three lines
+#and modify them (or add more) to build your code if your project
+#uses a compiled language
+
+#- run: |
+# make bootstrap
+# make release
+
+- name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v3
(groovy) branch master updated: Bump gradle/wrapper-validation-action from 2 to 3
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new 42bd277dd9 Bump gradle/wrapper-validation-action from 2 to 3 42bd277dd9 is described below commit 42bd277dd9ede0f7a3a3f090debdcbb5a9149a0f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Apr 15 01:42:00 2024 + Bump gradle/wrapper-validation-action from 2 to 3 Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2 to 3. - [Release notes](https://github.com/gradle/wrapper-validation-action/releases) - [Commits](https://github.com/gradle/wrapper-validation-action/compare/v2...v3) --- updated-dependencies: - dependency-name: gradle/wrapper-validation-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/gradle-wrapper-validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 91ddc918f8..212717e064 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -36,4 +36,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: gradle/wrapper-validation-action@v2 + - uses: gradle/wrapper-validation-action@v3
(groovy) 01/02: GROOVY-11354: Bump javaparser to 3.25.10
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git commit 842ae91c68fbcb3e8236c6cec5ab8cbb08945479 Author: Daniel Sun AuthorDate: Fri Apr 5 02:54:30 2024 +0800 GROOVY-11354: Bump javaparser to 3.25.10 (cherry picked from commit baeb2a608a376746043ea8a69f2acde67baddfef) --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 3cb99bbe72..87eeb71ac9 100644 --- a/versions.properties +++ b/versions.properties @@ -32,7 +32,7 @@ jacksonDatabind=2.17.0 jackson=2.17.0 # later jarjar versions sometimes leave empty META-INF/services files jarjar=1.8.0 -javaParser=3.25.9 +javaParser=3.25.10 jline=2.14.6 jmh=1.37 jmock=1.2.0
(groovy) 02/02: Update dependency metadata
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git commit 73e602e55f4bae44596155f48c6ccd20d5492f0e Author: Daniel Sun AuthorDate: Fri Apr 5 03:16:15 2024 +0800 Update dependency metadata --- gradle/verification-metadata.xml | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index b518d227e3..dbd3856f46 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -213,6 +213,11 @@ + + + + + @@ -375,10 +380,15 @@ + + + + + - + @@ -462,16 +472,6 @@ - - - - - - - - - - @@ -733,7 +733,7 @@ - +
(groovy) branch GROOVY_4_0_X updated (66b65b2443 -> 73e602e55f)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git from 66b65b2443 GROOVY-11350: Bump log4j2 version to 2.23.1 (test dependency) new 842ae91c68 GROOVY-11354: Bump javaparser to 3.25.10 new 73e602e55f Update dependency metadata The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gradle/verification-metadata.xml | 24 versions.properties | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-)
(groovy) branch master updated (bf9aa9ea65 -> f6689a2328)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from bf9aa9ea65 Bump org.sonarqube from 4.4.1.3373 to 5.0.0.4638 new baeb2a608a GROOVY-11354: Bump javaparser to 3.25.10 new f6689a2328 Update dependency metadata The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gradle/verification-metadata.xml | 52 versions.properties | 2 +- 2 files changed, 32 insertions(+), 22 deletions(-)
(groovy) 01/02: GROOVY-11354: Bump javaparser to 3.25.10
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git commit baeb2a608a376746043ea8a69f2acde67baddfef Author: Daniel Sun AuthorDate: Fri Apr 5 02:54:30 2024 +0800 GROOVY-11354: Bump javaparser to 3.25.10 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index c8ce80277c..44c36faae7 100644 --- a/versions.properties +++ b/versions.properties @@ -33,7 +33,7 @@ jacksonDatabind=2.17.0 jackson=2.17.0 # later jarjar versions sometimes leave empty META-INF/services files jarjar=1.8.0 -javaParser=3.25.9 +javaParser=3.25.10 jline=2.14.6 jmh=1.37 jruby=9.2.17.0
(groovy) 02/02: Update dependency metadata
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git commit f6689a2328eb63996623aa4a210ad8937d7d9e0e Author: Daniel Sun AuthorDate: Fri Apr 5 03:05:39 2024 +0800 Update dependency metadata --- gradle/verification-metadata.xml | 52 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 6282cafb0e..2ba4b07177 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -42,37 +42,37 @@ false true - + + + - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + + + + + + + - - @@ -216,6 +216,11 @@ + + + + + @@ -876,6 +881,11 @@ + + + + +
(groovy) branch GROOVY-11354 created (now 8f33faae50)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch GROOVY-11354 in repository https://gitbox.apache.org/repos/asf/groovy.git at 8f33faae50 GROOVY-11354: Bump javaparser to 3.25.10 This branch includes the following new commits: new 8f33faae50 GROOVY-11354: Bump javaparser to 3.25.10 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(groovy) 01/01: GROOVY-11354: Bump javaparser to 3.25.10
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY-11354 in repository https://gitbox.apache.org/repos/asf/groovy.git commit 8f33faae5007f16e39e6b4fd5e5e4b378e8ec779 Author: Daniel Sun AuthorDate: Fri Apr 5 02:54:30 2024 +0800 GROOVY-11354: Bump javaparser to 3.25.10 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index c8ce80277c..44c36faae7 100644 --- a/versions.properties +++ b/versions.properties @@ -33,7 +33,7 @@ jacksonDatabind=2.17.0 jackson=2.17.0 # later jarjar versions sometimes leave empty META-INF/services files jarjar=1.8.0 -javaParser=3.25.9 +javaParser=3.25.10 jline=2.14.6 jmh=1.37 jruby=9.2.17.0
(groovy) branch danielsun/tweak_gawf deleted (was 2943033473)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/tweak_gawf in repository https://gitbox.apache.org/repos/asf/groovy.git was 2943033473 Add JDK 22-ea build This change permanently discards the following revisions: discard 2943033473 Add JDK 22-ea build discard 036e31779b Merge additional JDK builds discard 9ae1d96371 GROOVY-11292: Class without sealed parent cannot be non-sealed
(groovy) branch danielsun/tweak_gawf_20240122 deleted (was 4850b78a0a)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/tweak_gawf_20240122 in repository https://gitbox.apache.org/repos/asf/groovy.git was 4850b78a0a Add JDK 22-ea build This change permanently discards the following revisions: discard 4850b78a0a Add JDK 22-ea build discard 70672ed9ed Merge additional JDK builds
(groovy) branch danielsun/try-ga-jdk22 deleted (was 3665b48e8c)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/try-ga-jdk22 in repository https://gitbox.apache.org/repos/asf/groovy.git was 3665b48e8c Use JDK 22 provided by GitHub Action This change permanently discards the following revisions: discard 3665b48e8c Use JDK 22 provided by GitHub Action
(groovy) 01/01: Use JDK 22 provided by GitHub Action
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/try-ga-jdk22
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3665b48e8ce42a0156a91d07e18d72fabd1e4562
Author: Daniel Sun
AuthorDate: Thu Mar 28 21:53:16 2024 +0800
Use JDK 22 provided by GitHub Action
---
.github/workflows/groovy-build-test.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index c382aa5889..0040a3521d 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -49,7 +49,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
-java: [12, 13, 14, 15, 16, 18, 19, 20]
+java: [12, 13, 14, 15, 16, 18, 19, 20, 22]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
@@ -70,7 +70,6 @@ jobs:
os: [ubuntu-latest]
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
jdk:
- -
"https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz;
-
"https://download.java.net/java/early_access/jdk23/15/GPL/openjdk-23-ea+15_linux-x64_bin.tar.gz;
runs-on: ${{ matrix.os }}
steps:
(groovy) branch danielsun/try-ga-jdk22 created (now 3665b48e8c)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/try-ga-jdk22 in repository https://gitbox.apache.org/repos/asf/groovy.git at 3665b48e8c Use JDK 22 provided by GitHub Action This branch includes the following new commits: new 3665b48e8c Use JDK 22 provided by GitHub Action The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(groovy) branch danielsun/bump_deps_20240310 deleted (was 96230e899c)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/bump_deps_20240310 in repository https://gitbox.apache.org/repos/asf/groovy.git was 96230e899c Update dependency metadata The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(groovy) branch danielsun/try-jdk23 deleted (was e1cd8243d8)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/try-jdk23 in repository https://gitbox.apache.org/repos/asf/groovy.git was e1cd8243d8 Fix failing test for JDK 23 This change permanently discards the following revisions: discard e1cd8243d8 Fix failing test for JDK 23 discard fd4c10a1bc Add JDK23 build
(groovy) 02/02: GROOVY-11347: Fix failing test for JDK 23
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 412e6e717aee10ae27aa728df726ba1459cf9a07
Author: Daniel Sun
AuthorDate: Wed Mar 27 01:01:55 2024 +0800
GROOVY-11347: Fix failing test for JDK 23
---
src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
b/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
index 28053ab970..037742c018 100644
--- a/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
+++ b/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
@@ -38,6 +38,8 @@ class AppendableDgmMethodsTest extends GroovyTestCase {
f.format(" %tY", Date.parse('dd MM ', '01 01 2001'))
f.format(Locale.FRANCE, " e = %+10.4f", Math.E)
}
-assert store.join('') == 'hello [a:1, b:2] 2001 e =+2,7183'
+assert store.join('') in ['hello [a:1, b:2] 2001 e =+2,7183',
+ 'hello [a:1, b:2] 2001 e =+2.7183' //
for JDK 23
+ ]
}
}
(groovy) 01/02: GROOVY-11347: Add JDK23 build
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit c45e58086029d2257fae4fb95ac381a782f807ed
Author: Daniel Sun
AuthorDate: Wed Mar 27 00:25:00 2024 +0800
GROOVY-11347: Add JDK23 build
---
.github/workflows/groovy-build-test.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index 8d164c7e84..c382aa5889 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -71,8 +71,7 @@ jobs:
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
jdk:
-
"https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz;
-# TODO: JDK 23 is not working for now.
-# -
"https://download.java.net/java/early_access/jdk23/12/GPL/openjdk-23-ea+12_linux-x64_bin.tar.gz;
+ -
"https://download.java.net/java/early_access/jdk23/15/GPL/openjdk-23-ea+15_linux-x64_bin.tar.gz;
runs-on: ${{ matrix.os }}
steps:
- name: Download JDK ${{ matrix.jdk }}
(groovy) branch master updated (61568fc0c0 -> 412e6e717a)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from 61568fc0c0 GROOVY-11347: Support JDK 23 new c45e580860 GROOVY-11347: Add JDK23 build new 412e6e717a GROOVY-11347: Fix failing test for JDK 23 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/groovy-build-test.yml | 3 +-- src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-)
(groovy) branch danielsun/try-jdk23 updated: Fix failing test for JDK 23
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/try-jdk23
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/danielsun/try-jdk23 by this
push:
new e1cd8243d8 Fix failing test for JDK 23
e1cd8243d8 is described below
commit e1cd8243d868fa681d76e7c5d951610e30e036e4
Author: Daniel Sun
AuthorDate: Wed Mar 27 01:01:55 2024 +0800
Fix failing test for JDK 23
---
src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
b/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
index 28053ab970..037742c018 100644
--- a/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
+++ b/src/test/org/codehaus/groovy/runtime/AppendableDgmMethodsTest.groovy
@@ -38,6 +38,8 @@ class AppendableDgmMethodsTest extends GroovyTestCase {
f.format(" %tY", Date.parse('dd MM ', '01 01 2001'))
f.format(Locale.FRANCE, " e = %+10.4f", Math.E)
}
-assert store.join('') == 'hello [a:1, b:2] 2001 e =+2,7183'
+assert store.join('') in ['hello [a:1, b:2] 2001 e =+2,7183',
+ 'hello [a:1, b:2] 2001 e =+2.7183' //
for JDK 23
+ ]
}
}
(groovy) 01/01: Add JDK23 build
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/try-jdk23
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit fd4c10a1bc021e7064f2c9eb050f096f09efd9b7
Author: Daniel Sun
AuthorDate: Wed Mar 27 00:25:00 2024 +0800
Add JDK23 build
---
.github/workflows/groovy-build-test.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index 8d164c7e84..c382aa5889 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -71,8 +71,7 @@ jobs:
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
jdk:
-
"https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz;
-# TODO: JDK 23 is not working for now.
-# -
"https://download.java.net/java/early_access/jdk23/12/GPL/openjdk-23-ea+12_linux-x64_bin.tar.gz;
+ -
"https://download.java.net/java/early_access/jdk23/15/GPL/openjdk-23-ea+15_linux-x64_bin.tar.gz;
runs-on: ${{ matrix.os }}
steps:
- name: Download JDK ${{ matrix.jdk }}
(groovy) branch danielsun/try-jdk23 created (now fd4c10a1bc)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/try-jdk23 in repository https://gitbox.apache.org/repos/asf/groovy.git at fd4c10a1bc Add JDK23 build This branch includes the following new commits: new fd4c10a1bc Add JDK23 build The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(groovy) branch master updated: Fix groovy-build-test
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 251c1faf98 Fix groovy-build-test
251c1faf98 is described below
commit 251c1faf9812fe17f372b4a894349140ddf397b5
Author: Daniel Sun
AuthorDate: Sat Mar 23 01:43:51 2024 +0800
Fix groovy-build-test
Execution failed for task ':build-logic:compileGroovy'.
> BUG! exception in phase 'semantic analysis' in source unit
'/home/runner/work/groovy/groovy/build-logic/src/main/groovy/org/apache/groovy/gradle/CheckstyleHtmlReport.groovy'
Unsupported class file major version 66
---
.github/workflows/groovy-build-test.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index 51f428f2b6..8d164c7e84 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -49,7 +49,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
-java: [12, 13, 14, 15, 16, 18, 19, 20, 22]
+java: [12, 13, 14, 15, 16, 18, 19, 20]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
(groovy) branch master updated: Fix groovy-build-test
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 24d3032a4a Fix groovy-build-test
24d3032a4a is described below
commit 24d3032a4acc4ff34d2edd8c9e0f1007866e4e3b
Author: Daniel Sun
AuthorDate: Sat Mar 23 01:39:36 2024 +0800
Fix groovy-build-test
`jdk` should contain at least one value
---
.github/workflows/groovy-build-test.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index f06e0aa2fa..51f428f2b6 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -70,6 +70,7 @@ jobs:
os: [ubuntu-latest]
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
jdk:
+ -
"https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz;
# TODO: JDK 23 is not working for now.
# -
"https://download.java.net/java/early_access/jdk23/12/GPL/openjdk-23-ea+12_linux-x64_bin.tar.gz;
runs-on: ${{ matrix.os }}
(groovy) branch master updated (50f10bcaf9 -> 96230e899c)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from 50f10bcaf9 trivial refactor: fix spotbug warnings add bb7d9b13ca GROOVY-11337: Bump asciidoctorj-diagram to 2.3.0 add 34d9c8e7ca GROOVY-11338: Bump asciidoctorj-pdf to 2.3.14 add 96230e899c Update dependency metadata No new revisions were added by this update. Summary of changes: gradle/verification-metadata.xml | 11 +-- versions.properties | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-)
(groovy) 03/03: Update dependency metadata
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch danielsun/bump_deps_20240310 in repository https://gitbox.apache.org/repos/asf/groovy.git commit 96230e899c06a7ae4451c8306fe99be158240e1a Author: Daniel Sun AuthorDate: Sun Mar 10 23:07:39 2024 +0800 Update dependency metadata --- gradle/verification-metadata.xml | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 9245f323d0..754cf034ea 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -218,6 +218,7 @@ + @@ -441,16 +442,6 @@ - - - - - - - - - -
(groovy) branch danielsun/bump_deps_20240310 created (now 96230e899c)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/bump_deps_20240310 in repository https://gitbox.apache.org/repos/asf/groovy.git at 96230e899c Update dependency metadata This branch includes the following new commits: new bb7d9b13ca GROOVY-11337: Bump asciidoctorj-diagram to 2.3.0 new 34d9c8e7ca GROOVY-11338: Bump asciidoctorj-pdf to 2.3.14 new 96230e899c Update dependency metadata The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(groovy) 02/03: GROOVY-11338: Bump asciidoctorj-pdf to 2.3.14
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch danielsun/bump_deps_20240310 in repository https://gitbox.apache.org/repos/asf/groovy.git commit 34d9c8e7ca078247340900c6edc2c14b58488ae5 Author: Daniel Sun AuthorDate: Sun Mar 10 23:05:47 2024 +0800 GROOVY-11338: Bump asciidoctorj-pdf to 2.3.14 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 2f0f628587..45f1128736 100644 --- a/versions.properties +++ b/versions.properties @@ -16,7 +16,7 @@ ant=1.10.14 asciidoctorj=2.5.11 asciidoctorDiagram=2.3.0 -asciidoctorPdf=2.3.10 +asciidoctorPdf=2.3.14 asciidoctorGroovyDsl=2.0.2 asm=9.6 antlr4=4.13.1.3
(groovy) 01/03: GROOVY-11337: Bump asciidoctorj-diagram to 2.3.0
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch danielsun/bump_deps_20240310 in repository https://gitbox.apache.org/repos/asf/groovy.git commit bb7d9b13cac660fd35e5bface0bda0e553e7d304 Author: Daniel Sun AuthorDate: Sun Mar 10 23:04:07 2024 +0800 GROOVY-11337: Bump asciidoctorj-diagram to 2.3.0 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 3006fd9afd..2f0f628587 100644 --- a/versions.properties +++ b/versions.properties @@ -15,7 +15,7 @@ ant=1.10.14 asciidoctorj=2.5.11 -asciidoctorDiagram=2.2.10 +asciidoctorDiagram=2.3.0 asciidoctorPdf=2.3.10 asciidoctorGroovyDsl=2.0.2 asm=9.6
(groovy) branch master updated: GROOVY-11324: Bump qdox to 2.1.0
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new a38c1e29a3 GROOVY-11324: Bump qdox to 2.1.0 a38c1e29a3 is described below commit a38c1e29a3dda270f620a7e594fbd1002a155b19 Author: Daniel Sun AuthorDate: Sun Feb 25 03:53:38 2024 +0800 GROOVY-11324: Bump qdox to 2.1.0 --- gradle/verification-metadata.xml | 6 ++ versions.properties | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 08116c2458..44a8411d56 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -70,6 +70,7 @@ + @@ -319,6 +320,11 @@ + + + + + diff --git a/versions.properties b/versions.properties index 3b034038f9..2fe5951dfc 100644 --- a/versions.properties +++ b/versions.properties @@ -45,7 +45,7 @@ log4j2=2.23.0 logback=1.5.0 openbeans=1.0.2 picocli=4.7.5 -qdox=2.0.3 +qdox=2.1.0 slf4j=2.0.12 xmlunit=1.6 xstream=1.4.20
(groovy) branch master updated: replacing the custom hashmap implementation in MetaMethodIndex with normal hashmaps
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new af415514a2 replacing the custom hashmap implementation in
MetaMethodIndex with normal hashmaps
af415514a2 is described below
commit af415514a2be02dfe8b0ed9130a24469c867c8d0
Author: Jochen Theodorou
AuthorDate: Fri Dec 22 01:31:13 2023 +0100
replacing the custom hashmap implementation in MetaMethodIndex with normal
hashmaps
---
src/main/java/groovy/lang/MetaClassImpl.java | 131 ---
src/main/java/groovy/lang/MetaMethod.java | 2 +
.../codehaus/groovy/reflection/ParameterTypes.java | 4 +
.../groovy/runtime/metaclass/ClosureMetaClass.java | 12 +-
.../groovy/runtime/metaclass/MetaMethodIndex.java | 385 +
.../runtime/methoddispatching/vm8/FooThree.java| 2 +-
.../runtime/methoddispatching/vm8/FooTwo.java | 2 +-
7 files changed, 152 insertions(+), 386 deletions(-)
diff --git a/src/main/java/groovy/lang/MetaClassImpl.java
b/src/main/java/groovy/lang/MetaClassImpl.java
index c253e2b5f0..690cc8d8ed 100644
--- a/src/main/java/groovy/lang/MetaClassImpl.java
+++ b/src/main/java/groovy/lang/MetaClassImpl.java
@@ -18,6 +18,36 @@
*/
package groovy.lang;
+import java.beans.BeanInfo;
+import java.beans.EventSetDescriptor;
+import java.beans.Introspector;
+import java.beans.MethodDescriptor;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Array;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.net.URL;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.function.BiConsumer;
import org.apache.groovy.internal.util.UncheckedThrow;
import org.apache.groovy.util.BeanUtils;
import org.apache.groovy.util.SystemUtil;
@@ -82,37 +112,6 @@ import org.codehaus.groovy.vmplugin.VMPlugin;
import org.codehaus.groovy.vmplugin.VMPluginFactory;
import org.objectweb.asm.Opcodes;
-import java.beans.BeanInfo;
-import java.beans.EventSetDescriptor;
-import java.beans.Introspector;
-import java.beans.MethodDescriptor;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.net.URL;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.function.BiConsumer;
-
import static groovy.lang.Tuple.tuple;
import static java.lang.Character.isUpperCase;
import static org.apache.groovy.util.Arrays.concat;
@@ -177,7 +176,7 @@ public class MetaClassImpl implements MetaClass,
MutableMetaClass {
private MetaMethod propertyMissingGet;
private MetaMethod propertyMissingSet;
private MetaMethod methodMissing;
-private MetaMethodIndex.Header mainClassMethodHeader;
+private Map mainClassMethodHeader;
private boolean permissivePropertyAccess = PERMISSIVE_PROPERTY_ACCESS;
/**
@@ -372,7 +371,7 @@ public class MetaClassImpl implements MetaClass,
MutableMetaClass {
}
private void populateMethods(final List superClasses, final
CachedClass firstGroovySuper) {
-MetaMethodIndex.Header header =
metaMethodIndex.getHeader(firstGroovySuper.getTheClass());
+var header = metaMethodIndex.getHeader(firstGroovySuper.getTheClass());
CachedClass c;
Iterator iter = superClasses.iterator();
while (iter.hasNext()) {
@@ -396,7 +395,7 @@ public class MetaClassImpl implements MetaClass,
MutableMetaClass {
break;
}
-MetaMethodIndex.Header last = header;
+var last = header;
while (iter.hasNext()) {
c = iter.next();
header
(groovy) branch master updated (b09ba10ba5 -> cab8bab298)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from b09ba10ba5 GROOVY-11314: JsonOutput Pretty Print always escapes characters add cab8bab298 Build and test PR against ea and additional JDKs No new revisions were added by this update. Summary of changes: .github/workflows/groovy-build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(groovy) branch master updated: Shorten workflow name
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new 2779f77e0a Shorten workflow name 2779f77e0a is described below commit 2779f77e0a412eb1794d9f959ce5d0a02b6b7d01 Author: Daniel Sun AuthorDate: Sun Feb 11 09:18:10 2024 +0800 Shorten workflow name --- .github/workflows/groovy-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/groovy-build-test.yml b/.github/workflows/groovy-build-test.yml index f9329aeec6..cdd19bb316 100644 --- a/.github/workflows/groovy-build-test.yml +++ b/.github/workflows/groovy-build-test.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Build and test JDK versions +name: Build and test on: [push, pull_request]
(groovy) branch master updated: Align with gradle binary version, i.e. 8.6
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new 1fd2c9b25e Align with gradle binary version, i.e. 8.6 1fd2c9b25e is described below commit 1fd2c9b25e0333bbd2f81133093017db788b31e8 Author: Daniel Sun AuthorDate: Sun Feb 4 15:26:54 2024 +0800 Align with gradle binary version, i.e. 8.6 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e802949d05..7ca07e207e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ groovyTargetBytecodeVersion=11 targetJavaVersion=11 binaryCompatibilityBaseline=4.0.11 -gradle_version=8.5 +gradle_version=8.6 groovyJUnit_ms=512m groovyJUnit_mx=2g
(groovy) branch master updated: Fix badge
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git The following commit(s) were added to refs/heads/master by this push: new 40707d6848 Fix badge 40707d6848 is described below commit 40707d68489ab916bba31214cb18cdf435284e3f Author: Daniel Sun AuthorDate: Wed Jan 31 18:32:13 2024 +0800 Fix badge --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 9b748c26fb..e21f389840 100644 --- a/README.adoc +++ b/README.adoc @@ -23,7 +23,7 @@ The Groovy development team :revdate: 24-02-2014 :build-icon: https://ci.groovy-lang.org/app/rest/builds/buildType:(id:MasterTestJdk11)/statusIcon -:github-build-icon: https://github.com/apache/groovy/actions/workflows/groovy-build-test-main.yml/badge.svg?branch=master +:github-build-icon: https://github.com/apache/groovy/actions/workflows/groovy-build-test.yml/badge.svg?branch=master :sonarcloud-icon: https://sonarcloud.io/api/project_badges/measure?project=apache_groovy=sqale_rating :noheader: :groovy-www: https://groovy-lang.org/
(groovy) branch GROOVY-11292 updated: Move `isNonSealed` to `ClassNodeUtils`
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-11292
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY-11292 by this push:
new 46f295bdff Move `isNonSealed` to `ClassNodeUtils`
46f295bdff is described below
commit 46f295bdff1a66233fe2faec27de8c97965efeff
Author: Daniel Sun
AuthorDate: Mon Jan 22 03:40:57 2024 +0800
Move `isNonSealed` to `ClassNodeUtils`
---
.../apache/groovy/ast/tools/ClassNodeUtils.java| 30 ++
.../java/org/codehaus/groovy/ast/ClassNode.java| 12 -
.../groovy/ast/decompiled/DecompiledClassNode.java | 14 --
.../groovy/classgen/ClassCompletionVerifier.java | 2 +-
4 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java
b/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java
index 1b8538d8b8..4020d3dd1a 100644
--- a/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java
+++ b/src/main/java/org/apache/groovy/ast/tools/ClassNodeUtils.java
@@ -18,6 +18,7 @@
*/
package org.apache.groovy.ast.tools;
+import groovy.transform.NonSealed;
import org.apache.groovy.util.BeanUtils;
import org.codehaus.groovy.ast.AnnotatedNode;
import org.codehaus.groovy.ast.ClassNode;
@@ -26,11 +27,13 @@ import org.codehaus.groovy.ast.FieldNode;
import org.codehaus.groovy.ast.MethodNode;
import org.codehaus.groovy.ast.Parameter;
import org.codehaus.groovy.ast.PropertyNode;
+import org.codehaus.groovy.ast.decompiled.DecompiledClassNode;
import org.codehaus.groovy.ast.expr.Expression;
import org.codehaus.groovy.ast.expr.MapExpression;
import org.codehaus.groovy.ast.expr.SpreadExpression;
import org.codehaus.groovy.ast.expr.TupleExpression;
import org.codehaus.groovy.ast.stmt.Statement;
+import org.codehaus.groovy.reflection.ReflectionUtils;
import org.codehaus.groovy.transform.AbstractASTTransformation;
import java.lang.reflect.Modifier;
@@ -47,6 +50,7 @@ import java.util.Queue;
import java.util.Set;
import java.util.function.Predicate;
+import static java.lang.reflect.Modifier.isFinal;
import static org.codehaus.groovy.ast.ClassHelper.isObjectType;
import static org.codehaus.groovy.ast.ClassHelper.isPrimitiveBoolean;
import static org.codehaus.groovy.ast.ClassHelper.isPrimitiveType;
@@ -325,6 +329,32 @@ public class ClassNodeUtils {
return false;
}
+/**
+ * Check if the type is declared {@code non-sealed}
+ *
+ * @param cn the type
+ * @return the check result
+ */
+public static boolean isNonSealed(final ClassNode cn) {
+if (cn instanceof DecompiledClassNode) {
+Class typeClass;
+try {
+typeClass = cn.getTypeClass();
+} catch (NoClassDefFoundError e) {
+return false;
+}
+
+final Class superclass = typeClass.getSuperclass();
+if (null == superclass) return false;
+return ReflectionUtils.isSealed(superclass) &&
!(Modifier.isFinal(typeClass.getModifiers()) ||
ReflectionUtils.isSealed(typeClass));
+}
+
+if (Boolean.TRUE.equals(cn.getNodeMetaData(NonSealed.class))) return
true;
+final ClassNode superClass = cn.getSuperClass();
+if (null == superClass) return false;
+return superClass.isSealed() && !(isFinal(cn.getModifiers()) ||
cn.isSealed());
+}
+
public static boolean hasStaticProperty(final ClassNode cNode, final
String propName) {
PropertyNode found = getStaticProperty(cNode, propName);
if (found == null) {
diff --git a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
index a2c9d98150..0b726ef719 100644
--- a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
@@ -18,7 +18,6 @@
*/
package org.codehaus.groovy.ast;
-import groovy.transform.NonSealed;
import org.apache.groovy.ast.tools.ClassNodeUtils;
import org.apache.groovy.lang.annotation.Incubating;
import org.codehaus.groovy.GroovyBugError;
@@ -48,7 +47,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
-import static java.lang.reflect.Modifier.isFinal;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;
import static org.apache.groovy.ast.tools.MethodNodeUtils.getCodeAsBlock;
@@ -1335,16 +1333,6 @@ public class ClassNode extends AnnotatedNode {
return !getAnnotations(ClassHelper.SEALED_TYPE).isEmpty() ||
!getPermittedSubclasses().isEmpty();
}
-@Incubating
-public boolean isNonSealed() {
-if (redirect != null) return redirect.isNonSealed();
-if (Boolean.TRUE.equals(this.getNodeMetaData(NonSealed.class))) return
true;
-
-final ClassNode superClass = th
(groovy) branch GROOVY-11292 updated (4850b78a0a -> adaf3fa86f)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY-11292
in repository https://gitbox.apache.org/repos/asf/groovy.git
omit 4850b78a0a Add JDK 22-ea build
omit 70672ed9ed Merge additional JDK builds
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/GROOVY-11292 (adaf3fa86f)
\
O -- O -- O (4850b78a0a)
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../{groovy-rat-check.yml => groovy-build-test-19.yml} | 13 +++--
.github/workflows/groovy-build-test-aux.yml | 2 +-
.github/workflows/groovy-build-test-ea.yml | 5 +++--
build-logic/src/main/groovy/org.apache.groovy-tested.gradle | 4
4 files changed, 11 insertions(+), 13 deletions(-)
copy .github/workflows/{groovy-rat-check.yml => groovy-build-test-19.yml} (85%)
(groovy) branch danielsun/tweak_gawf_20240122 created (now 4850b78a0a)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/tweak_gawf_20240122 in repository https://gitbox.apache.org/repos/asf/groovy.git at 4850b78a0a Add JDK 22-ea build No new revisions were added by this update.
(groovy) 03/03: Add JDK 22-ea build
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-11292
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 4850b78a0a3836b9d9c29a3eada5f78cbf4d1742
Author: Daniel Sun
AuthorDate: Sun Jan 21 21:47:58 2024 +0800
Add JDK 22-ea build
---
.github/workflows/groovy-build-test-ea.yml | 5 ++---
build-logic/src/main/groovy/org.apache.groovy-tested.gradle | 4
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/groovy-build-test-ea.yml
b/.github/workflows/groovy-build-test-ea.yml
index ec561cbaaa..d09217956d 100644
--- a/.github/workflows/groovy-build-test-ea.yml
+++ b/.github/workflows/groovy-build-test-ea.yml
@@ -26,10 +26,9 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [17]
+java: [21]
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
-jdk:
["https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz;,
-
"https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz;]
+jdk:
["https://download.java.net/java/early_access/jdk22/31/GPL/openjdk-22-ea+31_linux-x64_bin.tar.gz;]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
index 7ec0b5aea7..7302140ac4 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
@@ -37,10 +37,14 @@ tasks.withType(Test).configureEach {
def grapeDirectory = new File(temporaryDir, 'grape')
def jdk8 = ['-XX:+UseConcMarkSweepGC']
def jdk9 = ['-Djava.locale.providers=COMPAT,SPI'/*,
'--illegal-access=debug'*/]
+def jdk22 = ['-Djava.locale.providers=CLDR,SPI'] /* WARNING: COMPAT locale
provider will be removed in a future release */
def common = ['-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}",
'-Duser.language=en']
if (JavaVersion.current().isJava9Compatible()) {
jvmArgs(*common, *jdk9)
systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
+} else if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_22))
{
+jvmArgs(*common, *jdk22)
+systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
} else {
jvmArgs(*common, *jdk8)
}
(groovy) 02/03: Merge additional JDK builds
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-11292
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 70672ed9ed083ef134bdc038ec598a763bae032b
Author: Daniel Sun
AuthorDate: Sun Jan 21 20:39:35 2024 +0800
Merge additional JDK builds
---
.github/workflows/groovy-build-test-19.yml | 45 -
.github/workflows/groovy-build-test-aux.yml | 2 +-
2 files changed, 1 insertion(+), 46 deletions(-)
diff --git a/.github/workflows/groovy-build-test-19.yml
b/.github/workflows/groovy-build-test-19.yml
deleted file mode 100644
index 879b8e8d88..00
--- a/.github/workflows/groovy-build-test-19.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Build and test 19
-
-on: [push, pull_request]
-
-permissions:
- contents: read
-
-jobs:
- test:
-strategy:
- fail-fast: false
- matrix:
-os: [ubuntu-22.04]
-runs-on: ${{ matrix.os }}
-env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-steps:
- - uses: actions/checkout@v4
- - name: Set up JDKs
-uses: actions/setup-java@v4
-with:
- distribution: 'zulu'
- java-version: |
-19
-17
- check-latest: true
- - uses: gradle/gradle-build-action@v2
- - name: Test with Gradle
-run: ./gradlew test -Ptarget.java.home=${{ env.JAVA_HOME_19_X64 }}
-timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-test-aux.yml
b/.github/workflows/groovy-build-test-aux.yml
index facdfcf82c..d73e8169f3 100644
--- a/.github/workflows/groovy-build-test-aux.yml
+++ b/.github/workflows/groovy-build-test-aux.yml
@@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [12, 13, 14, 15, 16, 18]
+java: [12, 13, 14, 15, 16, 18, 19, 20]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
(groovy) 01/03: GROOVY-11292: Class without sealed parent cannot be non-sealed
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-11292
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit adaf3fa86ff925214132cbe1f3f23e7a838cb6fb
Author: Daniel Sun
AuthorDate: Sat Jan 20 23:38:52 2024 +0800
GROOVY-11292: Class without sealed parent cannot be non-sealed
---
.github/workflows/groovy-build-test-main.yml | 2 +-
.../java/org/codehaus/groovy/ast/ClassNode.java| 12 +++
.../groovy/ast/decompiled/DecompiledClassNode.java | 14 +++
.../groovy/classgen/ClassCompletionVerifier.java | 3 +-
src/test/groovy/bugs/Groovy11292.groovy| 100 +
5 files changed, 128 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/groovy-build-test-main.yml
b/.github/workflows/groovy-build-test-main.yml
index 5e342f8fec..10e379cff2 100644
--- a/.github/workflows/groovy-build-test-main.yml
+++ b/.github/workflows/groovy-build-test-main.yml
@@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [11, 17]
+java: [11, 17, 21]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
index 0b726ef719..a2c9d98150 100644
--- a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
@@ -18,6 +18,7 @@
*/
package org.codehaus.groovy.ast;
+import groovy.transform.NonSealed;
import org.apache.groovy.ast.tools.ClassNodeUtils;
import org.apache.groovy.lang.annotation.Incubating;
import org.codehaus.groovy.GroovyBugError;
@@ -47,6 +48,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import static java.lang.reflect.Modifier.isFinal;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;
import static org.apache.groovy.ast.tools.MethodNodeUtils.getCodeAsBlock;
@@ -1333,6 +1335,16 @@ public class ClassNode extends AnnotatedNode {
return !getAnnotations(ClassHelper.SEALED_TYPE).isEmpty() ||
!getPermittedSubclasses().isEmpty();
}
+@Incubating
+public boolean isNonSealed() {
+if (redirect != null) return redirect.isNonSealed();
+if (Boolean.TRUE.equals(this.getNodeMetaData(NonSealed.class))) return
true;
+
+final ClassNode superClass = this.getSuperClass();
+if (null == superClass) return false;
+return superClass.isSealed() && !(isFinal(this.getModifiers()) ||
this.isSealed());
+}
+
public boolean isResolved() {
if (clazz != null) return true;
if (redirect != null) return redirect.isResolved();
diff --git
a/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
b/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
index e919d090db..8cfe776512 100644
--- a/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
@@ -109,6 +109,20 @@ public class DecompiledClassNode extends ClassNode {
return false;
}
+@Override
+public boolean isNonSealed() {
+Class typeClass;
+try {
+typeClass = getTypeClass();
+} catch (NoClassDefFoundError e) {
+return false;
+}
+
+final Class superclass = typeClass.getSuperclass();
+if (null == superclass) return false;
+return ReflectionUtils.isSealed(superclass) &&
!(Modifier.isFinal(typeClass.getModifiers()) ||
ReflectionUtils.isSealed(typeClass));
+}
+
@Override
public String setName(String name) {
throw new UnsupportedOperationException();
diff --git
a/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
b/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
index 870704af79..33dbafa944 100644
--- a/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
+++ b/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
@@ -18,7 +18,6 @@
*/
package org.codehaus.groovy.classgen;
-import groovy.transform.NonSealed;
import groovy.transform.Sealed;
import org.apache.groovy.ast.tools.AnnotatedNodeUtils;
import org.apache.groovy.ast.tools.ClassNodeUtils;
@@ -368,7 +367,7 @@ public class ClassCompletionVerifier extends
ClassCodeVisitorSupport {
}
private boolean nonSealed(final ClassNode node) {
-return Boolean.TRUE.equals(node.getNodeMetaData(NonSealed.class));
+return node.isNonSealed();
}
private void checkSealedParent(final ClassNode cn, final ClassNode parent)
{
diff --git a/src/test/groovy/bugs/Groovy11292.groovy
b/src/test/groovy/bugs/Groovy11292.groovy
new file mode 100644
index 00..b4421e7800
--- /dev/nul
(groovy) branch GROOVY-11292 updated (efc2b9980f -> 4850b78a0a)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY-11292
in repository https://gitbox.apache.org/repos/asf/groovy.git
discard efc2b9980f Add JDK 22-ea build
discard 8c8cf832a9 Merge additional JDK builds
omit 9ae1d96371 GROOVY-11292: Class without sealed parent cannot be
non-sealed
add a3810f6b25 Add check for `publishMavenPublicationToLocalFileRepository`
add 7b7347d807 Use JDK 21 to build and distribute
add 6b8915fbd1 GROOVY-11293: Add a test
new adaf3fa86f GROOVY-11292: Class without sealed parent cannot be
non-sealed
new 70672ed9ed Merge additional JDK builds
new 4850b78a0a Add JDK 22-ea build
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (efc2b9980f)
\
N -- N -- N refs/heads/GROOVY-11292 (4850b78a0a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/groovy-build-dist.yml| 5 +++-
.../{Groovy10305.groovy => Groovy11293.groovy} | 29 ++
2 files changed, 17 insertions(+), 17 deletions(-)
copy src/test/groovy/bugs/{Groovy10305.groovy => Groovy11293.groovy} (71%)
(groovy) branch GROOVY-11292 updated (9ae1d96371 -> efc2b9980f)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch GROOVY-11292 in repository https://gitbox.apache.org/repos/asf/groovy.git from 9ae1d96371 GROOVY-11292: Class without sealed parent cannot be non-sealed new 8c8cf832a9 Merge additional JDK builds new efc2b9980f Add JDK 22-ea build The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/groovy-build-test-19.yml | 45 -- .github/workflows/groovy-build-test-aux.yml| 2 +- .github/workflows/groovy-build-test-ea.yml | 5 +-- .../main/groovy/org.apache.groovy-tested.gradle| 4 ++ 4 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 .github/workflows/groovy-build-test-19.yml
(groovy) 02/02: Add JDK 22-ea build
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-11292
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit efc2b9980fcf40cceba3367b17a58aef08ef8e4b
Author: Daniel Sun
AuthorDate: Sun Jan 21 21:47:58 2024 +0800
Add JDK 22-ea build
---
.github/workflows/groovy-build-test-ea.yml | 5 ++---
build-logic/src/main/groovy/org.apache.groovy-tested.gradle | 4
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/groovy-build-test-ea.yml
b/.github/workflows/groovy-build-test-ea.yml
index ec561cbaaa..d09217956d 100644
--- a/.github/workflows/groovy-build-test-ea.yml
+++ b/.github/workflows/groovy-build-test-ea.yml
@@ -26,10 +26,9 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [17]
+java: [21]
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
-jdk:
["https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz;,
-
"https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz;]
+jdk:
["https://download.java.net/java/early_access/jdk22/31/GPL/openjdk-22-ea+31_linux-x64_bin.tar.gz;]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
index 7ec0b5aea7..7302140ac4 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
@@ -37,10 +37,14 @@ tasks.withType(Test).configureEach {
def grapeDirectory = new File(temporaryDir, 'grape')
def jdk8 = ['-XX:+UseConcMarkSweepGC']
def jdk9 = ['-Djava.locale.providers=COMPAT,SPI'/*,
'--illegal-access=debug'*/]
+def jdk22 = ['-Djava.locale.providers=CLDR,SPI'] /* WARNING: COMPAT locale
provider will be removed in a future release */
def common = ['-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}",
'-Duser.language=en']
if (JavaVersion.current().isJava9Compatible()) {
jvmArgs(*common, *jdk9)
systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
+} else if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_22))
{
+jvmArgs(*common, *jdk22)
+systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
} else {
jvmArgs(*common, *jdk8)
}
(groovy) 01/02: Merge additional JDK builds
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-11292
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 8c8cf832a9b93352edbc29e84efa83ef92da4fcf
Author: Daniel Sun
AuthorDate: Sun Jan 21 20:39:35 2024 +0800
Merge additional JDK builds
---
.github/workflows/groovy-build-test-19.yml | 45 -
.github/workflows/groovy-build-test-aux.yml | 2 +-
2 files changed, 1 insertion(+), 46 deletions(-)
diff --git a/.github/workflows/groovy-build-test-19.yml
b/.github/workflows/groovy-build-test-19.yml
deleted file mode 100644
index 879b8e8d88..00
--- a/.github/workflows/groovy-build-test-19.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Build and test 19
-
-on: [push, pull_request]
-
-permissions:
- contents: read
-
-jobs:
- test:
-strategy:
- fail-fast: false
- matrix:
-os: [ubuntu-22.04]
-runs-on: ${{ matrix.os }}
-env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-steps:
- - uses: actions/checkout@v4
- - name: Set up JDKs
-uses: actions/setup-java@v4
-with:
- distribution: 'zulu'
- java-version: |
-19
-17
- check-latest: true
- - uses: gradle/gradle-build-action@v2
- - name: Test with Gradle
-run: ./gradlew test -Ptarget.java.home=${{ env.JAVA_HOME_19_X64 }}
-timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-test-aux.yml
b/.github/workflows/groovy-build-test-aux.yml
index facdfcf82c..d73e8169f3 100644
--- a/.github/workflows/groovy-build-test-aux.yml
+++ b/.github/workflows/groovy-build-test-aux.yml
@@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [12, 13, 14, 15, 16, 18]
+java: [12, 13, 14, 15, 16, 18, 19, 20]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
(groovy) branch danielsun/refine_ser deleted (was 0732af6c3a)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/refine_ser in repository https://gitbox.apache.org/repos/asf/groovy.git was 0732af6c3a Improve robustness of `sendHEADRequest` This change permanently discards the following revisions: discard 0732af6c3a Improve robustness of `sendHEADRequest`
(groovy) branch danielsun/qdox2 deleted (was 73d7761893)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/qdox2 in repository https://gitbox.apache.org/repos/asf/groovy.git was 73d7761893 Bump qdox to 2.0.3 This change permanently discards the following revisions: discard 73d7761893 Bump qdox to 2.0.3
(groovy) branch danielsun/jdk21_build deleted (was 8097d4e0ea)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/jdk21_build in repository https://gitbox.apache.org/repos/asf/groovy.git was 8097d4e0ea Fix build failure This change permanently discards the following revisions: discard 8097d4e0ea Fix build failure discard 0987ca1fbe Add JDK 21 build
(groovy) branch danielsun/tweak_gawf updated (6dd41818a9 -> 2943033473)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/tweak_gawf in repository https://gitbox.apache.org/repos/asf/groovy.git discard 6dd41818a9 Add JDK 22-ea build new 2943033473 Add JDK 22-ea build This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6dd41818a9) \ N -- N -- N refs/heads/danielsun/tweak_gawf (2943033473) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/groovy-build-test-ea.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
(groovy) 01/01: Add JDK 22-ea build
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak_gawf
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 2943033473ebac2d0d5484c4e1f9490ada9355a5
Author: Daniel Sun
AuthorDate: Sun Jan 21 21:47:58 2024 +0800
Add JDK 22-ea build
---
.github/workflows/groovy-build-test-ea.yml | 5 ++---
build-logic/src/main/groovy/org.apache.groovy-tested.gradle | 4
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/groovy-build-test-ea.yml
b/.github/workflows/groovy-build-test-ea.yml
index ec561cbaaa..d09217956d 100644
--- a/.github/workflows/groovy-build-test-ea.yml
+++ b/.github/workflows/groovy-build-test-ea.yml
@@ -26,10 +26,9 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [17]
+java: [21]
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
-jdk:
["https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz;,
-
"https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz;]
+jdk:
["https://download.java.net/java/early_access/jdk22/31/GPL/openjdk-22-ea+31_linux-x64_bin.tar.gz;]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
index 7ec0b5aea7..7302140ac4 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
@@ -37,10 +37,14 @@ tasks.withType(Test).configureEach {
def grapeDirectory = new File(temporaryDir, 'grape')
def jdk8 = ['-XX:+UseConcMarkSweepGC']
def jdk9 = ['-Djava.locale.providers=COMPAT,SPI'/*,
'--illegal-access=debug'*/]
+def jdk22 = ['-Djava.locale.providers=CLDR,SPI'] /* WARNING: COMPAT locale
provider will be removed in a future release */
def common = ['-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}",
'-Duser.language=en']
if (JavaVersion.current().isJava9Compatible()) {
jvmArgs(*common, *jdk9)
systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
+} else if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_22))
{
+jvmArgs(*common, *jdk22)
+systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
} else {
jvmArgs(*common, *jdk8)
}
(groovy) branch danielsun/tweak_github_action deleted (was d7056e55ee)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/tweak_github_action in repository https://gitbox.apache.org/repos/asf/groovy.git was d7056e55ee Add check for `publishMavenPublicationToLocalFileRepository` This change permanently discards the following revisions: discard d7056e55ee Add check for `publishMavenPublicationToLocalFileRepository`
(groovy) branch danielsun/tweak_github_action_workflows deleted (was 538b38d613)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/tweak_github_action_workflows in repository https://gitbox.apache.org/repos/asf/groovy.git was 538b38d613 Add JDK 22-ea and JDK 23-ea builds This change permanently discards the following revisions: discard 538b38d613 Add JDK 22-ea and JDK 23-ea builds discard 64709bd25a GROOVY-11292: Class without sealed parent cannot be non-sealed discard a6b6e3bd9e Merge additional JDK builds
(groovy) 02/02: Add JDK 22-ea build
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak_gawf
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 6dd41818a96c7fc0350c0e3b2df949d999e0e2d8
Author: Daniel Sun
AuthorDate: Sun Jan 21 21:47:58 2024 +0800
Add JDK 22-ea build
---
.github/workflows/groovy-build-test-ea.yml | 6 +++---
build-logic/src/main/groovy/org.apache.groovy-tested.gradle | 4
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/groovy-build-test-ea.yml
b/.github/workflows/groovy-build-test-ea.yml
index ec561cbaaa..fe54f19f88 100644
--- a/.github/workflows/groovy-build-test-ea.yml
+++ b/.github/workflows/groovy-build-test-ea.yml
@@ -26,10 +26,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [17]
+java: [21]
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
-jdk:
["https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz;,
-
"https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz;]
+jdk:
["https://download.java.net/java/early_access/jdk22/31/GPL/openjdk-22-ea+31_linux-x64_bin.tar.gz;,
+
"https://download.java.net/java/early_access/jdk23/5/GPL/openjdk-23-ea+5_linux-x64_bin.tar.gz;]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
index 7ec0b5aea7..7302140ac4 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
@@ -37,10 +37,14 @@ tasks.withType(Test).configureEach {
def grapeDirectory = new File(temporaryDir, 'grape')
def jdk8 = ['-XX:+UseConcMarkSweepGC']
def jdk9 = ['-Djava.locale.providers=COMPAT,SPI'/*,
'--illegal-access=debug'*/]
+def jdk22 = ['-Djava.locale.providers=CLDR,SPI'] /* WARNING: COMPAT locale
provider will be removed in a future release */
def common = ['-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}",
'-Duser.language=en']
if (JavaVersion.current().isJava9Compatible()) {
jvmArgs(*common, *jdk9)
systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
+} else if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_22))
{
+jvmArgs(*common, *jdk22)
+systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
} else {
jvmArgs(*common, *jdk8)
}
(groovy) 01/02: Merge additional JDK builds
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak_gawf
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 036e31779b8e84298ac93f9a83b7468c1b27ad1a
Author: Daniel Sun
AuthorDate: Sun Jan 21 20:39:35 2024 +0800
Merge additional JDK builds
---
.github/workflows/groovy-build-test-19.yml | 45 -
.github/workflows/groovy-build-test-aux.yml | 2 +-
2 files changed, 1 insertion(+), 46 deletions(-)
diff --git a/.github/workflows/groovy-build-test-19.yml
b/.github/workflows/groovy-build-test-19.yml
deleted file mode 100644
index 879b8e8d88..00
--- a/.github/workflows/groovy-build-test-19.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Build and test 19
-
-on: [push, pull_request]
-
-permissions:
- contents: read
-
-jobs:
- test:
-strategy:
- fail-fast: false
- matrix:
-os: [ubuntu-22.04]
-runs-on: ${{ matrix.os }}
-env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-steps:
- - uses: actions/checkout@v4
- - name: Set up JDKs
-uses: actions/setup-java@v4
-with:
- distribution: 'zulu'
- java-version: |
-19
-17
- check-latest: true
- - uses: gradle/gradle-build-action@v2
- - name: Test with Gradle
-run: ./gradlew test -Ptarget.java.home=${{ env.JAVA_HOME_19_X64 }}
-timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-test-aux.yml
b/.github/workflows/groovy-build-test-aux.yml
index facdfcf82c..d73e8169f3 100644
--- a/.github/workflows/groovy-build-test-aux.yml
+++ b/.github/workflows/groovy-build-test-aux.yml
@@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [12, 13, 14, 15, 16, 18]
+java: [12, 13, 14, 15, 16, 18, 19, 20]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
(groovy) branch danielsun/tweak_gawf created (now 6dd41818a9)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/tweak_gawf in repository https://gitbox.apache.org/repos/asf/groovy.git at 6dd41818a9 Add JDK 22-ea build This branch includes the following new commits: new 036e31779b Merge additional JDK builds new 6dd41818a9 Add JDK 22-ea build The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(groovy) 01/01: Add JDK 22-ea and JDK 23-ea builds
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak_github_action_workflows
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 538b38d613d61d410db3d6652cf25e5bc9423e42
Author: Daniel Sun
AuthorDate: Sun Jan 21 21:47:58 2024 +0800
Add JDK 22-ea and JDK 23-ea builds
---
.github/workflows/groovy-build-test-ea.yml | 6 +++---
build-logic/src/main/groovy/org.apache.groovy-tested.gradle | 4
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/groovy-build-test-ea.yml
b/.github/workflows/groovy-build-test-ea.yml
index ec561cbaaa..fe54f19f88 100644
--- a/.github/workflows/groovy-build-test-ea.yml
+++ b/.github/workflows/groovy-build-test-ea.yml
@@ -26,10 +26,10 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [17]
+java: [21]
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
-jdk:
["https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz;,
-
"https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz;]
+jdk:
["https://download.java.net/java/early_access/jdk22/31/GPL/openjdk-22-ea+31_linux-x64_bin.tar.gz;,
+
"https://download.java.net/java/early_access/jdk23/5/GPL/openjdk-23-ea+5_linux-x64_bin.tar.gz;]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
index 7ec0b5aea7..7302140ac4 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-tested.gradle
@@ -37,10 +37,14 @@ tasks.withType(Test).configureEach {
def grapeDirectory = new File(temporaryDir, 'grape')
def jdk8 = ['-XX:+UseConcMarkSweepGC']
def jdk9 = ['-Djava.locale.providers=COMPAT,SPI'/*,
'--illegal-access=debug'*/]
+def jdk22 = ['-Djava.locale.providers=CLDR,SPI'] /* WARNING: COMPAT locale
provider will be removed in a future release */
def common = ['-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}",
'-Duser.language=en']
if (JavaVersion.current().isJava9Compatible()) {
jvmArgs(*common, *jdk9)
systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
+} else if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_22))
{
+jvmArgs(*common, *jdk22)
+systemProperty 'groovy.force.illegal.access',
findProperty('groovy.force.illegal.access')
} else {
jvmArgs(*common, *jdk8)
}
(groovy) branch danielsun/tweak_github_action_workflows updated (492416bb3c -> 538b38d613)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/tweak_github_action_workflows in repository https://gitbox.apache.org/repos/asf/groovy.git discard 492416bb3c Add JDK 22-ea and JDK 23-ea builds new 538b38d613 Add JDK 22-ea and JDK 23-ea builds This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (492416bb3c) \ N -- N -- N refs/heads/danielsun/tweak_github_action_workflows (538b38d613) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/groovy-build-test-ea.yml | 2 +- build-logic/src/main/groovy/org.apache.groovy-tested.gradle | 4 2 files changed, 5 insertions(+), 1 deletion(-)
(groovy) branch danielsun/tweak_github_action_workflows updated: Add JDK 22-ea and JDK 23-ea builds
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak_github_action_workflows
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to
refs/heads/danielsun/tweak_github_action_workflows by this push:
new 492416bb3c Add JDK 22-ea and JDK 23-ea builds
492416bb3c is described below
commit 492416bb3cc68631fae894c0f13be50819d74954
Author: Daniel Sun
AuthorDate: Sun Jan 21 21:47:58 2024 +0800
Add JDK 22-ea and JDK 23-ea builds
---
.github/workflows/groovy-build-test-ea.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/groovy-build-test-ea.yml
b/.github/workflows/groovy-build-test-ea.yml
index ec561cbaaa..c3aebf2035 100644
--- a/.github/workflows/groovy-build-test-ea.yml
+++ b/.github/workflows/groovy-build-test-ea.yml
@@ -28,8 +28,8 @@ jobs:
os: [ubuntu-22.04]
java: [17]
# The jdk links of "install-jdk.sh" are sometimes outdated, so we have
to download openjdk releases from https://jdk.java.net/ by ourselves.
-jdk:
["https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz;,
-
"https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_linux-x64_bin.tar.gz;]
+jdk:
["https://download.java.net/java/early_access/jdk22/31/GPL/openjdk-22-ea+31_linux-x64_bin.tar.gz;,
+
"https://download.java.net/java/early_access/jdk23/5/GPL/openjdk-23-ea+5_linux-x64_bin.tar.gz;]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
(groovy) branch danielsun/tweak_github_action_workflows updated: GROOVY-11292: Class without sealed parent cannot be non-sealed
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak_github_action_workflows
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to
refs/heads/danielsun/tweak_github_action_workflows by this push:
new 64709bd25a GROOVY-11292: Class without sealed parent cannot be
non-sealed
64709bd25a is described below
commit 64709bd25a696ab79a18da09eb60bbca28b6
Author: Daniel Sun
AuthorDate: Sat Jan 20 23:38:52 2024 +0800
GROOVY-11292: Class without sealed parent cannot be non-sealed
---
.github/workflows/groovy-build-test-main.yml | 2 +-
.../java/org/codehaus/groovy/ast/ClassNode.java| 12 +++
.../groovy/ast/decompiled/DecompiledClassNode.java | 14 +++
.../groovy/classgen/ClassCompletionVerifier.java | 3 +-
src/test/groovy/bugs/Groovy11292.groovy| 100 +
5 files changed, 128 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/groovy-build-test-main.yml
b/.github/workflows/groovy-build-test-main.yml
index 5e342f8fec..10e379cff2 100644
--- a/.github/workflows/groovy-build-test-main.yml
+++ b/.github/workflows/groovy-build-test-main.yml
@@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [11, 17]
+java: [11, 17, 21]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
index 0b726ef719..a2c9d98150 100644
--- a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
@@ -18,6 +18,7 @@
*/
package org.codehaus.groovy.ast;
+import groovy.transform.NonSealed;
import org.apache.groovy.ast.tools.ClassNodeUtils;
import org.apache.groovy.lang.annotation.Incubating;
import org.codehaus.groovy.GroovyBugError;
@@ -47,6 +48,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import static java.lang.reflect.Modifier.isFinal;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;
import static org.apache.groovy.ast.tools.MethodNodeUtils.getCodeAsBlock;
@@ -1333,6 +1335,16 @@ public class ClassNode extends AnnotatedNode {
return !getAnnotations(ClassHelper.SEALED_TYPE).isEmpty() ||
!getPermittedSubclasses().isEmpty();
}
+@Incubating
+public boolean isNonSealed() {
+if (redirect != null) return redirect.isNonSealed();
+if (Boolean.TRUE.equals(this.getNodeMetaData(NonSealed.class))) return
true;
+
+final ClassNode superClass = this.getSuperClass();
+if (null == superClass) return false;
+return superClass.isSealed() && !(isFinal(this.getModifiers()) ||
this.isSealed());
+}
+
public boolean isResolved() {
if (clazz != null) return true;
if (redirect != null) return redirect.isResolved();
diff --git
a/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
b/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
index e919d090db..8cfe776512 100644
--- a/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
@@ -109,6 +109,20 @@ public class DecompiledClassNode extends ClassNode {
return false;
}
+@Override
+public boolean isNonSealed() {
+Class typeClass;
+try {
+typeClass = getTypeClass();
+} catch (NoClassDefFoundError e) {
+return false;
+}
+
+final Class superclass = typeClass.getSuperclass();
+if (null == superclass) return false;
+return ReflectionUtils.isSealed(superclass) &&
!(Modifier.isFinal(typeClass.getModifiers()) ||
ReflectionUtils.isSealed(typeClass));
+}
+
@Override
public String setName(String name) {
throw new UnsupportedOperationException();
diff --git
a/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
b/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
index 870704af79..33dbafa944 100644
--- a/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
+++ b/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
@@ -18,7 +18,6 @@
*/
package org.codehaus.groovy.classgen;
-import groovy.transform.NonSealed;
import groovy.transform.Sealed;
import org.apache.groovy.ast.tools.AnnotatedNodeUtils;
import org.apache.groovy.ast.tools.ClassNodeUtils;
@@ -368,7 +367,7 @@ public class ClassCompletionVerifier extends
ClassCodeVisitorSupport {
}
private boolean nonSealed(final ClassNode node) {
-return Boolean.TRUE.equals(node.getNodeMetaData(NonSealed.class));
+return node.isNonSealed();
(groovy) 01/01: Merge additional JDK builds
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch danielsun/tweak_github_action_workflows
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a6b6e3bd9e868e8bcc6fd0bda1f0b0e7eeb87515
Author: Daniel Sun
AuthorDate: Sun Jan 21 20:39:35 2024 +0800
Merge additional JDK builds
---
.github/workflows/groovy-build-test-19.yml | 45 -
.github/workflows/groovy-build-test-aux.yml | 2 +-
2 files changed, 1 insertion(+), 46 deletions(-)
diff --git a/.github/workflows/groovy-build-test-19.yml
b/.github/workflows/groovy-build-test-19.yml
deleted file mode 100644
index 879b8e8d88..00
--- a/.github/workflows/groovy-build-test-19.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-name: Build and test 19
-
-on: [push, pull_request]
-
-permissions:
- contents: read
-
-jobs:
- test:
-strategy:
- fail-fast: false
- matrix:
-os: [ubuntu-22.04]
-runs-on: ${{ matrix.os }}
-env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-steps:
- - uses: actions/checkout@v4
- - name: Set up JDKs
-uses: actions/setup-java@v4
-with:
- distribution: 'zulu'
- java-version: |
-19
-17
- check-latest: true
- - uses: gradle/gradle-build-action@v2
- - name: Test with Gradle
-run: ./gradlew test -Ptarget.java.home=${{ env.JAVA_HOME_19_X64 }}
-timeout-minutes: 60
diff --git a/.github/workflows/groovy-build-test-aux.yml
b/.github/workflows/groovy-build-test-aux.yml
index facdfcf82c..d73e8169f3 100644
--- a/.github/workflows/groovy-build-test-aux.yml
+++ b/.github/workflows/groovy-build-test-aux.yml
@@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [12, 13, 14, 15, 16, 18]
+java: [12, 13, 14, 15, 16, 18, 19, 20]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
(groovy) branch danielsun/tweak_github_action_workflows created (now a6b6e3bd9e)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch danielsun/tweak_github_action_workflows in repository https://gitbox.apache.org/repos/asf/groovy.git at a6b6e3bd9e Merge additional JDK builds This branch includes the following new commits: new a6b6e3bd9e Merge additional JDK builds The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(groovy) branch GROOVY-11292 updated (9108719f93 -> 9ae1d96371)
This is an automated email from the ASF dual-hosted git repository. sunlan pushed a change to branch GROOVY-11292 in repository https://gitbox.apache.org/repos/asf/groovy.git discard 9108719f93 GROOVY-11292: Class without sealed parent cannot be non-sealed new 9ae1d96371 GROOVY-11292: Class without sealed parent cannot be non-sealed This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (9108719f93) \ N -- N -- N refs/heads/GROOVY-11292 (9ae1d96371) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/main/java/org/codehaus/groovy/ast/ClassNode.java | 2 +- .../java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
(groovy) 01/01: GROOVY-11292: Class without sealed parent cannot be non-sealed
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-11292
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 9ae1d96371cd68a1bad83f70f6b6c74fd17d436a
Author: Daniel Sun
AuthorDate: Sat Jan 20 23:38:52 2024 +0800
GROOVY-11292: Class without sealed parent cannot be non-sealed
---
.github/workflows/groovy-build-test-main.yml | 2 +-
.../java/org/codehaus/groovy/ast/ClassNode.java| 12 +++
.../groovy/ast/decompiled/DecompiledClassNode.java | 14 +++
.../groovy/classgen/ClassCompletionVerifier.java | 3 +-
src/test/groovy/bugs/Groovy11292.groovy| 100 +
5 files changed, 128 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/groovy-build-test-main.yml
b/.github/workflows/groovy-build-test-main.yml
index 5e342f8fec..10e379cff2 100644
--- a/.github/workflows/groovy-build-test-main.yml
+++ b/.github/workflows/groovy-build-test-main.yml
@@ -26,7 +26,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
-java: [11, 17]
+java: [11, 17, 21]
runs-on: ${{ matrix.os }}
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
index 0b726ef719..a2c9d98150 100644
--- a/src/main/java/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/ClassNode.java
@@ -18,6 +18,7 @@
*/
package org.codehaus.groovy.ast;
+import groovy.transform.NonSealed;
import org.apache.groovy.ast.tools.ClassNodeUtils;
import org.apache.groovy.lang.annotation.Incubating;
import org.codehaus.groovy.GroovyBugError;
@@ -47,6 +48,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import static java.lang.reflect.Modifier.isFinal;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;
import static org.apache.groovy.ast.tools.MethodNodeUtils.getCodeAsBlock;
@@ -1333,6 +1335,16 @@ public class ClassNode extends AnnotatedNode {
return !getAnnotations(ClassHelper.SEALED_TYPE).isEmpty() ||
!getPermittedSubclasses().isEmpty();
}
+@Incubating
+public boolean isNonSealed() {
+if (redirect != null) return redirect.isNonSealed();
+if (Boolean.TRUE.equals(this.getNodeMetaData(NonSealed.class))) return
true;
+
+final ClassNode superClass = this.getSuperClass();
+if (null == superClass) return false;
+return superClass.isSealed() && !(isFinal(this.getModifiers()) ||
this.isSealed());
+}
+
public boolean isResolved() {
if (clazz != null) return true;
if (redirect != null) return redirect.isResolved();
diff --git
a/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
b/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
index e919d090db..8cfe776512 100644
--- a/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
+++ b/src/main/java/org/codehaus/groovy/ast/decompiled/DecompiledClassNode.java
@@ -109,6 +109,20 @@ public class DecompiledClassNode extends ClassNode {
return false;
}
+@Override
+public boolean isNonSealed() {
+Class typeClass;
+try {
+typeClass = getTypeClass();
+} catch (NoClassDefFoundError e) {
+return false;
+}
+
+final Class superclass = typeClass.getSuperclass();
+if (null == superclass) return false;
+return ReflectionUtils.isSealed(superclass) &&
!(Modifier.isFinal(typeClass.getModifiers()) ||
ReflectionUtils.isSealed(typeClass));
+}
+
@Override
public String setName(String name) {
throw new UnsupportedOperationException();
diff --git
a/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
b/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
index 870704af79..33dbafa944 100644
--- a/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
+++ b/src/main/java/org/codehaus/groovy/classgen/ClassCompletionVerifier.java
@@ -18,7 +18,6 @@
*/
package org.codehaus.groovy.classgen;
-import groovy.transform.NonSealed;
import groovy.transform.Sealed;
import org.apache.groovy.ast.tools.AnnotatedNodeUtils;
import org.apache.groovy.ast.tools.ClassNodeUtils;
@@ -368,7 +367,7 @@ public class ClassCompletionVerifier extends
ClassCodeVisitorSupport {
}
private boolean nonSealed(final ClassNode node) {
-return Boolean.TRUE.equals(node.getNodeMetaData(NonSealed.class));
+return node.isNonSealed();
}
private void checkSealedParent(final ClassNode cn, final ClassNode parent)
{
diff --git a/src/test/groovy/bugs/Groovy11292.groovy
b/src/test/groovy/bugs/Groovy11292.groovy
new file mode 100644
index 00..b4421e7800
--- /dev/nul
(groovy) branch master updated: GROOVY-11293: Add a test
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 6b8915fbd1 GROOVY-11293: Add a test
6b8915fbd1 is described below
commit 6b8915fbd1ab898bb590caf27bfdd05d3296e7cb
Author: Daniel Sun
AuthorDate: Sun Jan 21 19:46:04 2024 +0800
GROOVY-11293: Add a test
---
src/test/groovy/bugs/Groovy11293.groovy | 52 +
1 file changed, 52 insertions(+)
diff --git a/src/test/groovy/bugs/Groovy11293.groovy
b/src/test/groovy/bugs/Groovy11293.groovy
new file mode 100644
index 00..37ee96e9d0
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy11293.groovy
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package bugs
+
+import org.junit.Test
+
+import static groovy.test.GroovyAssert.assertScript
+
+final class Groovy11293 {
+@Test
+void testVarargs() {
+assertScript '''
+import java.nio.file.FileSystems
+
+class Groovy11293 {
+static void main(String[] args) {
+FileSystems.default.getPath('root.txt')
+}
+}
+'''
+}
+
+@Test
+void testVarargs_CS() {
+assertScript '''
+import java.nio.file.FileSystems
+
+@groovy.transform.CompileStatic
+class Groovy11293 {
+static void main(String[] args) {
+FileSystems.default.getPath('root.txt')
+}
+}
+'''
+}
+}
(groovy) branch GROOVY_4_0_X updated: GROOVY-11293: Add a test
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
new 735a329225 GROOVY-11293: Add a test
735a329225 is described below
commit 735a32922537c6822d0d3adc633f3bc910bdf169
Author: Daniel Sun
AuthorDate: Sun Jan 21 19:46:04 2024 +0800
GROOVY-11293: Add a test
---
src/test/groovy/bugs/Groovy11293.groovy | 52 +
1 file changed, 52 insertions(+)
diff --git a/src/test/groovy/bugs/Groovy11293.groovy
b/src/test/groovy/bugs/Groovy11293.groovy
new file mode 100644
index 00..37ee96e9d0
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy11293.groovy
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package bugs
+
+import org.junit.Test
+
+import static groovy.test.GroovyAssert.assertScript
+
+final class Groovy11293 {
+@Test
+void testVarargs() {
+assertScript '''
+import java.nio.file.FileSystems
+
+class Groovy11293 {
+static void main(String[] args) {
+FileSystems.default.getPath('root.txt')
+}
+}
+'''
+}
+
+@Test
+void testVarargs_CS() {
+assertScript '''
+import java.nio.file.FileSystems
+
+@groovy.transform.CompileStatic
+class Groovy11293 {
+static void main(String[] args) {
+FileSystems.default.getPath('root.txt')
+}
+}
+'''
+}
+}
