(groovy) branch master updated: mark 2.4.x as unsupported
This is an automated email from the ASF dual-hosted git repository. paulk 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 53f9c69901 mark 2.4.x as unsupported 53f9c69901 is described below commit 53f9c69901ac0c6e5a7b57441ab27317822aedd7 Author: Paul King AuthorDate: Fri Jul 12 20:42:23 2024 +1000 mark 2.4.x as unsupported --- .github/SECURITY.md | 24 +++- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index 0b064f840b..eaf0b44745 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -28,21 +28,19 @@ were renamed due to split package remediation ([GROOVY-10542](https://issues.apa The latest released version in the Groovy 2.5.x stream is recommended where JDK7 is required. -| Version | Supported | Comment | -|--| -- |--| -| <= 2.3.x | :x:| | -| 2.4.x| :grey_question:| Only severe/critical vulnerabilities (*) | -| 2.5.x| :white_check_mark: | Reduced releases on this branch | -| 3.0.x| :white_check_mark: | | -| 4.0.x| :white_check_mark: | | -| 5.x | :grey_question:| Pre-release status (**) | - -(\*) The 2.4.x stream is no longer the focus of the core team -but critical security fixes or community contributions may lead -to additional releases. +| Version | Supported | Comment | +|--| -- |--| +| <= 2.4.x | :x:| | +| 2.5.x| :white_check_mark: | Reduced releases on this branch (\*) | +| 3.0.x| :white_check_mark: | | +| 4.0.x| :white_check_mark: | | +| 5.x | :grey_question:| Pre-release status (**) | + +(\*) The 2.5.x stream is no longer the focus of the core team, +but we are currently still doing critical security fixes if needed. (**) While in early stages of pre-release, security fixes are -done on a best effort basis. +done on a best-effort basis. ## List of Security Vulnerability Fixes
(groovy-website) branch asf-site updated: add BOM characters blog post
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 7caf909 add BOM characters blog post
7caf909 is described below
commit 7caf9095f3d9d68353eb95d960b0a9b7ec34c983
Author: Paul King
AuthorDate: Fri Jul 12 00:50:04 2024 +1000
add BOM characters blog post
---
.../blog/handling-byte-order-mark-characters.adoc | 39 ++
1 file changed, 39 insertions(+)
diff --git a/site/src/site/blog/handling-byte-order-mark-characters.adoc
b/site/src/site/blog/handling-byte-order-mark-characters.adoc
new file mode 100644
index 000..35c268c
--- /dev/null
+++ b/site/src/site/blog/handling-byte-order-mark-characters.adoc
@@ -0,0 +1,39 @@
+= Handling Byte-Order-Mark Characters in Groovy
+Paul King
+:revdate: 2024-07-11T20:00:00+00:00
+:keywords: groovy, bom_chars, unicode, encoding
+:description: Handling Byte Order Mark (BOM) characters in Groovy
+
+A
https://www.javacodegeeks.com/remove-byte-order-mark-characters-from-file.html[recent
article]
+showed how to process https://en.wikipedia.org/wiki/Byte_order_mark[Byte Order
Mark (BOM)] characters
+within text files when coding in Java. In particular, often manual removal of
those characters might
+be needed when processing text files. The article showed how to remove the BOM
characters when using
+the `InputStream` and `Reader` classes as well as how to do it using `NIO`
functionality. It also showed
+how the `BOMInputStream` class in
https://commons.apache.org/proper/commons-io/[Apache Commons IO]
+could be used. It automatically skips over the BOM characters.
+
+Those examples can be run as is in Groovy (albeit after fixing a bug in the
first example)
+but the (complete!) idiomatic solution in Groovy is:
+
+[source,groovy]
+
+println new File('file.txt').text
+
+
+That's right, Groovy automatically detects
+the encoding, and removes BOM characters,
+when using the `getText()` method
+along with others like `eachLine`, `splitEachLine`,
+`readLines`, `withReader`, and `filterLine`.
+The same functionality can be obtained using
+the `newReader` method too on files and URLs.
+
+When needed there are variants that let you
+specify the encoding should you wish to explicitly
+declare it. In that case, you'd need to handle the
+BOM characters manually.
+
+Groovy's methods like `getText` call an underlying
+`CharsetToolkit` class. You can also use that class directly
+should you wish to learn more about the encoding
+of a file.
\ No newline at end of file
(groovy-website) branch asf-site updated: Oracle 23ai blog post (add PCA plot)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git The following commit(s) were added to refs/heads/asf-site by this push: new fe422ae Oracle 23ai blog post (add PCA plot) fe422ae is described below commit fe422ae9d356baa10a9a9c9e7a91f3f0f9fa3b0c Author: Paul King AuthorDate: Mon Jul 1 17:13:48 2024 +1000 Oracle 23ai blog post (add PCA plot) --- site/src/site/blog/groovy-oracle23ai.adoc | 25 +--- site/src/site/blog/img/iris_closest10points.png | Bin 0 -> 110968 bytes 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/site/src/site/blog/groovy-oracle23ai.adoc b/site/src/site/blog/groovy-oracle23ai.adoc index 473a6ec..6e0d421 100644 --- a/site/src/site/blog/groovy-oracle23ai.adoc +++ b/site/src/site/blog/groovy-oracle23ai.adoc @@ -168,7 +168,7 @@ Iris-setosa Iris-setosa 100 Iris-virginica Iris-virginica100 Iris-versicolor Iris-versicolor 100 Iris-versicolor Iris-versicolor 100 -Iris-versicolor Iris-versicolor70 +*Iris-versicolor Iris-versicolor70* Iris-virginica Iris-virginica100 Iris-virginica Iris-virginica100 Iris-setosa Iris-setosa 100 @@ -187,8 +187,27 @@ Iris-virginica Iris-virginica100 Iris-virginica Iris-virginica100 -Only one result was incorrect. Since we randomly shuffled the data, -we might get a different number of incorrect results for other runs. +Only one result was incorrect (first *bold* line above). +Since we randomly shuffled the data, we might get a +different number of incorrect results for other runs. + +We can visualize how the distance query works +by plotting the closest 10 points in a 3D plot. +We'll do this for the points returned for the 70% +confidence case (second *bold* line above): + +image:img/iris_closest10points.png[closest 10 points] + +This is a Principal Component Analysis (PCA) plot +which projects our 4 dimensions (Petal width and length, +Sepal width and length) down onto 3 dimensions. + +The large red dot is the projection for our test query characteristics. +The small dots are the unselected points in our dataset. +The medium dots are the dots returned by our `vector_distance` +query. +7 Versicolor points (blue) were returned and 3 Virginica points (orange) were returned. +We know the result was Versicolor for that data point. == More Information diff --git a/site/src/site/blog/img/iris_closest10points.png b/site/src/site/blog/img/iris_closest10points.png new file mode 100644 index 000..e522ecc Binary files /dev/null and b/site/src/site/blog/img/iris_closest10points.png differ
(groovy-website) branch asf-site updated: Oracle 23ai blog post (minor tweaks)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 4d23f64 Oracle 23ai blog post (minor tweaks) 4d23f64 is described below commit 4d23f64147bc936eac99baf4a7b91b6da600336d Author: Paul King AuthorDate: Mon Jul 1 10:41:47 2024 +1000 Oracle 23ai blog post (minor tweaks) --- site/src/site/blog/img/iris_knn_smile_petal.png | Bin 0 -> 42823 bytes site/src/site/blog/img/iris_knn_smile_sepal.png | Bin 0 -> 46721 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/site/src/site/blog/img/iris_knn_smile_petal.png b/site/src/site/blog/img/iris_knn_smile_petal.png new file mode 100644 index 000..96fad91 Binary files /dev/null and b/site/src/site/blog/img/iris_knn_smile_petal.png differ diff --git a/site/src/site/blog/img/iris_knn_smile_sepal.png b/site/src/site/blog/img/iris_knn_smile_sepal.png new file mode 100644 index 000..827c8dc Binary files /dev/null and b/site/src/site/blog/img/iris_knn_smile_sepal.png differ
(groovy-website) branch asf-site updated (a38059a -> bee60b1)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git from a38059a Oracle 23ai blog post (minor tweaks) new e65fcb4 add windows installers new bee60b1 Oracle 23ai blog post (minor tweaks) 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: site/src/site/blog/groovy-oracle23ai.adoc | 54 +++--- site/src/site/blog/img/iris_csv.png | Bin 0 -> 8737 bytes site/src/site/blog/img/iris_knn_smile.png | Bin 37768 -> 0 bytes site/src/site/sitemap-dev.groovy | 21 ++-- 4 files changed, 45 insertions(+), 30 deletions(-) create mode 100644 site/src/site/blog/img/iris_csv.png delete mode 100644 site/src/site/blog/img/iris_knn_smile.png
(groovy-website) 02/02: Oracle 23ai blog post (minor tweaks)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
commit bee60b111cd319f94161385c47831f1187f0e80e
Author: Paul King
AuthorDate: Mon Jul 1 10:38:54 2024 +1000
Oracle 23ai blog post (minor tweaks)
---
site/src/site/blog/groovy-oracle23ai.adoc | 54 +++---
site/src/site/blog/img/iris_csv.png | Bin 0 -> 8737 bytes
site/src/site/blog/img/iris_knn_smile.png | Bin 37768 -> 0 bytes
3 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/site/src/site/blog/groovy-oracle23ai.adoc
b/site/src/site/blog/groovy-oracle23ai.adoc
index 98a9593..473a6ec 100644
--- a/site/src/site/blog/groovy-oracle23ai.adoc
+++ b/site/src/site/blog/groovy-oracle23ai.adoc
@@ -18,11 +18,13 @@ In this blog post, we'll look at using Oracle 23ai's Vector
data type and Vector
queries to classify part of our dataset.
In general, many machine learning/AI algorithms process vectors of information.
-Such information might be actual data values, like our flowers, or projections
+Such information might be actual data values, like the characteristics for our
flowers, or projections
of data values, or representations of important information of text,
video, images or sound files. The latter is often called embeddings.
+
For us, we'll find flowers with similar characteristics. In other similarity
-search scenarios, we might find similar images based on the "closeness"
+search scenarios, we might detect fraudulent transactions, find customer
recommendations,
+or find similar images based on the "closeness"
of their embeddings.
== The dataset
@@ -32,9 +34,13 @@ shows how to classify the Iris dataset using various
techniques. In particular,
kNN classification algorithm. The example uses the whole dataset to train the
model
and then runs the model on the whole dataset to gauge its accuracy. The
algorithm
has some trouble with the data points near the overlap of the Virginica and
Versicolor
-groupings as shown in the resulting graph:
+groupings as shown in the resulting graph of classification vs petal size:
+
+image:img/iris_knn_smile_petal.png[Graph of predicted vs actual Iris flower
classifications]
-image:img/iris_knn_smile.png[Graph of predicted vs actual Iris flower
classifications]
+If we look at classification vs sepal size, we can see even more chance of
confusion:
+
+image:img/iris_knn_smile_sepal.png[Graph of predicted vs actual Iris flower
classifications]
The purple and green points show the incorrectly classified flowers.
@@ -52,13 +58,20 @@ class 2 | 0 | *3* | 47 |
In general, running a model on the original dataset might not be ideal
in the sense we won't get accurate error calculations, but it does
highlight some important information about our data. In our case
-we can see that two of the groupings become congested, and data points
-near where the two groups overlap might be expected to be prone
-to mis-classification.
+we can see that the Virginica and Versacolor classes become congested,
+and data points near where the two groups overlap might be expected
+to be prone to mis-classification.
== The database solution
-First, we load our dataset from a CSV file:
+Our data is stored in a CSV file:
+
+image:img/iris_csv.png[iris CSV file]
+
+It happens to have 50 each of the three classes of Iris.
+First, we load our dataset from the CSV file, skipping the header row
+and shuffling the remaining rows to ensure we'll test against a random
+mixture of the three classes of Iris:
[source,groovy]
@@ -67,7 +80,7 @@ var rows = file.readLines()[1..-1].shuffled() // skip header
and shuffle
var (training, test) = rows.chop(rows.size() * .8 as int, -1)
-After shuffling the rows, we split the data into two sets.
+After shuffling, we split the data into two sets.
The first 80% will go into the database.
It corresponds to "training" data in normal data science terminology.
The last 20% will correspond to our "test" data.
@@ -91,7 +104,7 @@ Sql.withInstance(url, user, password, driver) { sql ->
var data = row.split(',')
var features = data[0..-2].toString()
sql.executeInsert """
-INSERT INTO Iris (class, features) VALUES (${data[-1]},$features)
+INSERT INTO Iris (class, features) VALUES (${data[-1]}, $features)
"""
}
printf "%-20s%-20s%-20s%n", 'Actual', 'Predicted', 'Confidence'
@@ -100,7 +113,7 @@ Sql.withInstance(url, user, password, driver) { sql ->
var features = VECTOR.ofFloat64Values(data[0..-2]*.toDouble() as
double[])
var closest10 = sql.rows """
select class from Iris
-order by vector_distance(features, $features)
+order by vector_distance(features, $features, E
(groovy-website) 01/02: add windows installers
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
commit e65fcb40d0f60bef27e4bb675b9e8c899bb4e03f
Author: Paul King
AuthorDate: Mon Jul 1 09:12:28 2024 +1000
add windows installers
---
site/src/site/sitemap-dev.groovy | 21 +++--
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index 2c27056..c893765 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -86,12 +86,7 @@ downloads {
}
version('5.0.0-alpha-9') {
stable false
-//windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-5.0.0-alpha-9/'
-}
-version('5.0.0-alpha-8') {
-stable false
-archive true
-windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-5.0.0-alpha-8/'
+windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-5.0.0-alpha-9/'
}
}
distribution('Groovy 4.0') {
@@ -103,12 +98,7 @@ downloads {
}
version('4.0.22') {
stable true
-//windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-4.0.22/'
-}
-version('4.0.21') {
-stable true
-archive true
-windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-4.0.21/'
+windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-4.0.22/'
}
}
distribution('Groovy 3.0') {
@@ -120,12 +110,7 @@ downloads {
}
version('3.0.22') {
stable true
-//windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-3.0.22/'
-}
-version('3.0.21') {
-stable true
-archive true
-windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-3.0.21/'
+windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-3.0.22/'
}
}
distribution('Groovy 2.5') {
(groovy-website) branch asf-site updated: Oracle 23ai blog post (minor tweaks)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new a38059a Oracle 23ai blog post (minor tweaks)
a38059a is described below
commit a38059af7ff18d30dc393032472065831fb8909a
Author: Paul King
AuthorDate: Sun Jun 30 22:18:37 2024 +1000
Oracle 23ai blog post (minor tweaks)
---
site/src/site/blog/groovy-oracle23ai.adoc | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/site/src/site/blog/groovy-oracle23ai.adoc
b/site/src/site/blog/groovy-oracle23ai.adoc
index 68fec03..98a9593 100644
--- a/site/src/site/blog/groovy-oracle23ai.adoc
+++ b/site/src/site/blog/groovy-oracle23ai.adoc
@@ -90,7 +90,9 @@ Sql.withInstance(url, user, password, driver) { sql ->
training.each { row ->
var data = row.split(',')
var features = data[0..-2].toString()
-sql.executeInsert("INSERT INTO Iris (class, features) VALUES
(${data[-1]},$features)")
+sql.executeInsert """
+INSERT INTO Iris (class, features) VALUES (${data[-1]},$features)
+"""
}
printf "%-20s%-20s%-20s%n", 'Actual', 'Predicted', 'Confidence'
test.each { row ->
@@ -101,7 +103,9 @@ Sql.withInstance(url, user, password, driver) { sql ->
order by vector_distance(features, $features)
fetch first 10 rows only
"""
-var results = closest10.groupBy{ e -> e.CLASS }.collectEntries { e ->
[e.key, e.value.size()]}
+var results = closest10
+.groupBy{ e -> e.CLASS }
+.collectEntries { e -> [e.key, e.value.size()]}
var predicted = results.max{ e -> e.value }
printf "%-20s%-20s%5d%n", data[-1], predicted.key, predicted.value * 10
}
(groovy-website) branch asf-site updated: Oracle 23ai blog post
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new dd3954a Oracle 23ai blog post
dd3954a is described below
commit dd3954afefb46793fabc33c2be3237d6ed56fc5d
Author: Paul King
AuthorDate: Sun Jun 30 21:58:15 2024 +1000
Oracle 23ai blog post
---
site/src/site/blog/groovy-oracle23ai.adoc | 167 ++
site/src/site/blog/img/iris_knn_smile.png | Bin 0 -> 37768 bytes
2 files changed, 167 insertions(+)
diff --git a/site/src/site/blog/groovy-oracle23ai.adoc
b/site/src/site/blog/groovy-oracle23ai.adoc
new file mode 100644
index 000..68fec03
--- /dev/null
+++ b/site/src/site/blog/groovy-oracle23ai.adoc
@@ -0,0 +1,167 @@
+= Using the Oracle 23ai Vector data type with Groovy to classify Iris flowers
+Paul King
+:revdate: 2024-06-30T23:21:10+00:00
+:keywords: oracle, jdbc, groovy, classification
+:description: This post looks at using the Oracle 23ai Vector data type with
Groovy.
+
+image:img/iris_flowers.png[iris flowers,200,float="right"]
+A classic data science
https://en.wikipedia.org/wiki/Iris_flower_data_set[dataset] captures flower
characteristics of Iris flowers.
+It captures the _width_ and _length_ of the _sepals_ and _petals_ for three
_species_ (https://en.wikipedia.org/wiki/Iris_setosa[Setosa],
https://en.wikipedia.org/wiki/Iris_versicolor[Versicolor], and
https://en.wikipedia.org/wiki/Iris_virginica[Virginica]).
+
+The
https://github.com/paulk-asert/groovy-data-science/tree/master/subprojects/Iris[Iris
project] in the
https://github.com/paulk-asert/groovy-data-science[groovy-data-science repo] is
dedicated to this example.
+It includes a number of Groovy scripts and a Jupyter/BeakerX notebook
highlighting this example
+comparing and contrasting various libraries and various classification
algorithms.
+
+A previous
https://groovy.apache.org/blog/classifying-iris-flowers-with-deep[blog post]
+describes this example using several deep learning libraries and gave a
solution utilizing GraalVM.
+In this blog post, we'll look at using Oracle 23ai's Vector data type and
Vector AI
+queries to classify part of our dataset.
+
+In general, many machine learning/AI algorithms process vectors of information.
+Such information might be actual data values, like our flowers, or projections
+of data values, or representations of important information of text,
+video, images or sound files. The latter is often called embeddings.
+For us, we'll find flowers with similar characteristics. In other similarity
+search scenarios, we might find similar images based on the "closeness"
+of their embeddings.
+
+== The dataset
+
+The previously mentioned
https://github.com/paulk-asert/groovy-data-science/tree/master/subprojects/Iris[Iris
Project]
+shows how to classify the Iris dataset using various techniques. In
particular, one example uses the http://haifengl.github.io/[Smile] library's
+kNN classification algorithm. The example uses the whole dataset to train the
model
+and then runs the model on the whole dataset to gauge its accuracy. The
algorithm
+has some trouble with the data points near the overlap of the Virginica and
Versicolor
+groupings as shown in the resulting graph:
+
+image:img/iris_knn_smile.png[Graph of predicted vs actual Iris flower
classifications]
+
+The purple and green points show the incorrectly classified flowers.
+
+The corresponding confusion matrix also shows these results:
+
+[subs="quotes"]
+
+Confusion matrix:
+ROW=truth and COL=predicted
+class 0 | 50 | 0 | 0 |
+class 1 | 0 | 47 | *3* |
+class 2 | 0 | *3* | 47 |
+
+
+In general, running a model on the original dataset might not be ideal
+in the sense we won't get accurate error calculations, but it does
+highlight some important information about our data. In our case
+we can see that two of the groupings become congested, and data points
+near where the two groups overlap might be expected to be prone
+to mis-classification.
+
+== The database solution
+
+First, we load our dataset from a CSV file:
+
+[source,groovy]
+
+var file = getClass().classLoader.getResource('iris_data.csv').file as File
+var rows = file.readLines()[1..-1].shuffled() // skip header and shuffle
+var (training, test) = rows.chop(rows.size() * .8 as int, -1)
+
+
+After shuffling the rows, we split the data into two sets.
+The first 80% will go into the database.
+It corresponds to "training" data in normal data science terminology.
+The last 20% will correspond to our "test" data.
+
+Next, we define the required information for our SQL connection:
+
+[source,groovy]
+
+var url = 'jdbc:oracle:thin:@localhost:1521/FREEPDB1'
+var user = 'some_user'
+var password = 'some_pas
(groovy-website) branch asf-site updated: Release 5.0.0-alpha-9: update sitemap
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new d6d8c87 Release 5.0.0-alpha-9: update sitemap
d6d8c87 is described below
commit d6d8c87a2595daa0639e6e0557e1394d09326d81
Author: Paul King
AuthorDate: Sun Jun 30 19:02:03 2024 +1000
Release 5.0.0-alpha-9: update sitemap
---
site/src/site/sitemap-dev.groovy | 5 +
site/src/site/sitemap-user.groovy | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index 13d6891..2c27056 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -84,8 +84,13 @@ downloads {
a(href: 'versioning.html', 'version')
yield ' of Groovy designed for JDK11+. Alpha releases are not
recommended for production use.'
}
+version('5.0.0-alpha-9') {
+stable false
+//windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-5.0.0-alpha-9/'
+}
version('5.0.0-alpha-8') {
stable false
+archive true
windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-5.0.0-alpha-8/'
}
}
diff --git a/site/src/site/sitemap-user.groovy
b/site/src/site/sitemap-user.groovy
index dd8aa69..1f66e2c 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -92,7 +92,7 @@ documentation {
'2.6.0-alpha-1', '2.6.0-alpha-2', '2.6.0-alpha-3', '2.6.0-alpha-4',
'3.0.0', '3.0.1', '3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6',
'3.0.7', '3.0.8', '3.0.9', '3.0.10', '3.0.11', '3.0.12', '3.0.13', '3.0.14',
'3.0.15', '3.0.16', '3.0.17', '3.0.18', '3.0.19', '3.0.20', '3.0.21', '3.0.22',
'4.0.0-rc-1', '4.0.0-rc-2', '4.0.0', '4.0.1', '4.0.2', '4.0.3',
'4.0.4', '4.0.5', '4.0.6', '4.0.7', '4.0.8', '4.0.9', '4.0.10', '4.0.11',
'4.0.12', '4.0.13', '4.0.14', '4.0.15', '4.0.16', '4.0.17', '4.0.18', '4.0.19',
'4.0.20', '4.0.21', '4.0.22',
-'5.0.0-alpha-1', '5.0.0-alpha-2', '5.0.0-alpha-3',
'5.0.0-alpha-4', '5.0.0-alpha-5', '5.0.0-alpha-6', '5.0.0-alpha-7',
'5.0.0-alpha-8'
+'5.0.0-alpha-1', '5.0.0-alpha-2', '5.0.0-alpha-3',
'5.0.0-alpha-4', '5.0.0-alpha-5', '5.0.0-alpha-6', '5.0.0-alpha-7',
'5.0.0-alpha-8', '5.0.0-alpha-9'
])
section('Getting started','fa-graduation-cap') {
svn commit: r70055 - in /release/groovy/5.0.0-alpha-9: ./ distribution/ sources/
Author: paulk Date: Sun Jun 30 09:01:56 2024 New Revision: 70055 Log: Releasing version 5.0.0-alpha-9 Added: release/groovy/5.0.0-alpha-9/ release/groovy/5.0.0-alpha-9/distribution/ release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip (with props) release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.asc release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.sha256 release/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip (with props) release/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip.asc release/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip.sha256 release/groovy/5.0.0-alpha-9/distribution/apache-groovy-sdk-5.0.0-alpha-9.zip (with props) release/groovy/5.0.0-alpha-9/distribution/apache-groovy-sdk-5.0.0-alpha-9.zip.asc release/groovy/5.0.0-alpha-9/distribution/apache-groovy-sdk-5.0.0-alpha-9.zip.sha256 release/groovy/5.0.0-alpha-9/sources/ release/groovy/5.0.0-alpha-9/sources/apache-groovy-src-5.0.0-alpha-9.zip (with props) release/groovy/5.0.0-alpha-9/sources/apache-groovy-src-5.0.0-alpha-9.zip.asc release/groovy/5.0.0-alpha-9/sources/apache-groovy-src-5.0.0-alpha-9.zip.sha256 Added: release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip == Binary file - no diff available. Propchange: release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip -- svn:mime-type = application/octet-stream Added: release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.asc == --- release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.asc (added) +++ release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.asc Sun Jun 30 09:01:56 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.77.00 + +iQIcBAABCgAGBQJmfR8uAAoJEGplF2oPsc0LLPcP/3kFo1M8gbVwg9G0ChgNynLX ++lx0oDAYpMd4MgTbaASDZlJzole2BD+zL8Wqr26JTfHs5mwWb/N4FWeCEtv7i3Lo +YIBcISgWFEATo6OItcflRLLGzN3Ofj+uDq8CjTX4TwH2YYRNJoZK3tuFh71Wa8QN +qdt3UVyEKc6bgMrE76ObHpHUm+N0j0NaaztDmFBjfFNpIRNYKVTbkiuGg7Ja0PRt +eMe900cGn11DCd4dyXIojsWtT8ONAzbtsqiNi/pN3Rx5EYtR/OvYK+4uCW7Mjhju +CQm7wYDv5yr9eDEsclfSHRe+b/fMUD7MrLBFqeuDRxNROt+iFOyTNBL/hObDryAn +GcK20fmq+KWuOihEn7sJConlN00p79/eJ3zlGGyocTz7nSaoebD4yJk0ZkEJvA0B +9z4sh1ov+A4KGUqUw7hSANr6am4s8tcWZmeyOQVzuwi41JxwwaDgl5H3c7n5TTsD +HJAd2DMAtwTm6f2Qu1NmwJuTGtxo9h9aJhPb0ooRgJ8/Fho0NcnKWfWoK+0/BPGm +HV47VMLIba/LfzUJqxvfml03kXI8QHCO2zLx5aDP+MgkR9j1jgltDf0fUhyanFwz +POigux+7Z5igSEQMHm9LEU6ScG3qriU6gYeijkCxBmLYPdLCZjPXTq7Uiz8l7KgC +bhntBDWoDPr2Nn6pY2/0 +=yQid +-END PGP SIGNATURE- Added: release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.sha256 == --- release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.sha256 (added) +++ release/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.sha256 Sun Jun 30 09:01:56 2024 @@ -0,0 +1 @@ +cda0d45e4a42b75c75af796c359767b3f18f3806f1bcd536a3625d8df8593986 Added: release/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip == Binary file - no diff available. Propchange: release/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip -- svn:mime-type = application/octet-stream Added: release/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip.asc == --- release/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip.asc (added) +++ release/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip.asc Sun Jun 30 09:01:56 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.77.00 + +iQIcBAABCgAGBQJmfRsrAAoJEGplF2oPsc0LXqUP/A2zF6YPOTFQSipb2vGz0819 +M73Gtj8gEMMOnHXt1rI/aF2zzXGNEzGeBe38Jrfd1dsY1gvYuoHss98Kptc9cZ4B +6qSz4NfkOU5hWLOOJiXrPqjbUyANSWu4dX7zv2hALczmKRfIo6Qa55aoQ0buDmT8 +17nECjn0sXK3rUr75zVbzzBRIlLyNWCPzXpQoTBBeodrOJMLiPOsThCEUZ2kWPhK +NML1pwBiHKCCFnq9x+1Q3I0Hy8/hDefdVticm5BfO5KO6F2d4q6mv53lzCCYAoTV +E4uVxNNz3UavH+qXEJOaE0sokrJNYMSQY+45zTXrdwldz7ZJLco6GqUjTCYMeT2P +8CGTggnNHR1iQtWvZORM39GjrTQ4mS1nBNb7Eg9+u9fXD7TOxzDj1bCK1TOCrOuO +06LnAhGZsfa3PBpBxhvfk/WwspAhRT0kuQlBu5RiktmyQXQy+aBM31FTMZlYt/sK +bCjixBY4lx7vB2U+B+pt1GvhlBpblRxQYo7/iSsV6aONXVCq918ZwvbFCqEnsqGi +Dco8aeKWya+0eDKmXR6EE2TlXu/8uB4GQu3kNpBAFRUHvyPnH
svn commit: r70056 - /dev/groovy/5.0.0-alpha-9/
Author: paulk Date: Sun Jun 30 09:02:02 2024 New Revision: 70056 Log: Deleting version 5.0.0-alpha-9 from the DEV staging area Removed: dev/groovy/5.0.0-alpha-9/
svn commit: r70054 - /release/groovy/5.0.0-alpha-8/
Author: paulk Date: Sun Jun 30 08:59:25 2024 New Revision: 70054 Log: Archive 5.0.0-alpha-8 Removed: release/groovy/5.0.0-alpha-8/
(groovy-website) branch asf-site updated: Release 4.0.22: update sitemap
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new ff3395c Release 4.0.22: update sitemap
ff3395c is described below
commit ff3395c1b9ae7a80b3bbbeccb4ce5d9c248f22c3
Author: Paul King
AuthorDate: Sun Jun 30 18:00:26 2024 +1000
Release 4.0.22: update sitemap
---
site/src/site/sitemap-dev.groovy | 5 +
site/src/site/sitemap-user.groovy | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index 60143e5..13d6891 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -96,8 +96,13 @@ downloads {
a(href: 'versioning.html', 'version')
yield ' of Groovy designed for JDK8+ with much improved JPMS
support.'
}
+version('4.0.22') {
+stable true
+//windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-4.0.22/'
+}
version('4.0.21') {
stable true
+archive true
windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-4.0.21/'
}
}
diff --git a/site/src/site/sitemap-user.groovy
b/site/src/site/sitemap-user.groovy
index b4eecc8..dd8aa69 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -91,7 +91,7 @@ documentation {
'2.5.0', '2.5.1', '2.5.2', '2.5.3', '2.5.4', '2.5.5', '2.5.6',
'2.5.7', '2.5.8', '2.5.9', '2.5.10', '2.5.11', '2.5.12', '2.5.13', '2.5.14',
'2.5.15', '2.5.16', '2.5.17', '2.5.18', '2.5.19', '2.5.20', '2.5.21', '2.5.22',
'2.5.23',
'2.6.0-alpha-1', '2.6.0-alpha-2', '2.6.0-alpha-3', '2.6.0-alpha-4',
'3.0.0', '3.0.1', '3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6',
'3.0.7', '3.0.8', '3.0.9', '3.0.10', '3.0.11', '3.0.12', '3.0.13', '3.0.14',
'3.0.15', '3.0.16', '3.0.17', '3.0.18', '3.0.19', '3.0.20', '3.0.21', '3.0.22',
-'4.0.0-rc-1', '4.0.0-rc-2', '4.0.0', '4.0.1', '4.0.2', '4.0.3',
'4.0.4', '4.0.5', '4.0.6', '4.0.7', '4.0.8', '4.0.9', '4.0.10', '4.0.11',
'4.0.12', '4.0.13', '4.0.14', '4.0.15', '4.0.16', '4.0.17', '4.0.18', '4.0.19',
'4.0.20', '4.0.21',
+'4.0.0-rc-1', '4.0.0-rc-2', '4.0.0', '4.0.1', '4.0.2', '4.0.3',
'4.0.4', '4.0.5', '4.0.6', '4.0.7', '4.0.8', '4.0.9', '4.0.10', '4.0.11',
'4.0.12', '4.0.13', '4.0.14', '4.0.15', '4.0.16', '4.0.17', '4.0.18', '4.0.19',
'4.0.20', '4.0.21', '4.0.22',
'5.0.0-alpha-1', '5.0.0-alpha-2', '5.0.0-alpha-3',
'5.0.0-alpha-4', '5.0.0-alpha-5', '5.0.0-alpha-6', '5.0.0-alpha-7',
'5.0.0-alpha-8'
])
svn commit: r70053 - /dev/groovy/4.0.22/
Author: paulk Date: Sun Jun 30 08:00:25 2024 New Revision: 70053 Log: Deleting version 4.0.22 from the DEV staging area Removed: dev/groovy/4.0.22/
svn commit: r70052 - in /release/groovy/4.0.22: ./ distribution/ sources/
Author: paulk Date: Sun Jun 30 08:00:18 2024 New Revision: 70052 Log: Releasing version 4.0.22 Added: release/groovy/4.0.22/ release/groovy/4.0.22/distribution/ release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip (with props) release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.asc release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.sha256 release/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip (with props) release/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.asc release/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.sha256 release/groovy/4.0.22/distribution/apache-groovy-sdk-4.0.22.zip (with props) release/groovy/4.0.22/distribution/apache-groovy-sdk-4.0.22.zip.asc release/groovy/4.0.22/distribution/apache-groovy-sdk-4.0.22.zip.sha256 release/groovy/4.0.22/sources/ release/groovy/4.0.22/sources/apache-groovy-src-4.0.22.zip (with props) release/groovy/4.0.22/sources/apache-groovy-src-4.0.22.zip.asc release/groovy/4.0.22/sources/apache-groovy-src-4.0.22.zip.sha256 Added: release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip == Binary file - no diff available. Propchange: release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip -- svn:mime-type = application/octet-stream Added: release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.asc == --- release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.asc (added) +++ release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.asc Sun Jun 30 08:00:18 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.77.00 + +iQIcBAABCgAGBQJmfRMqAAoJEGplF2oPsc0LP1oP/0iaXRl4LEbzBtFT76iRqw2Y +a4L1j/QJ7d1Mrsvh2UNk7gyM6GdGifOtZyO2LjLj2VgfMXdCHeXwq8W1Afhw1t75 +IXhXau39sxgKD+5/MO/ruvKpV3D0NMc9EujWXqtis3fhY5PT2feTe72Cwq+V7sPO +75Hz7b0HVBIdsxTC81MwMK5uX9txkgsrcE9+4g5Z9h9Nqw7UZEHaDOEVyvp1mRhT +sGtGp2D2m/XREvHBrlo7grXx8dNTHh+ke16IRWd9+q4tqwVTkUupe6JE7OCrWyi9 +UO1JaS6vQHpihK/W/q30Ll15IZiOAULVwo1kM2FCcA74v+tFJHnyOnxeETMgo/T+ +MKjpT7Qn7Co2z12WJTa4pulBdtzFDD1lrAxClVEp5cPi2uLWRahPXNlRLJzSbyh+ +VyNnojw4d3YW65y6GdlDDohXiA0NSwB7K4dNNxga6MW7SLGpm7uzBL/4VD6uQL1b +2ECyxdwtdNVPJkkQH2GG9QlrXZ9Kt/Cb1HSRHsSgYLYlqnDGh1iG1SaPM9cmtItr +WEOf49fmnL94/8GWARwQLm4m/OHcedIviG1LoT5vTPn1cnHOBAJPRKvZsMRSCK5Y +uoKj9zF2E37fgtZGKYmTPo8rgF2edxczgZXbTLpjLQIW2inlSBzZqONzcjHM7L89 +jHgB4pxdUotoRrNR02L3 +=yDOq +-END PGP SIGNATURE- Added: release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.sha256 == --- release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.sha256 (added) +++ release/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.sha256 Sun Jun 30 08:00:18 2024 @@ -0,0 +1 @@ +d91a3ddfe353871d4c2656d3d0a05c828bc3ff36e9d49dbdbec13dcd98f05877 Added: release/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip == Binary file - no diff available. Propchange: release/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip -- svn:mime-type = application/octet-stream Added: release/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.asc == --- release/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.asc (added) +++ release/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.asc Sun Jun 30 08:00:18 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.77.00 + +iQIcBAABCgAGBQJmfQ9rAAoJEGplF2oPsc0Lee8P/1t002BB/C/t6xGBWMNQCzIB +EoPQ4fADRam8wr8TtrRnKLv4gacGrw9R5Jk82KN1ho60Dam/Xspu2yz7xoMs7xjd +uJUJ8b1CvzvuV6Wlssk99lT4WvMEQHzMQKi6imOtnqeXEw11XwOKLmQokIR169B7 +uXqzluT+ONaOZDq4pm7OsrjrieEEVXL/3Is5hBgDxogeFmt3a5zKCaHz5Gf8Thu9 +Lgv9dbNwYPEYrLw40zscAr05BoLq+pgL6DV1wUWT+iFn2XeaWt70FOqbm4iLWQq0 +u69wjuGUOH8nGKjASpobjpSJnV0KcsxBYAVENtzRmJmrC9JkBlsPHwCkB+Nwp9LQ ++M9svKdwtxEm4Ea9zh3n9721LNX6YjyvFOwUITrgtKrjmY613UttHRebZ0ngcRZO +SjN0WhvhYEzd/XCWjJ5wyV2oqBkgAmTcMGgPo2SR3yDFgj7xpJbaPIshX1w5/x8+ +8ucU57tezXnUDxvynIYg56UR0z+8LHxZe0tu7kpKUGsASG1MIwg9GDJcnq1fi3+l +l1CeT4nbxOW2pAfgGhR3CJ3gt30vBdt8XOm0Opnj8sbK06sEp3tOnJyc8gk6EzTR +v/44LwpK1S++nWFzVc3T8kxvKlHH+NXWcR7kZ09XG1zPofLIQwGzu7jJwbg2eZF8 +lx4IY/RCee7jRbDibVLz +=bJ1J +-END PGP SIGNATURE- Added: release/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.sha256 == --- release/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.sha256 (added) +++ release/groovy
(groovy) branch GROOVY_4_0_X updated: Bump version on GROOVY_4_0_X branch
This is an automated email from the ASF dual-hosted git repository.
paulk 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 0f442e6249 Bump version on GROOVY_4_0_X branch
0f442e6249 is described below
commit 0f442e62498f8c123f7053ce6caf63c046175586
Author: Paul King
AuthorDate: Sun Jun 30 17:57:14 2024 +1000
Bump version on GROOVY_4_0_X branch
---
gradle.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index b39eb6ab27..62ae0a8a9f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-groovyVersion=4.0.22-SNAPSHOT
+groovyVersion=4.0.23-SNAPSHOT
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3
only digits)
-groovyBundleVersion=4.0.22.SNAPSHOT
+groovyBundleVersion=4.0.23.SNAPSHOT
groovyTargetBytecodeVersion=1.8
targetJavaVersion=8
svn commit: r70051 - /release/groovy/4.0.21/
Author: paulk Date: Sun Jun 30 07:54:29 2024 New Revision: 70051 Log: Archive 4.0.21 Removed: release/groovy/4.0.21/
(groovy-website) branch asf-site updated: Release 3.0.22: update sitemap
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 4729fdc Release 3.0.22: update sitemap
4729fdc is described below
commit 4729fdc9f6be54b6ec4a351df28c40d6dabf04ec
Author: Paul King
AuthorDate: Sun Jun 30 17:01:40 2024 +1000
Release 3.0.22: update sitemap
---
site/src/site/sitemap-dev.groovy | 5 +
site/src/site/sitemap-user.groovy | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index 5aed213..60143e5 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -108,8 +108,13 @@ downloads {
a(href: 'versioning.html', 'version')
yield ' of Groovy designed for JDK8+ with a new more flexible
parser (aka Parrot parser).'
}
+version('3.0.22') {
+stable true
+//windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-3.0.22/'
+}
version('3.0.21') {
stable true
+archive true
windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-3.0.21/'
}
}
diff --git a/site/src/site/sitemap-user.groovy
b/site/src/site/sitemap-user.groovy
index 9647bc9..b4eecc8 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -90,7 +90,7 @@ documentation {
'2.4.0', '2.4.1', '2.4.2', '2.4.3', '2.4.4', '2.4.5', '2.4.6',
'2.4.7', '2.4.8', '2.4.9', '2.4.10', '2.4.11', '2.4.12', '2.4.13', '2.4.14',
'2.4.15', '2.4.16', '2.4.17', '2.4.18', '2.4.19', '2.4.20', '2.4.21',
'2.5.0', '2.5.1', '2.5.2', '2.5.3', '2.5.4', '2.5.5', '2.5.6',
'2.5.7', '2.5.8', '2.5.9', '2.5.10', '2.5.11', '2.5.12', '2.5.13', '2.5.14',
'2.5.15', '2.5.16', '2.5.17', '2.5.18', '2.5.19', '2.5.20', '2.5.21', '2.5.22',
'2.5.23',
'2.6.0-alpha-1', '2.6.0-alpha-2', '2.6.0-alpha-3', '2.6.0-alpha-4',
-'3.0.0', '3.0.1', '3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6',
'3.0.7', '3.0.8', '3.0.9', '3.0.10', '3.0.11', '3.0.12', '3.0.13', '3.0.14',
'3.0.15', '3.0.16', '3.0.17', '3.0.18', '3.0.19', '3.0.20', '3.0.21',
+'3.0.0', '3.0.1', '3.0.2', '3.0.3', '3.0.4', '3.0.5', '3.0.6',
'3.0.7', '3.0.8', '3.0.9', '3.0.10', '3.0.11', '3.0.12', '3.0.13', '3.0.14',
'3.0.15', '3.0.16', '3.0.17', '3.0.18', '3.0.19', '3.0.20', '3.0.21', '3.0.22',
'4.0.0-rc-1', '4.0.0-rc-2', '4.0.0', '4.0.1', '4.0.2', '4.0.3',
'4.0.4', '4.0.5', '4.0.6', '4.0.7', '4.0.8', '4.0.9', '4.0.10', '4.0.11',
'4.0.12', '4.0.13', '4.0.14', '4.0.15', '4.0.16', '4.0.17', '4.0.18', '4.0.19',
'4.0.20', '4.0.21',
'5.0.0-alpha-1', '5.0.0-alpha-2', '5.0.0-alpha-3',
'5.0.0-alpha-4', '5.0.0-alpha-5', '5.0.0-alpha-6', '5.0.0-alpha-7',
'5.0.0-alpha-8'
])
svn commit: r70050 - /dev/groovy/3.0.22/
Author: paulk Date: Sun Jun 30 07:01:39 2024 New Revision: 70050 Log: Deleting version 3.0.22 from the DEV staging area Removed: dev/groovy/3.0.22/
svn commit: r70049 - in /release/groovy/3.0.22: ./ distribution/ sources/
Author: paulk Date: Sun Jun 30 07:01:33 2024 New Revision: 70049 Log: Releasing version 3.0.22 Added: release/groovy/3.0.22/ release/groovy/3.0.22/distribution/ release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip (with props) release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.asc release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.sha256 release/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip (with props) release/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.asc release/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.sha256 release/groovy/3.0.22/distribution/apache-groovy-sdk-3.0.22.zip (with props) release/groovy/3.0.22/distribution/apache-groovy-sdk-3.0.22.zip.asc release/groovy/3.0.22/distribution/apache-groovy-sdk-3.0.22.zip.sha256 release/groovy/3.0.22/sources/ release/groovy/3.0.22/sources/apache-groovy-src-3.0.22.zip (with props) release/groovy/3.0.22/sources/apache-groovy-src-3.0.22.zip.asc release/groovy/3.0.22/sources/apache-groovy-src-3.0.22.zip.sha256 Added: release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip == Binary file - no diff available. Propchange: release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip -- svn:mime-type = application/octet-stream Added: release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.asc == --- release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.asc (added) +++ release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.asc Sun Jun 30 07:01:33 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.64 + +iQIcBAABCgAGBQJmfQldAAoJEGplF2oPsc0LxtYP/28+Zf+ykq9J/Xa4uAlJzJpf +wxWrSFPlR0nE4alfkqdkKS+cjlAwFaVSsEXoAU9F/qgBsW4cpH899YbZpNiRhBua +bBGqCCf/xIMjfUtufPwAuDMVRkf2Auvb1gXtHa8CsczvONxB0pYEYLkmGQWyibS7 +E3fxYl0QFRjn32xOW8N1R+CZuH9seSgAlsYk+nUhMAifQum4xcJeQENXNZfJKG8Q +GeyWch5ZU9yWy6q1s4virDhBpo/+IX/b0cy92yhaGu7i9I9Zw1dcj1O/Gvo7Ux9m +PzrR19M3rz2STIdWVqThdhfBeozkgmafcDQfw7ziDg6gzgus3blWdNxoLKlEGsTp +x3X9VUtoXU9Az/5+kqVPWjwPinaelVmjDnVhoGEAL/sOlbWUho29h1K1s/RrT8Wb +HrctQr2l6Q6wK6gbpFp/PfrbomadgE8k2T7AMnJqtr1DTKoS9wG+P/AprZIYjNWp +VmvxbhI03i0wsDqmiiUR5hGqVG0R/aOfs3lVZ/m6xUv3ZfEYzNji9fYHd/3GpUcE ++G+x/yuY4IRr7mkw7J3lZXpeFBme45XXb4xRx/pw7LvIGclo9ZZ09fVZbGF4vMC1 +hT190zR6Jui1EJ5HSFj+xktCa/0Egs1q+O4bpZapAuO5/VXeQNYI1L/CvbkW+dB2 +SJ7HH3z+MTtjxeYUuX8l +=AL+R +-END PGP SIGNATURE- Added: release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.sha256 == --- release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.sha256 (added) +++ release/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.sha256 Sun Jun 30 07:01:33 2024 @@ -0,0 +1 @@ +b17a217e2d26e29346ea34d3fc3310015701adc1d1e09b35d1ede78ce3da Added: release/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip == Binary file - no diff available. Propchange: release/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip -- svn:mime-type = application/octet-stream Added: release/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.asc == --- release/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.asc (added) +++ release/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.asc Sun Jun 30 07:01:33 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.64 + +iQIcBAABCgAGBQJmfQldAAoJEGplF2oPsc0LtQgP/3/mOtWkDT8wCMJmDZEiklFt +29prmGs78vJu0dTEgXd12fuI3WTmTxTkMeoCoxfPgIpLjmV7As5UHG1YoIywCL2l +Q/rB6CqVlDS5i/AxTv9apgav0qGEseo+/mAiwqQGnYUnfWKPgHjGfk36QyurMx2K +VAlhYQMadijVN7LuHZ14ORLPYU4t+s1wjWXtVJlFGR2Qe6atgZ056SfR1hYlPRVn +10mD2v42WXw5u/jv+dj3cTSPkZ4TIJ8QBKx3b80uOkN3AMnOLkesyBMEhMcZ0dSC +iQeVXtgtLk3odeLuvEKFlSF/fJLvrUH6wXpqUDh9xYd4S6BmnW2e8ORJo+2c1C8I +wtg53+c9w/boJJ6d6CKmdMVFt94CfX70EHWP34qahGu+D/46l3qpreZ44gi5cMds +zCfICWVD7tJ6Yu7Er+Rnh27bLR7QERkO28FJkvIi1CdVkLj32yw2WNpHFgQH32Ir +6k48geSxm1GuR9pR5h5pe2DxdLmriyzW2afud+awwVHSz0+WcB+xILfkx80O99cy +3laziaw7Yy4MOHj9s10cAqLwu6h6BQVcQpJjTXRUYPnGeHrnUAbF2luSDdsa1W6S +NLfpZc8ZZ75JU5uN2fGWRKI7SeaTJXRRMdA33s9xaer3g2ryl3yN3p+w2mxk+vs8 +Svc3r+k4IHX7WNANy/qY +=ZzhK +-END PGP SIGNATURE- Added: release/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.sha256 == --- release/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.sha256 (added) +++ release/groovy/3.0.22
(groovy) branch GROOVY_3_0_X updated: Bump version on GROOVY_3_0_X branch
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new 61fbb3ca70 Bump version on GROOVY_3_0_X branch
61fbb3ca70 is described below
commit 61fbb3ca70beb47c0cc483186c07ee54531be438
Author: Paul King
AuthorDate: Sun Jun 30 16:57:59 2024 +1000
Bump version on GROOVY_3_0_X branch
---
gradle.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index d0094b7cc0..cc50851543 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-groovyVersion = 3.0.22-SNAPSHOT
+groovyVersion = 3.0.23-SNAPSHOT
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3
only digits)
-groovyBundleVersion = 3.0.22.SNAPSHOT
+groovyBundleVersion = 3.0.23.SNAPSHOT
binaryCompatibilityBaseline = 3.0.5
gradle_version=6.9.4
svn commit: r70048 - /release/groovy/3.0.21/
Author: paulk Date: Sun Jun 30 06:55:33 2024 New Revision: 70048 Log: Archive 3.0.21 Removed: release/groovy/3.0.21/
(groovy) annotated tag GROOVY_5_0_0_ALPHA_9 created (now c126effd18)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to annotated tag GROOVY_5_0_0_ALPHA_9 in repository https://gitbox.apache.org/repos/asf/groovy.git at c126effd18 (tag) tagging 6dcf2666196a7613b813d0faad4b202d9375d359 (commit) by paulk on Thu Jun 27 18:36:37 2024 +1000 - Log - Release Groovy 5.0.0-alpha-9 --- This annotated tag includes the following new commits: new 6dcf266619 Release 5.0.0-alpha-9: update versions 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: Release 5.0.0-alpha-9: update versions
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to annotated tag GROOVY_5_0_0_ALPHA_9
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 6dcf2666196a7613b813d0faad4b202d9375d359
Author: Paul King
AuthorDate: Thu Jun 27 17:48:39 2024 +1000
Release 5.0.0-alpha-9: update versions
---
gradle.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index d7700cc928..1a7649be44 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-groovyVersion=5.0.0-SNAPSHOT
+groovyVersion=5.0.0-alpha-9
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3
only digits)
-groovyBundleVersion=5.0.0.SNAPSHOT
+groovyBundleVersion=5.0.0.alpha-9
groovyTargetBytecodeVersion=11
targetJavaVersion=11
svn commit: r70013 - in /dev/groovy/5.0.0-alpha-9: ./ distribution/ sources/
Author: paulk Date: Thu Jun 27 08:36:35 2024 New Revision: 70013 Log: New version master 5.0.0-alpha-9 added to staging area Added: dev/groovy/5.0.0-alpha-9/ dev/groovy/5.0.0-alpha-9/distribution/ dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip (with props) dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.asc dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.sha256 dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip (with props) dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip.asc dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip.sha256 dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-sdk-5.0.0-alpha-9.zip (with props) dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-sdk-5.0.0-alpha-9.zip.asc dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-sdk-5.0.0-alpha-9.zip.sha256 dev/groovy/5.0.0-alpha-9/sources/ dev/groovy/5.0.0-alpha-9/sources/apache-groovy-src-5.0.0-alpha-9.zip (with props) dev/groovy/5.0.0-alpha-9/sources/apache-groovy-src-5.0.0-alpha-9.zip.asc dev/groovy/5.0.0-alpha-9/sources/apache-groovy-src-5.0.0-alpha-9.zip.sha256 Added: dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip == Binary file - no diff available. Propchange: dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip -- svn:mime-type = application/octet-stream Added: dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.asc == --- dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.asc (added) +++ dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.asc Thu Jun 27 08:36:35 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.77.00 + +iQIcBAABCgAGBQJmfR8uAAoJEGplF2oPsc0LLPcP/3kFo1M8gbVwg9G0ChgNynLX ++lx0oDAYpMd4MgTbaASDZlJzole2BD+zL8Wqr26JTfHs5mwWb/N4FWeCEtv7i3Lo +YIBcISgWFEATo6OItcflRLLGzN3Ofj+uDq8CjTX4TwH2YYRNJoZK3tuFh71Wa8QN +qdt3UVyEKc6bgMrE76ObHpHUm+N0j0NaaztDmFBjfFNpIRNYKVTbkiuGg7Ja0PRt +eMe900cGn11DCd4dyXIojsWtT8ONAzbtsqiNi/pN3Rx5EYtR/OvYK+4uCW7Mjhju +CQm7wYDv5yr9eDEsclfSHRe+b/fMUD7MrLBFqeuDRxNROt+iFOyTNBL/hObDryAn +GcK20fmq+KWuOihEn7sJConlN00p79/eJ3zlGGyocTz7nSaoebD4yJk0ZkEJvA0B +9z4sh1ov+A4KGUqUw7hSANr6am4s8tcWZmeyOQVzuwi41JxwwaDgl5H3c7n5TTsD +HJAd2DMAtwTm6f2Qu1NmwJuTGtxo9h9aJhPb0ooRgJ8/Fho0NcnKWfWoK+0/BPGm +HV47VMLIba/LfzUJqxvfml03kXI8QHCO2zLx5aDP+MgkR9j1jgltDf0fUhyanFwz +POigux+7Z5igSEQMHm9LEU6ScG3qriU6gYeijkCxBmLYPdLCZjPXTq7Uiz8l7KgC +bhntBDWoDPr2Nn6pY2/0 +=yQid +-END PGP SIGNATURE- Added: dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.sha256 == --- dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.sha256 (added) +++ dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-binary-5.0.0-alpha-9.zip.sha256 Thu Jun 27 08:36:35 2024 @@ -0,0 +1 @@ +cda0d45e4a42b75c75af796c359767b3f18f3806f1bcd536a3625d8df8593986 Added: dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip == Binary file - no diff available. Propchange: dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip -- svn:mime-type = application/octet-stream Added: dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip.asc == --- dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip.asc (added) +++ dev/groovy/5.0.0-alpha-9/distribution/apache-groovy-docs-5.0.0-alpha-9.zip.asc Thu Jun 27 08:36:35 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.77.00 + +iQIcBAABCgAGBQJmfRsrAAoJEGplF2oPsc0LXqUP/A2zF6YPOTFQSipb2vGz0819 +M73Gtj8gEMMOnHXt1rI/aF2zzXGNEzGeBe38Jrfd1dsY1gvYuoHss98Kptc9cZ4B +6qSz4NfkOU5hWLOOJiXrPqjbUyANSWu4dX7zv2hALczmKRfIo6Qa55aoQ0buDmT8 +17nECjn0sXK3rUr75zVbzzBRIlLyNWCPzXpQoTBBeodrOJMLiPOsThCEUZ2kWPhK +NML1pwBiHKCCFnq9x+1Q3I0Hy8/hDefdVticm5BfO5KO6F2d4q6mv53lzCCYAoTV +E4uVxNNz3UavH+qXEJOaE0sokrJNYMSQY+45zTXrdwldz7ZJLco6GqUjTCYMeT2P +8CGTggnNHR1iQtWvZORM39GjrTQ4mS1nBNb7Eg9+u9fXD7TOxzDj1bCK1TOCrOuO +06LnAhGZsfa3PBpBxhvfk/WwspAhRT0kuQlBu5RiktmyQXQy+aBM31FTMZlYt/sK +bCjixBY4lx7vB2U+B+pt1GvhlBpblRxQYo7/iSsV6aONXVCq918ZwvbFCqEnsqGi +Dco8aeKWya+0eDKmXR6EE2TlXu/8uB4GQu3kNpBAFRUHvyPnH/asKmXH/4/Ku9Z5 +dqKW+v0TRb8LLnw702g+tHBAXEebpqtFI+75lf9iXZB9b1vU9+NZIDnq+mFmWTnz
(groovy) 01/01: Release 4.0.22: update versions
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to annotated tag GROOVY_4_0_22
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 393f1174dcab86c82281611e32d16d9e247612b9
Author: Paul King
AuthorDate: Thu Jun 27 16:58:42 2024 +1000
Release 4.0.22: update versions
---
gradle.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index b39eb6ab27..a9990934a3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-groovyVersion=4.0.22-SNAPSHOT
+groovyVersion=4.0.22
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3
only digits)
-groovyBundleVersion=4.0.22.SNAPSHOT
+groovyBundleVersion=4.0.22
groovyTargetBytecodeVersion=1.8
targetJavaVersion=8
(groovy) annotated tag GROOVY_4_0_22 created (now d557728557)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to annotated tag GROOVY_4_0_22 in repository https://gitbox.apache.org/repos/asf/groovy.git at d557728557 (tag) tagging 393f1174dcab86c82281611e32d16d9e247612b9 (commit) by paulk on Thu Jun 27 17:43:41 2024 +1000 - Log - Release Groovy 4.0.22 --- This annotated tag includes the following new commits: new 393f1174dc Release 4.0.22: update versions 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.
svn commit: r70009 - in /dev/groovy/4.0.22: ./ distribution/ sources/
Author: paulk Date: Thu Jun 27 07:43:39 2024 New Revision: 70009 Log: New version GROOVY_4_0_X 4.0.22 added to staging area Added: dev/groovy/4.0.22/ dev/groovy/4.0.22/distribution/ dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip (with props) dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.asc dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.sha256 dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip (with props) dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.asc dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.sha256 dev/groovy/4.0.22/distribution/apache-groovy-sdk-4.0.22.zip (with props) dev/groovy/4.0.22/distribution/apache-groovy-sdk-4.0.22.zip.asc dev/groovy/4.0.22/distribution/apache-groovy-sdk-4.0.22.zip.sha256 dev/groovy/4.0.22/sources/ dev/groovy/4.0.22/sources/apache-groovy-src-4.0.22.zip (with props) dev/groovy/4.0.22/sources/apache-groovy-src-4.0.22.zip.asc dev/groovy/4.0.22/sources/apache-groovy-src-4.0.22.zip.sha256 Added: dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip == Binary file - no diff available. Propchange: dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip -- svn:mime-type = application/octet-stream Added: dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.asc == --- dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.asc (added) +++ dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.asc Thu Jun 27 07:43:39 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.77.00 + +iQIcBAABCgAGBQJmfRMqAAoJEGplF2oPsc0LP1oP/0iaXRl4LEbzBtFT76iRqw2Y +a4L1j/QJ7d1Mrsvh2UNk7gyM6GdGifOtZyO2LjLj2VgfMXdCHeXwq8W1Afhw1t75 +IXhXau39sxgKD+5/MO/ruvKpV3D0NMc9EujWXqtis3fhY5PT2feTe72Cwq+V7sPO +75Hz7b0HVBIdsxTC81MwMK5uX9txkgsrcE9+4g5Z9h9Nqw7UZEHaDOEVyvp1mRhT +sGtGp2D2m/XREvHBrlo7grXx8dNTHh+ke16IRWd9+q4tqwVTkUupe6JE7OCrWyi9 +UO1JaS6vQHpihK/W/q30Ll15IZiOAULVwo1kM2FCcA74v+tFJHnyOnxeETMgo/T+ +MKjpT7Qn7Co2z12WJTa4pulBdtzFDD1lrAxClVEp5cPi2uLWRahPXNlRLJzSbyh+ +VyNnojw4d3YW65y6GdlDDohXiA0NSwB7K4dNNxga6MW7SLGpm7uzBL/4VD6uQL1b +2ECyxdwtdNVPJkkQH2GG9QlrXZ9Kt/Cb1HSRHsSgYLYlqnDGh1iG1SaPM9cmtItr +WEOf49fmnL94/8GWARwQLm4m/OHcedIviG1LoT5vTPn1cnHOBAJPRKvZsMRSCK5Y +uoKj9zF2E37fgtZGKYmTPo8rgF2edxczgZXbTLpjLQIW2inlSBzZqONzcjHM7L89 +jHgB4pxdUotoRrNR02L3 +=yDOq +-END PGP SIGNATURE- Added: dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.sha256 == --- dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.sha256 (added) +++ dev/groovy/4.0.22/distribution/apache-groovy-binary-4.0.22.zip.sha256 Thu Jun 27 07:43:39 2024 @@ -0,0 +1 @@ +d91a3ddfe353871d4c2656d3d0a05c828bc3ff36e9d49dbdbec13dcd98f05877 Added: dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip == Binary file - no diff available. Propchange: dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip -- svn:mime-type = application/octet-stream Added: dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.asc == --- dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.asc (added) +++ dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.asc Thu Jun 27 07:43:39 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.77.00 + +iQIcBAABCgAGBQJmfQ9rAAoJEGplF2oPsc0Lee8P/1t002BB/C/t6xGBWMNQCzIB +EoPQ4fADRam8wr8TtrRnKLv4gacGrw9R5Jk82KN1ho60Dam/Xspu2yz7xoMs7xjd +uJUJ8b1CvzvuV6Wlssk99lT4WvMEQHzMQKi6imOtnqeXEw11XwOKLmQokIR169B7 +uXqzluT+ONaOZDq4pm7OsrjrieEEVXL/3Is5hBgDxogeFmt3a5zKCaHz5Gf8Thu9 +Lgv9dbNwYPEYrLw40zscAr05BoLq+pgL6DV1wUWT+iFn2XeaWt70FOqbm4iLWQq0 +u69wjuGUOH8nGKjASpobjpSJnV0KcsxBYAVENtzRmJmrC9JkBlsPHwCkB+Nwp9LQ ++M9svKdwtxEm4Ea9zh3n9721LNX6YjyvFOwUITrgtKrjmY613UttHRebZ0ngcRZO +SjN0WhvhYEzd/XCWjJ5wyV2oqBkgAmTcMGgPo2SR3yDFgj7xpJbaPIshX1w5/x8+ +8ucU57tezXnUDxvynIYg56UR0z+8LHxZe0tu7kpKUGsASG1MIwg9GDJcnq1fi3+l +l1CeT4nbxOW2pAfgGhR3CJ3gt30vBdt8XOm0Opnj8sbK06sEp3tOnJyc8gk6EzTR +v/44LwpK1S++nWFzVc3T8kxvKlHH+NXWcR7kZ09XG1zPofLIQwGzu7jJwbg2eZF8 +lx4IY/RCee7jRbDibVLz +=bJ1J +-END PGP SIGNATURE- Added: dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.sha256 == --- dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.sha256 (added) +++ dev/groovy/4.0.22/distribution/apache-groovy-docs-4.0.22.zip.sha256 Thu Jun 27 07:43:39 2024 @@ -0,0 +1
(groovy) annotated tag GROOVY_3_0_22 created (now 2192bebb7f)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to annotated tag GROOVY_3_0_22 in repository https://gitbox.apache.org/repos/asf/groovy.git at 2192bebb7f (tag) tagging 20fc13abeafc3a5ccdeacf6dc10cd4e70a4f50f6 (commit) by paulk on Thu Jun 27 16:54:55 2024 +1000 - Log - Release Groovy 3.0.22 --- This annotated tag includes the following new commits: new 20fc13abea Release 3.0.22: update versions 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: Release 3.0.22: update versions
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to annotated tag GROOVY_3_0_22
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 20fc13abeafc3a5ccdeacf6dc10cd4e70a4f50f6
Author: Paul King
AuthorDate: Thu Jun 27 16:32:49 2024 +1000
Release 3.0.22: update versions
---
gradle.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index d0094b7cc0..158aaf4887 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-groovyVersion = 3.0.22-SNAPSHOT
+groovyVersion = 3.0.22
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3
only digits)
-groovyBundleVersion = 3.0.22.SNAPSHOT
+groovyBundleVersion = 3.0.22
binaryCompatibilityBaseline = 3.0.5
gradle_version=6.9.4
svn commit: r70003 - in /dev/groovy/3.0.22: ./ distribution/ sources/
Author: paulk Date: Thu Jun 27 06:54:51 2024 New Revision: 70003 Log: New version GROOVY_3_0_X 3.0.22 added to staging area Added: dev/groovy/3.0.22/ dev/groovy/3.0.22/distribution/ dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip (with props) dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.asc dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.sha256 dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip (with props) dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.asc dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.sha256 dev/groovy/3.0.22/distribution/apache-groovy-sdk-3.0.22.zip (with props) dev/groovy/3.0.22/distribution/apache-groovy-sdk-3.0.22.zip.asc dev/groovy/3.0.22/distribution/apache-groovy-sdk-3.0.22.zip.sha256 dev/groovy/3.0.22/sources/ dev/groovy/3.0.22/sources/apache-groovy-src-3.0.22.zip (with props) dev/groovy/3.0.22/sources/apache-groovy-src-3.0.22.zip.asc dev/groovy/3.0.22/sources/apache-groovy-src-3.0.22.zip.sha256 Added: dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip == Binary file - no diff available. Propchange: dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip -- svn:mime-type = application/octet-stream Added: dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.asc == --- dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.asc (added) +++ dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.asc Thu Jun 27 06:54:51 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.64 + +iQIcBAABCgAGBQJmfQldAAoJEGplF2oPsc0LxtYP/28+Zf+ykq9J/Xa4uAlJzJpf +wxWrSFPlR0nE4alfkqdkKS+cjlAwFaVSsEXoAU9F/qgBsW4cpH899YbZpNiRhBua +bBGqCCf/xIMjfUtufPwAuDMVRkf2Auvb1gXtHa8CsczvONxB0pYEYLkmGQWyibS7 +E3fxYl0QFRjn32xOW8N1R+CZuH9seSgAlsYk+nUhMAifQum4xcJeQENXNZfJKG8Q +GeyWch5ZU9yWy6q1s4virDhBpo/+IX/b0cy92yhaGu7i9I9Zw1dcj1O/Gvo7Ux9m +PzrR19M3rz2STIdWVqThdhfBeozkgmafcDQfw7ziDg6gzgus3blWdNxoLKlEGsTp +x3X9VUtoXU9Az/5+kqVPWjwPinaelVmjDnVhoGEAL/sOlbWUho29h1K1s/RrT8Wb +HrctQr2l6Q6wK6gbpFp/PfrbomadgE8k2T7AMnJqtr1DTKoS9wG+P/AprZIYjNWp +VmvxbhI03i0wsDqmiiUR5hGqVG0R/aOfs3lVZ/m6xUv3ZfEYzNji9fYHd/3GpUcE ++G+x/yuY4IRr7mkw7J3lZXpeFBme45XXb4xRx/pw7LvIGclo9ZZ09fVZbGF4vMC1 +hT190zR6Jui1EJ5HSFj+xktCa/0Egs1q+O4bpZapAuO5/VXeQNYI1L/CvbkW+dB2 +SJ7HH3z+MTtjxeYUuX8l +=AL+R +-END PGP SIGNATURE- Added: dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.sha256 == --- dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.sha256 (added) +++ dev/groovy/3.0.22/distribution/apache-groovy-binary-3.0.22.zip.sha256 Thu Jun 27 06:54:51 2024 @@ -0,0 +1 @@ +b17a217e2d26e29346ea34d3fc3310015701adc1d1e09b35d1ede78ce3da Added: dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip == Binary file - no diff available. Propchange: dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip -- svn:mime-type = application/octet-stream Added: dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.asc == --- dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.asc (added) +++ dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.asc Thu Jun 27 06:54:51 2024 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.64 + +iQIcBAABCgAGBQJmfQldAAoJEGplF2oPsc0LtQgP/3/mOtWkDT8wCMJmDZEiklFt +29prmGs78vJu0dTEgXd12fuI3WTmTxTkMeoCoxfPgIpLjmV7As5UHG1YoIywCL2l +Q/rB6CqVlDS5i/AxTv9apgav0qGEseo+/mAiwqQGnYUnfWKPgHjGfk36QyurMx2K +VAlhYQMadijVN7LuHZ14ORLPYU4t+s1wjWXtVJlFGR2Qe6atgZ056SfR1hYlPRVn +10mD2v42WXw5u/jv+dj3cTSPkZ4TIJ8QBKx3b80uOkN3AMnOLkesyBMEhMcZ0dSC +iQeVXtgtLk3odeLuvEKFlSF/fJLvrUH6wXpqUDh9xYd4S6BmnW2e8ORJo+2c1C8I +wtg53+c9w/boJJ6d6CKmdMVFt94CfX70EHWP34qahGu+D/46l3qpreZ44gi5cMds +zCfICWVD7tJ6Yu7Er+Rnh27bLR7QERkO28FJkvIi1CdVkLj32yw2WNpHFgQH32Ir +6k48geSxm1GuR9pR5h5pe2DxdLmriyzW2afud+awwVHSz0+WcB+xILfkx80O99cy +3laziaw7Yy4MOHj9s10cAqLwu6h6BQVcQpJjTXRUYPnGeHrnUAbF2luSDdsa1W6S +NLfpZc8ZZ75JU5uN2fGWRKI7SeaTJXRRMdA33s9xaer3g2ryl3yN3p+w2mxk+vs8 +Svc3r+k4IHX7WNANy/qY +=ZzhK +-END PGP SIGNATURE- Added: dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.sha256 == --- dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.sha256 (added) +++ dev/groovy/3.0.22/distribution/apache-groovy-docs-3.0.22.zip.sha256 Thu Jun 27 06:54:51 2024 @@ -0,0 +1
(groovy) branch GROOVY_4_0_X updated: Update JsonTokenType.java
This is an automated email from the ASF dual-hosted git repository.
paulk 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 601b16d623 Update JsonTokenType.java
601b16d623 is described below
commit 601b16d6230a07ad6f298fe57cfa03a1e89c4a44
Author: Florian Mt
AuthorDate: Wed May 29 20:24:33 2024 +0200
Update JsonTokenType.java
Typo on "openning" -> "opening"
---
subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
b/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
index b00b5c9cfc..f1734ba1a1 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
@@ -31,9 +31,9 @@ import java.util.regex.Pattern;
* @since 1.8.0
*/
public enum JsonTokenType {
-OPEN_CURLY ( "an openning curly brace '{'","{" ),
+OPEN_CURLY ( "an opening curly brace '{'","{" ),
CLOSE_CURLY ( "a closing curly brace '}'", "}" ),
-OPEN_BRACKET( "an openning square bracket '['", "[" ),
+OPEN_BRACKET( "an opening square bracket '['", "[" ),
CLOSE_BRACKET ( "a closing square bracket ']'", "]" ),
COLON ( "a colon ':'",":" ),
COMMA ( "a comma ','","," ),
(groovy) branch master updated: Update JsonTokenType.java
This is an automated email from the ASF dual-hosted git repository.
paulk 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 eb8448f0f7 Update JsonTokenType.java
eb8448f0f7 is described below
commit eb8448f0f74b5e404aabe1428d99151f75954018
Author: Florian Mt
AuthorDate: Wed May 29 20:24:33 2024 +0200
Update JsonTokenType.java
Typo on "openning" -> "opening"
---
subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
b/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
index b00b5c9cfc..f1734ba1a1 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonTokenType.java
@@ -31,9 +31,9 @@ import java.util.regex.Pattern;
* @since 1.8.0
*/
public enum JsonTokenType {
-OPEN_CURLY ( "an openning curly brace '{'","{" ),
+OPEN_CURLY ( "an opening curly brace '{'","{" ),
CLOSE_CURLY ( "a closing curly brace '}'", "}" ),
-OPEN_BRACKET( "an openning square bracket '['", "[" ),
+OPEN_BRACKET( "an opening square bracket '['", "[" ),
CLOSE_BRACKET ( "a closing square bracket ']'", "]" ),
COLON ( "a colon ':'",":" ),
COMMA ( "a comma ','","," ),
(groovy-website) branch asf-site updated: tweak wording since Pekko has graduated!
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 8ff741a tweak wording since Pekko has graduated! 8ff741a is described below commit 8ff741af77b7622fbae82dc220550ecf492dc83b Author: Paul King AuthorDate: Tue Jun 25 12:09:55 2024 +1000 tweak wording since Pekko has graduated! --- site/src/site/blog/groovy-pekko-gpars.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/site/src/site/blog/groovy-pekko-gpars.adoc b/site/src/site/blog/groovy-pekko-gpars.adoc index fd234d8..4e35ba1 100644 --- a/site/src/site/blog/groovy-pekko-gpars.adoc +++ b/site/src/site/blog/groovy-pekko-gpars.adoc @@ -6,8 +6,7 @@ Paul King :description: This post looks at using Apache Pekko Actors and GPars Actors with Groovy. image:https://pekko.apache.org/assets/images/pekko_logo.png[pekko logo,100,float="right"] -https://pekko.apache.org/[Apache Pekko] is a project undergoing https://incubator.apache.org/[incubation] at the Apache Software Foundation. -It is an Apache licensed fork of the Akka project (based on Akka version 2.6.x) and provides a +https://pekko.apache.org/[Apache Pekko] is an Apache-licensed fork of the Akka project (based on Akka version 2.6.x) and provides a framework for building applications that are concurrent, distributed, resilient and elastic. Pekko provides high-level abstractions for concurrency based on actors, as well as additional libraries for persistence, streams, HTTP, and more.
(groovy-website) branch asf-site updated: update dependencies
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 1761b59 update dependencies
1761b59 is described below
commit 1761b594e7274319b5de64c625a2a34cba6c1248
Author: Paul King
AuthorDate: Tue Jun 25 12:01:13 2024 +1000
update dependencies
---
site/src/site/blog/groovy-pekko-gpars.adoc | 37 +++---
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/site/src/site/blog/groovy-pekko-gpars.adoc
b/site/src/site/blog/groovy-pekko-gpars.adoc
index 67d2862..fd234d8 100644
--- a/site/src/site/blog/groovy-pekko-gpars.adoc
+++ b/site/src/site/blog/groovy-pekko-gpars.adoc
@@ -1,7 +1,7 @@
= Using Apache Pekko actors and GPars actors with Groovy
Paul King
:revdate: 2023-07-17T23:24:56+00:00
-:updated: 2023-07-26T15:02:00+00:00
+:updated: 2024-06-25T11:59:00+00:00
:keywords: concurrency, groovy, actors, pekko, gpars
:description: This post looks at using Apache Pekko Actors and GPars Actors
with Groovy.
@@ -46,7 +46,7 @@ to tell it the maximum number of times to echo the message
before stopping.
== A Pekko implementation in Groovy
-This example uses Groovy 4.0.13 and Pekko 1.0.1.
+This example uses Groovy 4.0.21 and Pekko 1.0.3.
It was tested with JDK 11 and 17.
The Pekko documentation gives Java and Scala implementations.
@@ -59,7 +59,7 @@ Here is the code for `HelloWorld`:
[source,groovy]
-class HelloWorld extends AbstractBehavior {
+class HelloWorld extends AbstractBehavior {
static record Greet(String whom, ActorRef replyTo) {}
static record Greeted(String whom, ActorRef from) {}
@@ -181,25 +181,25 @@ system.tell(new HelloWorldMain.SayHello('Pekko'))
The log output from running the script will look similar to this:
-[hello-pekko.actor.default-dispatcher-3] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Hello World!
-[hello-pekko.actor.default-dispatcher-3] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Hello Pekko!
-[hello-pekko.actor.default-dispatcher-5] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Greeting 1 for World
-[hello-pekko.actor.default-dispatcher-3] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Greeting 1 for Pekko
-[hello-pekko.actor.default-dispatcher-3] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Hello World!
-[hello-pekko.actor.default-dispatcher-3] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Hello Pekko!
-[hello-pekko.actor.default-dispatcher-5] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Greeting 2 for World
-[hello-pekko.actor.default-dispatcher-3] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Hello World!
-[hello-pekko.actor.default-dispatcher-3] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Greeting 3 for World
-[hello-pekko.actor.default-dispatcher-6] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Greeting 2 for Pekko
-[hello-pekko.actor.default-dispatcher-6] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Hello Pekko!
-[hello-pekko.actor.default-dispatcher-6] INFO
org.codehaus.groovy.vmplugin.v8.IndyInterface - Greeting 3 for Pekko
+[hello-pekko.actor.default-dispatcher-6] INFO pekko.HelloWorld - Hello World!
+[hello-pekko.actor.default-dispatcher-6] INFO pekko.HelloWorld - Hello Pekko!
+[hello-pekko.actor.default-dispatcher-3] INFO pekko.HelloWorldBot - Greeting 1
for Pekko
+[hello-pekko.actor.default-dispatcher-5] INFO pekko.HelloWorldBot - Greeting 1
for World
+[hello-pekko.actor.default-dispatcher-6] INFO pekko.HelloWorld - Hello Pekko!
+[hello-pekko.actor.default-dispatcher-6] INFO pekko.HelloWorld - Hello World!
+[hello-pekko.actor.default-dispatcher-5] INFO pekko.HelloWorldBot - Greeting 2
for Pekko
+[hello-pekko.actor.default-dispatcher-3] INFO pekko.HelloWorldBot - Greeting 2
for World
+[hello-pekko.actor.default-dispatcher-5] INFO pekko.HelloWorld - Hello Pekko!
+[hello-pekko.actor.default-dispatcher-5] INFO pekko.HelloWorld - Hello World!
+[hello-pekko.actor.default-dispatcher-3] INFO pekko.HelloWorldBot - Greeting 3
for Pekko
+[hello-pekko.actor.default-dispatcher-5] INFO pekko.HelloWorldBot - Greeting 3
for World
[hello-pekko.actor.default-dispatcher-6] INFO
org.apache.pekko.actor.CoordinatedShutdown - Running CoordinatedShutdown with
reason [ActorSystemTerminateReason]
== A GPars implementation in Groovy
-This example uses Groovy 4.0.13 and GPars 1.2.1.
-It was tested with JDK 8, 11 and 17.
+This example uses Groovy 4.0.21 and GPars 1.2.1.
+It was tested with JDK 8, 11, 17 and 21.
We'll follow the same conventions for strongly typed messages in our GPars
example.
Here are our three message containers:
@@ -348,5 +348,6 @@ https://github.com/paulk-asert/groovy-pekko-gpars
*17/Jul/2023*: Initial version. +
*18/Jul/2023*: Add discussion about type-safe messages
(groovy) branch GROOVY_4_0_X updated (e10424d4c9 -> 1e367b86bb)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git from e10424d4c9 GROOVY-11420: Bump jqwik to 1.8.5 (test dependency) new 035ff29c53 GROOVY-11426: Bump javaparser to 3.26.1 new 1e367b86bb GROOVY-11424: Bump spotbugs to 4.8.6 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: versions.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(groovy) 02/02: GROOVY-11424: Bump spotbugs to 4.8.6
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git commit 1e367b86bb9f7c7fa13650de6b237fc5719f4b09 Author: Paul King AuthorDate: Tue Jun 25 05:47:35 2024 +1000 GROOVY-11424: Bump spotbugs to 4.8.6 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 18f9b77e0e..425e554bb8 100644 --- a/versions.properties +++ b/versions.properties @@ -50,7 +50,7 @@ slf4j=2.0.13 xmlunit=1.6 xstream=1.4.20 spock=2.3-groovy-4.0 -spotbugs=4.8.3 +spotbugs=4.8.6 checkstyle=9.3 jcipAnnotations=1.0 treelayout=1.0.3
(groovy) 01/02: GROOVY-11426: Bump javaparser to 3.26.1
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git commit 035ff29c535ea113ac96b465f346e17ca34e4d08 Author: Paul King AuthorDate: Tue Jun 25 05:46:34 2024 +1000 GROOVY-11426: Bump javaparser to 3.26.1 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 5b6817caac..18f9b77e0e 100644 --- a/versions.properties +++ b/versions.properties @@ -32,7 +32,7 @@ jacksonDatabind=2.17.1 jackson=2.17.1 # later jarjar versions sometimes leave empty META-INF/services files jarjar=1.8.0 -javaParser=3.25.10 +javaParser=3.26.1 jline=2.14.6 jmh=1.37 jmock=1.2.0
(groovy) 02/05: GROOVY-11419: Bump slf4j to 2.0.13 (test and standard install dependency)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git commit 298e6c316b9c005a1cf487e9654f9331a45280f2 Author: Paul King AuthorDate: Mon Jun 24 12:17:45 2024 +1000 GROOVY-11419: Bump slf4j to 2.0.13 (test and standard install dependency) --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 3483f0ed14..5b6817caac 100644 --- a/versions.properties +++ b/versions.properties @@ -46,7 +46,7 @@ log4j2=2.23.1 openbeans=1.0.2 picocli=4.7.6 qdox=1.12.1 -slf4j=2.0.12 +slf4j=2.0.13 xmlunit=1.6 xstream=1.4.20 spock=2.3-groovy-4.0
(groovy) 04/05: GROOVY-11425: Bump gson to 2.11.0 (test dependency)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 6e44ccd7b6f7273e4ea85fb9f3cdd4a3c9162df2
Author: Paul King
AuthorDate: Mon Jun 24 12:48:39 2024 +1000
GROOVY-11425: Bump gson to 2.11.0 (test dependency)
---
subprojects/groovy-json/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-json/build.gradle
b/subprojects/groovy-json/build.gradle
index eb7d6b2007..0aec1bb9f7 100644
--- a/subprojects/groovy-json/build.gradle
+++ b/subprojects/groovy-json/build.gradle
@@ -34,7 +34,7 @@ dependencies {
}
}
testRuntimeOnly projects.groovyAnt // for JavadocAssertionTests
-testRuntimeOnly 'com.google.code.gson:gson:2.10.1' // json-unit requires
gson, jackson1 or jackson2
+testRuntimeOnly 'com.google.code.gson:gson:2.11.0' // json-unit requires
gson, jackson1 or jackson2
}
plugins.withId('eclipse') {
(groovy) 03/05: Bump commons-net to 3.11.1 (performance test dependency)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 81bfa8baaa30c3bbd40e8ae70ef1288f6c1c8b83
Author: Paul King
AuthorDate: Mon Jun 24 12:19:39 2024 +1000
Bump commons-net to 3.11.1 (performance test dependency)
---
.../groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
index 21cc062725..1fa4ddd4de 100644
---
a/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
+++
b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
@@ -97,7 +97,7 @@ class PerformanceTestsExtension {
conf.dependencies.add(dependencies.create(v == 'current' ?
dependencies.project([path: ':groovy-templates']) : (v.startsWith('4') ?
"org.apache.groovy:groovy-templates:$v" :
"org.codehaus.groovy:groovy-templates:$v")))
[
'org.cyberneko:html:1.9.8',
-'commons-net:commons-net:3.10.0',
+'commons-net:commons-net:3.11.1',
'net.sourceforge.htmlunit:htmlunit:2.70.0',
'com.sleepycat:je:18.3.12',
'commons-httpclient:commons-httpclient:3.1',
(groovy) branch GROOVY_4_0_X updated (8b5971fc31 -> e10424d4c9)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git from 8b5971fc31 GROOVY-11417: Bump antlr to 4.13.1.5 new b074761a4b GROOVY-11418: Bump hsqldb to 2.7.3 (test dependency) new 298e6c316b GROOVY-11419: Bump slf4j to 2.0.13 (test and standard install dependency) new 81bfa8baaa Bump commons-net to 3.11.1 (performance test dependency) new 6e44ccd7b6 GROOVY-11425: Bump gson to 2.11.0 (test dependency) new e10424d4c9 GROOVY-11420: Bump jqwik to 1.8.5 (test dependency) The 5 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: .../org/apache/groovy/gradle/PerformanceTestsExtension.groovy | 2 +- subprojects/groovy-json/build.gradle| 2 +- subprojects/groovy-sql/build.gradle | 2 +- subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 6 +- subprojects/groovy-test-junit5/build.gradle | 4 ++-- versions.properties | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-)
(groovy) 01/05: GROOVY-11418: Bump hsqldb to 2.7.3 (test dependency)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit b074761a4bf07121ce2c6e811f84afd4f938fa7e
Author: Paul King
AuthorDate: Mon Jun 24 11:10:27 2024 +1000
GROOVY-11418: Bump hsqldb to 2.7.3 (test dependency)
---
subprojects/groovy-sql/build.gradle | 2 +-
subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 6 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/subprojects/groovy-sql/build.gradle
b/subprojects/groovy-sql/build.gradle
index 860b0f89f1..3b638f0787 100644
--- a/subprojects/groovy-sql/build.gradle
+++ b/subprojects/groovy-sql/build.gradle
@@ -22,7 +22,7 @@ plugins {
dependencies {
api rootProject // Sql uses Closure...
-testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.7.2',
classifier: 'jdk8'
+testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.7.3',
classifier: 'jdk8'
// uncomment to test with other databases (requires changes elsewhere too)
//testImplementation 'com.h2database:h2:1.3.164'
//testImplementation 'hsqldb:hsqldb:1.8.0.10'
diff --git a/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
b/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
index 4f28d32697..6eb99a87e6 100644
--- a/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
+++ b/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
@@ -72,7 +72,11 @@ class SqlTest extends GroovyTestCase {
/*
commented out as already on classpath
// tag::sql_connecting_grab[]
+<<<<<<< HEAD
@Grab('org.hsqldb:hsqldb:2.7.2:jdk8')
+===
+@Grab('org.hsqldb:hsqldb:2.7.3')
+>>>>>>> 35be169b6c (GROOVY-11418: Bump hsqldb to 2.7.3 (test dependency))
@GrabConfig(systemClassLoader=true)
// create, use, and then close sql instance ...
// end::sql_connecting_grab[]
@@ -335,7 +339,7 @@ class SqlTest extends GroovyTestCase {
// tag::sql_basic_table_metadata[]
def md = sql.connection.metaData
assert md.driverName == 'HSQL Database Engine Driver'
- assert md.databaseProductVersion == '2.7.2'
+ assert md.databaseProductVersion == '2.7.3'
assert ['JDBCMajorVersion', 'JDBCMinorVersion'].collect{ md[it]
} == [4, 2]
assert md.stringFunctions.tokenize(',').contains('CONCAT')
def rs = md.getTables(null, null, 'AUTH%', null)
(groovy) 05/05: GROOVY-11420: Bump jqwik to 1.8.5 (test dependency)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit e10424d4c988351c8d78ad6d659eb58c183426ed
Author: Paul King
AuthorDate: Mon Jun 24 12:21:41 2024 +1000
GROOVY-11420: Bump jqwik to 1.8.5 (test dependency)
---
subprojects/groovy-test-junit5/build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/subprojects/groovy-test-junit5/build.gradle
b/subprojects/groovy-test-junit5/build.gradle
index 9b350d12d8..09e1f021a8 100644
--- a/subprojects/groovy-test-junit5/build.gradle
+++ b/subprojects/groovy-test-junit5/build.gradle
@@ -33,10 +33,10 @@ dependencies {
exclude(group: 'org.apiguardian', module: 'apiguardian-api')
}
testImplementation
"org.junit.jupiter:junit-jupiter-params:${versions.junit5}"
-testImplementation 'net.jqwik:jqwik-api:1.8.4'
+testImplementation 'net.jqwik:jqwik-api:1.8.5'
testRuntimeOnly
"org.junit.platform:junit-platform-engine:${versions.junit5Platform}"
testRuntimeOnly
"org.junit.platform:junit-platform-runner:${versions.junit5Platform}"
-testRuntimeOnly 'net.jqwik:jqwik-engine:1.8.4'
+testRuntimeOnly 'net.jqwik:jqwik-engine:1.8.5'
testImplementation projects.groovyTest
}
(groovy) branch master updated: update dependency metadata
This is an automated email from the ASF dual-hosted git repository. paulk 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 e75eb353f5 update dependency metadata e75eb353f5 is described below commit e75eb353f5c9d574f70b4d6032aec371a4e8fd9a Author: Paul King AuthorDate: Mon Jun 24 16:17:04 2024 +1000 update dependency metadata --- gradle/verification-metadata.xml | 62 ++-- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index b7772ee454..9aa4fa54c8 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -50,6 +50,7 @@ + @@ -252,6 +253,7 @@ + @@ -282,10 +284,9 @@ - - + + - @@ -342,8 +343,8 @@ - - + + @@ -538,6 +539,21 @@ + + + + + + + + + + + + + + + @@ -593,11 +609,6 @@ - - - - - @@ -862,8 +873,8 @@ - - + + @@ -907,19 +918,19 @@ - - - + + + - - - + + + - - - + + + @@ -1024,13 +1035,8 @@ - - - - - - - + +
(groovy) branch master updated: remove checkstyle warnings
This is an automated email from the ASF dual-hosted git repository.
paulk 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 8267e96ed2 remove checkstyle warnings
8267e96ed2 is described below
commit 8267e96ed2a39f8aa78143098c838f7e7cb28b4f
Author: Paul King
AuthorDate: Mon Jun 24 15:51:00 2024 +1000
remove checkstyle warnings
---
.../groovy/sql/extensions/SqlExtensions.java | 4 +-
.../swing/binding/AbstractButtonProperties.java| 11 +--
.../groovy/swing/binding/JComboBoxProperties.java | 36 ++--
.../groovy/swing/binding/JComponentProperties.java | 97 +++---
.../groovy/swing/binding/JScrollBarProperties.java | 11 +--
.../groovy/swing/binding/JSliderProperties.java| 11 +--
.../groovy/swing/binding/JSpinnerProperties.java | 11 +--
.../groovy/swing/binding/JTableProperties.java | 25 +-
.../swing/binding/JTextComponentProperties.java| 11 +--
.../apache/groovy/swing/binding/BindingProxy.java | 2 +-
.../groovy/swing/binding/EventTriggerBinding.java | 4 +-
.../groovy/groovy/text/SimpleTemplateEngine.java | 4 +-
.../groovy/text/TemplateExecutionException.java| 2 +-
.../groovy/groovy/text/TemplateParseException.java | 4 +-
.../main/groovy/groovy/text/XmlTemplateEngine.java | 8 +-
.../groovy/text/markup/AutoNewLineTransformer.java | 2 +-
.../groovy/groovy/text/markup/BaseTemplate.java| 2 +-
.../text/markup/MarkupBuilderCodeTransformer.java | 2 +-
.../groovy/text/markup/MarkupTemplateEngine.java | 4 +-
.../groovy/text/markup/TemplateASTTransformer.java | 2 +-
.../mock/interceptor/MockProxyMetaClass.java | 2 +-
.../groovy/xml/slurpersupport/NodeIterator.java| 2 +-
.../streamingmarkupsupport/BaseMarkupBuilder.java | 4 +-
23 files changed, 75 insertions(+), 186 deletions(-)
diff --git
a/subprojects/groovy-sql/src/main/java/org/apache/groovy/sql/extensions/SqlExtensions.java
b/subprojects/groovy-sql/src/main/java/org/apache/groovy/sql/extensions/SqlExtensions.java
index ba5e9a545a..a4acadda19 100644
---
a/subprojects/groovy-sql/src/main/java/org/apache/groovy/sql/extensions/SqlExtensions.java
+++
b/subprojects/groovy-sql/src/main/java/org/apache/groovy/sql/extensions/SqlExtensions.java
@@ -37,7 +37,7 @@ import java.util.Map;
* the normal JDK SQL classes when inside the Groovy environment.
* Static methods are used with the first parameter the destination class.
*/
-public class SqlExtensions {
+public final class SqlExtensions {
/**
* Returns a GroovyRowResult given a ResultSet.
@@ -98,7 +98,7 @@ public class SqlExtensions {
private final ResultSetMetaData target;
private int index = 1;
-public ResultSetMetaDataIterator(ResultSetMetaData target) {
+ResultSetMetaDataIterator(ResultSetMetaData target) {
this.target = target;
}
diff --git
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
index d21be07a57..3ed48c7649 100644
---
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
+++
b/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/AbstractButtonProperties.java
@@ -18,9 +18,7 @@
*/
package groovy.swing.binding;
-import org.apache.groovy.swing.binding.FullBinding;
import org.apache.groovy.swing.binding.PropertyBinding;
-import org.apache.groovy.swing.binding.SourceBinding;
import org.apache.groovy.swing.binding.TargetBinding;
import org.apache.groovy.swing.binding.TriggerBinding;
@@ -39,12 +37,7 @@ public class AbstractButtonProperties {
public static Map getSyntheticProperties() {
Map result = new HashMap();
result.put(AbstractButton.class.getName() + "#selected",
-new TriggerBinding() {
-@Override
-public FullBinding createBinding(SourceBinding source,
TargetBinding target) {
-return new AbstractButtonSelectedBinding((PropertyBinding)
source, target);
-}
-});
+(source, target) -> new
AbstractButtonSelectedBinding((PropertyBinding) source, target));
return result;
}
}
@@ -53,7 +46,7 @@ public class AbstractButtonProperties {
class AbstractButtonSelectedBinding extends AbstractSyntheticBinding
implements PropertyChangeListener, ItemListener {
AbstractButton boundButton;
-public AbstractButtonSelectedBinding(PropertyBinding source, TargetBinding
target) {
+AbstractButtonSelectedBinding(PropertyBinding source, TargetBinding
target) {
super(source, target, AbstractButton.class, "selected");
}
diff --git
a/subprojects/groovy-swing/src/main/groovy/groovy/swing/binding/JComboBoxProperties.java
b/s
(groovy) branch master updated: remove checkstyle warnings
This is an automated email from the ASF dual-hosted git repository.
paulk 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 192afc661b remove checkstyle warnings
192afc661b is described below
commit 192afc661b4d57bb80ac607a1c2940b676b536a3
Author: Paul King
AuthorDate: Mon Jun 24 14:47:56 2024 +1000
remove checkstyle warnings
---
.../groovy/runtime/StringGroovyMethods.java| 2 +-
.../org/codehaus/groovy/tools/DgmConverter.java| 2 +-
.../src/main/java/groovy/ant/package-info.java}| 28 ++
.../groovy/ant/AntProjectPropertiesDelegate.java | 2 +-
.../java/org/codehaus/groovy/ant/VerifyClass.java | 2 +-
.../apache/groovy/ast/builder/package-info.java} | 28 ++
.../groovy/console/ui/ConsoleTextEditor.java | 8 +++
.../groovy/console/ui/text/FindReplaceUtility.java | 8 +++
.../apache/groovy/contracts/ViolationTracker.java | 5 ++--
.../ast/visitor/AnnotationClosureVisitor.java | 4 ++--
.../classgen/asm/ContractClosureWriter.java| 2 +-
.../groovy/contracts/common/spi/Lifecycle.java | 12 +-
.../util/LifecycleImplementationLoader.java| 12 +-
.../datetime/extensions/DateTimeExtensions.java| 2 +-
.../dateutil/extensions/DateUtilExtensions.java| 2 +-
.../provider/collection/runtime/AbstractBound.java | 2 +-
.../collection/runtime/ConcurrentObjectHolder.java | 2 +-
.../collection/runtime/QueryableCollection.java| 6 ++---
.../collection/runtime/WindowDefinitionImpl.java | 24 +--
.../tools/groovydoc/SimpleGroovyRootDoc.java | 4 ++--
.../groovy/jmx/builder/JmxBuilderModelMBean.java | 2 +-
.../java/groovy/jmx/builder/JmxEventEmitter.java | 2 +-
.../groovy/macrolib/MacroLibGroovyMethods.java | 2 +-
.../macro/matcher/ContextualClassCodeVisitor.java | 2 +-
.../groovy/macro/transform/MacroMethodsCache.java | 2 +-
.../main/java/groovy/servlet/ServletBinding.java | 4 ++--
.../main/java/groovy/servlet/TemplateServlet.java | 2 +-
27 files changed, 62 insertions(+), 111 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
index c0113b2681..48a59bbbf3 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
@@ -389,7 +389,7 @@ public class StringGroovyMethods extends
DefaultGroovyMethodsSupport {
final Writer sw = new StringBuilderWriter(2);
// use BufferedWriter rather than System.getProperty because it has
// the security manager rigamarole to deal with the possible
exception
-try (final BufferedWriter bw = new BufferedWriter(sw)) {
+try (BufferedWriter bw = new BufferedWriter(sw)) {
bw.newLine();
bw.flush();
lineSeparator = sw.toString();
diff --git a/src/main/java/org/codehaus/groovy/tools/DgmConverter.java
b/src/main/java/org/codehaus/groovy/tools/DgmConverter.java
index 004252a46d..32d2b9b1d6 100644
--- a/src/main/java/org/codehaus/groovy/tools/DgmConverter.java
+++ b/src/main/java/org/codehaus/groovy/tools/DgmConverter.java
@@ -115,7 +115,7 @@ public class DgmConverter {
File targetFile = new File(targetDirectory + className +
".class").getCanonicalFile();
targetFile.getParentFile().mkdirs();
-try (final FileOutputStream fileOutputStream = new
FileOutputStream(targetFile)) {
+try (FileOutputStream fileOutputStream = new
FileOutputStream(targetFile)) {
fileOutputStream.write(bytes);
fileOutputStream.flush();
}
diff --git
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/ConcurrentObjectHolder.java
b/subprojects/groovy-ant/src/main/java/groovy/ant/package-info.java
similarity index 56%
copy from
subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/ConcurrentObjectHolder.java
copy to subprojects/groovy-ant/src/main/java/groovy/ant/package-info.java
index bec6705e8e..2b79ec7402 100644
---
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/provider/collection/runtime/ConcurrentObjectHolder.java
+++ b/subprojects/groovy-ant/src/main/java/groovy/ant/package-info.java
@@ -16,32 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.groovy.ginq.provider.collection.runtime;
-
-import org.apache.groovy.internal.util.Supplier;
/**
- * Hold an object thread-safely
- *
- * @param the type of object
- * @since 4.0.0
+ * Classes for working with https://ant.apache.org/;>Apache Ant™.
*/
-class Concurren
(groovy) 03/04: GROOVY-11423: Bump checkstyle to 10.17.0 (build dependency)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git commit b8619d378eadb3abe93c2909876f01534600f5f0 Author: Paul King AuthorDate: Mon Jun 24 12:46:59 2024 +1000 GROOVY-11423: Bump checkstyle to 10.17.0 (build dependency) --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 0c92a9c49d..8cd2ec92a4 100644 --- a/versions.properties +++ b/versions.properties @@ -21,7 +21,7 @@ asciidoctorGroovyDsl=2.0.2 asm=9.7 antlr4=4.13.1.5 bridger=1.6.Final -checkstyle=10.15.0 +checkstyle=10.17.0 codenarc=3.4.0-groovy-4.0 cobertura=1.9.4.1 commonsCli=1.8.0
(groovy) 02/04: GROOVY-11424: Bump spotbugs to 4.8.6
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git commit 05f9dc0bd08f3a431958025935b9a111b2a04350 Author: Paul King AuthorDate: Mon Jun 24 12:46:26 2024 +1000 GROOVY-11424: Bump spotbugs to 4.8.6 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index e5b451546e..0c92a9c49d 100644 --- a/versions.properties +++ b/versions.properties @@ -51,7 +51,7 @@ xmlunit=1.6 xstream=1.4.20 # running with Groovy 5 can be allowed with -Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true spock=2.3-groovy-4.0 -spotbugs=4.8.5 +spotbugs=4.8.6 jcipAnnotations=1.0 treelayout=1.0.3 javaxServletApi=4.0.1
(groovy) branch master updated (b48b0830db -> 3a76745e62)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from b48b0830db GROOVY-11421: Bump logback-classic to 1.5.6 (test dependency) new 5a315d70b7 GROOVY-11422: Bump testng to 7.10.2 new 05f9dc0bd0 GROOVY-11424: Bump spotbugs to 4.8.6 new b8619d378e GROOVY-11423: Bump checkstyle to 10.17.0 (build dependency) new 3a76745e62 GROOVY-11425: Bump gson to 2.11.0 (test dependency) The 4 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: subprojects/groovy-json/build.gradle | 2 +- subprojects/groovy-testng/build.gradle | 2 +- versions.properties| 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
(groovy) 01/04: GROOVY-11422: Bump testng to 7.10.2
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 5a315d70b7ee8fa856205560a0211bc33ea6d703
Author: Paul King
AuthorDate: Mon Jun 24 12:43:05 2024 +1000
GROOVY-11422: Bump testng to 7.10.2
---
subprojects/groovy-testng/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-testng/build.gradle
b/subprojects/groovy-testng/build.gradle
index 20e36599c2..3106ad20c1 100644
--- a/subprojects/groovy-testng/build.gradle
+++ b/subprojects/groovy-testng/build.gradle
@@ -22,7 +22,7 @@ plugins {
dependencies {
api rootProject // TestNgRunner implements GroovyRunner...
-runtimeOnly('org.testng:testng:7.9.0') {
+runtimeOnly('org.testng:testng:7.10.2') {
exclude(group: 'com.google.inject', module: 'guice')
exclude(group: 'com.google.code.findbugs', module: 'jsr305')
exclude(group: 'junit', module: 'junit')
(groovy) 04/04: GROOVY-11425: Bump gson to 2.11.0 (test dependency)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3a76745e62044007337a864bc442c6353fde79c6
Author: Paul King
AuthorDate: Mon Jun 24 12:48:39 2024 +1000
GROOVY-11425: Bump gson to 2.11.0 (test dependency)
---
subprojects/groovy-json/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-json/build.gradle
b/subprojects/groovy-json/build.gradle
index ea2874b92c..ffe4824b6b 100644
--- a/subprojects/groovy-json/build.gradle
+++ b/subprojects/groovy-json/build.gradle
@@ -34,7 +34,7 @@ dependencies {
}
}
testRuntimeOnly projects.groovyAnt // for JavadocAssertionTests
-testRuntimeOnly 'com.google.code.gson:gson:2.10.1' // json-unit requires
gson, jackson1 or jackson2
+testRuntimeOnly 'com.google.code.gson:gson:2.11.0' // json-unit requires
gson, jackson1 or jackson2
}
plugins.withId('eclipse') {
(groovy) branch master updated (00122a1d82 -> b48b0830db)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from 00122a1d82 minor refactoring new 35be169b6c GROOVY-11418: Bump hsqldb to 2.7.3 (test dependency) new df445122dd GROOVY-11419: Bump slf4j to 2.0.13 (test and standard install dependency) new 05d35a4286 Bump commons-net to 3.11.1 (performance test dependency) new c39976a2d0 GROOVY-11420: Bump jqwik to 1.8.5 (test dependency) new b48b0830db GROOVY-11421: Bump logback-classic to 1.5.6 (test dependency) The 5 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: .../groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy | 2 +- subprojects/groovy-sql/build.gradle | 2 +- subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 4 ++-- subprojects/groovy-test-junit5/build.gradle | 4 ++-- versions.properties | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-)
(groovy) 03/05: Bump commons-net to 3.11.1 (performance test dependency)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 05d35a4286b293cb34026afd414d69fd2b6847dd
Author: Paul King
AuthorDate: Mon Jun 24 12:19:39 2024 +1000
Bump commons-net to 3.11.1 (performance test dependency)
---
.../groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
index 21cc062725..1fa4ddd4de 100644
---
a/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
+++
b/build-logic/src/main/groovy/org/apache/groovy/gradle/PerformanceTestsExtension.groovy
@@ -97,7 +97,7 @@ class PerformanceTestsExtension {
conf.dependencies.add(dependencies.create(v == 'current' ?
dependencies.project([path: ':groovy-templates']) : (v.startsWith('4') ?
"org.apache.groovy:groovy-templates:$v" :
"org.codehaus.groovy:groovy-templates:$v")))
[
'org.cyberneko:html:1.9.8',
-'commons-net:commons-net:3.10.0',
+'commons-net:commons-net:3.11.1',
'net.sourceforge.htmlunit:htmlunit:2.70.0',
'com.sleepycat:je:18.3.12',
'commons-httpclient:commons-httpclient:3.1',
(groovy) 05/05: GROOVY-11421: Bump logback-classic to 1.5.6 (test dependency)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git commit b48b0830db49a043398f4e033d7e92e04860c854 Author: Paul King AuthorDate: Mon Jun 24 12:23:47 2024 +1000 GROOVY-11421: Bump logback-classic to 1.5.6 (test dependency) --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index f0981b05ce..e5b451546e 100644 --- a/versions.properties +++ b/versions.properties @@ -42,7 +42,7 @@ junit5=5.10.2 junit5Platform=1.10.2 log4j=1.2.17 log4j2=2.23.1 -logback=1.5.3 +logback=1.5.6 openbeans=1.0.2 picocli=4.7.6 qdox=2.1.0
(groovy) 04/05: GROOVY-11420: Bump jqwik to 1.8.5 (test dependency)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit c39976a2d0e6fb7b7b7596747b5e2899e894eb49
Author: Paul King
AuthorDate: Mon Jun 24 12:21:41 2024 +1000
GROOVY-11420: Bump jqwik to 1.8.5 (test dependency)
---
subprojects/groovy-test-junit5/build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/subprojects/groovy-test-junit5/build.gradle
b/subprojects/groovy-test-junit5/build.gradle
index 9b350d12d8..09e1f021a8 100644
--- a/subprojects/groovy-test-junit5/build.gradle
+++ b/subprojects/groovy-test-junit5/build.gradle
@@ -33,10 +33,10 @@ dependencies {
exclude(group: 'org.apiguardian', module: 'apiguardian-api')
}
testImplementation
"org.junit.jupiter:junit-jupiter-params:${versions.junit5}"
-testImplementation 'net.jqwik:jqwik-api:1.8.4'
+testImplementation 'net.jqwik:jqwik-api:1.8.5'
testRuntimeOnly
"org.junit.platform:junit-platform-engine:${versions.junit5Platform}"
testRuntimeOnly
"org.junit.platform:junit-platform-runner:${versions.junit5Platform}"
-testRuntimeOnly 'net.jqwik:jqwik-engine:1.8.4'
+testRuntimeOnly 'net.jqwik:jqwik-engine:1.8.5'
testImplementation projects.groovyTest
}
(groovy) 01/05: GROOVY-11418: Bump hsqldb to 2.7.3 (test dependency)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 35be169b6c46262a6d1b27f34a027714b7b2c6a8
Author: Paul King
AuthorDate: Mon Jun 24 11:10:27 2024 +1000
GROOVY-11418: Bump hsqldb to 2.7.3 (test dependency)
---
subprojects/groovy-sql/build.gradle | 2 +-
subprojects/groovy-sql/src/spec/test/SqlTest.groovy | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/subprojects/groovy-sql/build.gradle
b/subprojects/groovy-sql/build.gradle
index addd628ca8..f41f530335 100644
--- a/subprojects/groovy-sql/build.gradle
+++ b/subprojects/groovy-sql/build.gradle
@@ -22,7 +22,7 @@ plugins {
dependencies {
api rootProject // Sql uses Closure...
-testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.7.2'
+testImplementation group: 'org.hsqldb', name: 'hsqldb', version: '2.7.3'
// uncomment to test with other databases (requires changes elsewhere too)
//testImplementation 'com.h2database:h2:1.3.164'
//testImplementation 'hsqldb:hsqldb:1.8.0.10'
diff --git a/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
b/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
index 6f5556b63a..7b5a84b3d0 100644
--- a/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
+++ b/subprojects/groovy-sql/src/spec/test/SqlTest.groovy
@@ -72,7 +72,7 @@ class SqlTest extends GroovyTestCase {
/*
commented out as already on classpath
// tag::sql_connecting_grab[]
-@Grab('org.hsqldb:hsqldb:2.7.2')
+@Grab('org.hsqldb:hsqldb:2.7.3')
@GrabConfig(systemClassLoader=true)
// create, use, and then close sql instance ...
// end::sql_connecting_grab[]
@@ -335,7 +335,7 @@ class SqlTest extends GroovyTestCase {
// tag::sql_basic_table_metadata[]
def md = sql.connection.metaData
assert md.driverName == 'HSQL Database Engine Driver'
- assert md.databaseProductVersion == '2.7.2'
+ assert md.databaseProductVersion == '2.7.3'
assert ['JDBCMajorVersion', 'JDBCMinorVersion'].collect{ md[it]
} == [4, 2]
assert md.stringFunctions.tokenize(',').contains('CONCAT')
def rs = md.getTables(null, null, 'AUTH%', null)
(groovy) 02/05: GROOVY-11419: Bump slf4j to 2.0.13 (test and standard install dependency)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git commit df445122dd0074942ba6c864a1f319909d61be03 Author: Paul King AuthorDate: Mon Jun 24 12:17:45 2024 +1000 GROOVY-11419: Bump slf4j to 2.0.13 (test and standard install dependency) --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index 9db02a755f..f0981b05ce 100644 --- a/versions.properties +++ b/versions.properties @@ -46,7 +46,7 @@ logback=1.5.3 openbeans=1.0.2 picocli=4.7.6 qdox=2.1.0 -slf4j=2.0.12 +slf4j=2.0.13 xmlunit=1.6 xstream=1.4.20 # running with Groovy 5 can be allowed with -Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true
(groovy) branch master updated: minor refactoring
This is an automated email from the ASF dual-hosted git repository.
paulk 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 00122a1d82 minor refactoring
00122a1d82 is described below
commit 00122a1d82f52720c1e82b3b759c3e37f56117ec
Author: Paul King
AuthorDate: Sun Jun 23 13:37:53 2024 +1000
minor refactoring
---
src/main/groovy/groovy/grape/GrapeIvy.groovy | 4 ++--
.../org/codehaus/groovy/tools/GrapeMain.groovy | 2 +-
src/main/java/groovy/grape/Grape.java| 20 ++--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/groovy/groovy/grape/GrapeIvy.groovy
b/src/main/groovy/groovy/grape/GrapeIvy.groovy
index 94778f5cb6..75486334c9 100644
--- a/src/main/groovy/groovy/grape/GrapeIvy.groovy
+++ b/src/main/groovy/groovy/grape/GrapeIvy.groovy
@@ -257,7 +257,7 @@ class GrapeIvy implements GrapeEngine {
conf
}
-@Override
+@Override // TODO deprecate
grab(String endorsedModule) {
grab(group: 'groovy.endorsed', module: endorsedModule, version:
GroovySystem.getVersion())
}
@@ -417,7 +417,7 @@ class GrapeIvy implements GrapeEngine {
is.getText().readLines()*.trim().each { String line ->
if (!line.isEmpty() && line[0] != '#')
try {
-registry[name] = (GroovyRunner)
loader.loadClass(line).newInstance()
+registry[name] = (GroovyRunner)
loader.loadClass(line).getDeclaredConstructor().newInstance()
} catch (Exception e) {
throw new IllegalStateException("Error registering runner
class '$line'", e)
}
diff --git a/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
b/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
index 2080c5e4b4..5b0ebe09e9 100644
--- a/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
+++ b/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
@@ -84,7 +84,7 @@ class GrapeMain implements Runnable {
}
@SuppressWarnings('UnusedPrivateMethod') // used in run()
-private void setupLogging(int defaultLevel = 2) { // = Message.MSG_INFO ->
some parsing error :(
+private void setupLogging(int defaultLevel = Message.MSG_INFO) {
if (quiet) {
Message.defaultLogger = new DefaultMessageLogger(Message.MSG_ERR)
} else if (warn) {
diff --git a/src/main/java/groovy/grape/Grape.java
b/src/main/java/groovy/grape/Grape.java
index 5e71bf3b76..e392f2b06e 100644
--- a/src/main/java/groovy/grape/Grape.java
+++ b/src/main/java/groovy/grape/Grape.java
@@ -41,18 +41,18 @@ public class Grape {
protected static GrapeEngine instance;
/**
- * This is a static access kill-switch. All of the static shortcut
- * methods in this class will not work if this property is set to false.
- * By default it is set to true.
+ * This is a static access kill-switch. All the static shortcut
+ * methods in this class will be disabled if this property is set to false.
+ * By default, it is set to true.
*/
public static boolean getEnableGrapes() {
return enableGrapes;
}
/**
- * This is a static access kill-switch. All of the static shortcut
- * methods in this class will not work if this property is set to false.
- * By default it is set to true.
+ * This is a static access kill-switch. All the static shortcut
+ * methods in this class will be disabled if this property is set to false.
+ * By default, it is set to true.
*/
public static void setEnableGrapes(boolean enableGrapes) {
Grape.enableGrapes = enableGrapes;
@@ -74,7 +74,7 @@ public class Grape {
* will be checked for new versions and downloaded (with dependencies)
* if found.
*
- * By default it is set to true.
+ * By default, it is set to true.
*/
public static boolean getEnableAutoDownload() {
return enableAutoDownload;
@@ -94,7 +94,7 @@ public class Grape {
* If it is set to true, then any jars not already downloaded will
* automatically be downloaded. Also, any versions expressed as a range
* will be checked for new versions and downloaded (with dependencies)
- * if found. By default it is set to true.
+ * if found. By default, it is set to true.
*/
public static void setEnableAutoDownload(boolean enableAutoDownload) {
Grape.enableAutoDownload = enableAutoDownload;
@@ -102,7 +102,7 @@ public class Grape {
/**
* Global flag to ignore checksums.
- * By default it is set to false.
+ * By default, it is set to false.
*/
public static boolean getDisableChecksums() {
return disableChecksums;
@@ -110,7 +110,7 @@ public class Grape {
/**
* Set global flag to ignore checksums.
-
(groovy) branch master updated: update dependency metadata
This is an automated email from the ASF dual-hosted git repository. paulk 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 e6b9133726 update dependency metadata e6b9133726 is described below commit e6b9133726af9cdea2bc6db7b55523cd88f7190e Author: Paul King AuthorDate: Wed Jun 19 11:56:00 2024 +1000 update dependency metadata --- gradle/verification-metadata.xml | 139 --- 1 file changed, 56 insertions(+), 83 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 68856788fd..c344e0ade0 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -184,49 +184,60 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + @@ -239,28 +250,11 @@ - - - - - - - - - - - - - - - - - @@ -268,14 +262,10 @@ + - - - - - @@ -310,6 +300,7 @@ + @@ -324,16 +315,16 @@ - - + + - + - - + + - + @@ -402,11 +393,6 @@ - - - - - @@ -442,12 +428,6 @@ - - - - - - @@ -531,15 +511,10 @@ - - - - - - + @@ -638,11 +613,6 @@ - - - - - @@ -780,6 +750,7 @@ + @@ -820,6 +791,7 @@ + @@ -840,6 +812,7 @@ + @@ -924,19 +897,19 @@ - - - + + + - - - + + + - - - + + +
(groovy) branch master updated: trivial refactor: remove findbugs warning
This is an automated email from the ASF dual-hosted git repository.
paulk 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 8716fa1caa trivial refactor: remove findbugs warning
8716fa1caa is described below
commit 8716fa1caabb877dfa9bafc8fc27f805e56ad468
Author: Paul King
AuthorDate: Wed Jun 19 11:09:37 2024 +1000
trivial refactor: remove findbugs warning
---
src/main/java/groovy/lang/GroovyClassLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/groovy/lang/GroovyClassLoader.java
b/src/main/java/groovy/lang/GroovyClassLoader.java
index 6e67bffeaa..5a081c1775 100644
--- a/src/main/java/groovy/lang/GroovyClassLoader.java
+++ b/src/main/java/groovy/lang/GroovyClassLoader.java
@@ -98,7 +98,7 @@ public class GroovyClassLoader extends URLClassLoader {
protected final StampedCommonCache sourceCache = new
StampedCommonCache<>();
private final CompilerConfiguration config;
-private String sourceEncoding;
+private final String sourceEncoding;
private Boolean recompile;
/**
(groovy-website) branch asf-site updated: coceu 2024 trip report (image)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 5155855 coceu 2024 trip report (image) 5155855 is described below commit 51558553a5a10a782dd3453c83b6f0be58349e09 Author: Paul King AuthorDate: Tue Jun 18 14:54:32 2024 +1000 coceu 2024 trip report (image) --- site/src/site/blog/img/coceu2024_groovy_speakers.png | Bin 0 -> 1590207 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/site/src/site/blog/img/coceu2024_groovy_speakers.png b/site/src/site/blog/img/coceu2024_groovy_speakers.png new file mode 100644 index 000..9d7634b Binary files /dev/null and b/site/src/site/blog/img/coceu2024_groovy_speakers.png differ
(groovy-website) branch asf-site updated: coceu 2024 trip report (tweak)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 40887d6 coceu 2024 trip report (tweak) 40887d6 is described below commit 40887d6bd27633024712d4cfd0fff414a773bf50 Author: Paul King AuthorDate: Tue Jun 18 10:42:10 2024 +1000 coceu 2024 trip report (tweak) --- site/src/site/blog/community-over-code-eu-2024.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/site/src/site/blog/community-over-code-eu-2024.adoc b/site/src/site/blog/community-over-code-eu-2024.adoc index c591334..c162bc7 100644 --- a/site/src/site/blog/community-over-code-eu-2024.adoc +++ b/site/src/site/blog/community-over-code-eu-2024.adoc @@ -202,6 +202,9 @@ image:img/coceu2024_whiskey3.png[Whiskey flavour profiles with Beam] + image:img/coceu2024_whiskey4.png[Whiskey flavour profiles with Flink] +The speakers: +image:img/coceu2024_groovy_speakers.png[The speakers] + == Posters Community over Code EU also featured a dedicated area for poster sessions.
(groovy-website) branch asf-site updated: coceu 2024 trip report
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git The following commit(s) were added to refs/heads/asf-site by this push: new a5f2df6 coceu 2024 trip report a5f2df6 is described below commit a5f2df6dd041039ed2e44e35b70ad379464e1785 Author: Paul King AuthorDate: Mon Jun 17 19:00:26 2024 +1000 coceu 2024 trip report --- site/src/site/blog/community-over-code-eu-2024.adoc | 4 1 file changed, 4 insertions(+) diff --git a/site/src/site/blog/community-over-code-eu-2024.adoc b/site/src/site/blog/community-over-code-eu-2024.adoc index 094ac1b..c591334 100644 --- a/site/src/site/blog/community-over-code-eu-2024.adoc +++ b/site/src/site/blog/community-over-code-eu-2024.adoc @@ -223,6 +223,10 @@ See also: * https://eu.communityovercode.org/program/[The official program] includes all tracks and will include links to the slides of the talks if/when available. +Other trip reports: + +* https://www.linkedin.com/pulse/fourth-community-over-code-performance-engineering-track-paul-brebner-i1vlc/[Performance Engineering Track] + Upcoming Community Over Code conferences: * Hangzhou China, 26-28 July 2024, https://asia.communityovercode.org/[C Over C Asia 2024]
(groovy-website) branch asf-site updated: coceu 2024 trip report
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 1bd8b8f coceu 2024 trip report 1bd8b8f is described below commit 1bd8b8f695c1cbce62dc6214dac6e9828b8f4c1c Author: Paul King AuthorDate: Mon Jun 17 18:55:42 2024 +1000 coceu 2024 trip report --- site/src/site/blog/community-over-code-eu-2024.adoc | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/site/src/site/blog/community-over-code-eu-2024.adoc b/site/src/site/blog/community-over-code-eu-2024.adoc index e106105..094ac1b 100644 --- a/site/src/site/blog/community-over-code-eu-2024.adoc +++ b/site/src/site/blog/community-over-code-eu-2024.adoc @@ -1,12 +1,11 @@ = Community Over Code (Europe) 2024 Paul King :revdate: 2024-06-17T17:00:00+00:00 -:draft: true :description: This post looks at the ASF Community Over Code EU conference in Bratislava, Slovakia, June 3-5 2024, with a particular focus on the Groovy Track. :keywords: groovy, asf, apachecon, communityovercode -This year's European edition of the ASF conference, https://communityovercode.org/[Community Over Code], -featured three in-person days of sessions (June 3-5) at the Halifax Convention Centre, including a Groovy track on the last day. +This year's European edition of the ASF conference, https://eu.communityovercode.org[Community Over Code EU], +featured three in-person days of sessions (June 3-5) in Bratislava, Slovakia, including a Groovy track on the last day. NOTE: The presentation slides and audio/video (where available) are still being added onto the conference site. If additional material becomes available, this post will be updated with links to the additional content. @@ -223,5 +222,8 @@ See also: * https://photos.apachecon.com/index.php?/category/38[Additional photos] (may be added to over time). * https://eu.communityovercode.org/program/[The official program] includes all tracks and will include links to the slides of the talks if/when available. -* Upcoming Community Over Code conferences: https://asia.communityovercode.org/[C Over C Asia 2024] -https://communityovercode.org/[C Over C NA 2024]. + +Upcoming Community Over Code conferences: + +* Hangzhou China, 26-28 July 2024, https://asia.communityovercode.org/[C Over C Asia 2024] +* Denver Colorado, 7-10 October 2024 https://communityovercode.org/[C Over C NA 2024].
(groovy-website) branch asf-site updated: draft coceu 2024 trip report
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 1f293ef draft coceu 2024 trip report 1f293ef is described below commit 1f293ef31bcd53eb7a2fc3ec827172cd5d5a7988 Author: Paul King AuthorDate: Mon Jun 17 15:40:46 2024 +1000 draft coceu 2024 trip report --- .../src/site/blog/community-over-code-eu-2024.adoc | 227 + site/src/site/blog/img/coceu2024_groovy_poster.jpg | Bin 0 -> 2027745 bytes site/src/site/blog/img/coceu2024_iris.png | Bin 0 -> 1168632 bytes site/src/site/blog/img/coceu2024_iris1.png | Bin 0 -> 403154 bytes site/src/site/blog/img/coceu2024_iris2.png | Bin 0 -> 1168576 bytes site/src/site/blog/img/coceu2024_iris3.png | Bin 0 -> 678103 bytes site/src/site/blog/img/coceu2024_iris4.png | Bin 0 -> 240257 bytes site/src/site/blog/img/coceu2024_iris5.png | Bin 0 -> 139948 bytes site/src/site/blog/img/coceu2024_iris6.png | Bin 0 -> 729219 bytes site/src/site/blog/img/coceu2024_iris7.png | Bin 0 -> 474498 bytes site/src/site/blog/img/coceu2024_micronaut.png | Bin 0 -> 891504 bytes site/src/site/blog/img/coceu2024_micronaut1.png| Bin 0 -> 192806 bytes site/src/site/blog/img/coceu2024_micronaut2.png| Bin 0 -> 206204 bytes site/src/site/blog/img/coceu2024_micronaut3.png| Bin 0 -> 130992 bytes site/src/site/blog/img/coceu2024_micronaut4.png| Bin 0 -> 230666 bytes site/src/site/blog/img/coceu2024_micronaut5.png| Bin 0 -> 225572 bytes .../blog/img/coceu2024_micronaut_groovy_spock.png | Bin 0 -> 134239 bytes .../blog/img/coceu2024_operator_overloading.png| Bin 0 -> 906204 bytes site/src/site/blog/img/coceu2024_posters.jpg | Bin 0 -> 50822 bytes site/src/site/blog/img/coceu2024_primitives.png| Bin 0 -> 948781 bytes .../blog/img/coceu2024_static_roman_numerals.png | Bin 0 -> 186719 bytes site/src/site/blog/img/coceu2024_tac_dinner.jpg| Bin 0 -> 948786 bytes site/src/site/blog/img/coceu2024_transforms.png| Bin 0 -> 860063 bytes site/src/site/blog/img/coceu2024_whiskey.png | Bin 0 -> 1592195 bytes site/src/site/blog/img/coceu2024_whiskey1.png | Bin 0 -> 1380587 bytes site/src/site/blog/img/coceu2024_whiskey2.png | Bin 0 -> 698641 bytes site/src/site/blog/img/coceu2024_whiskey3.png | Bin 0 -> 836600 bytes site/src/site/blog/img/coceu2024_whiskey4.png | Bin 0 -> 891702 bytes site/src/site/blog/img/coceu2024_why_groovy.png| Bin 0 -> 1321987 bytes 29 files changed, 227 insertions(+) diff --git a/site/src/site/blog/community-over-code-eu-2024.adoc b/site/src/site/blog/community-over-code-eu-2024.adoc new file mode 100644 index 000..e106105 --- /dev/null +++ b/site/src/site/blog/community-over-code-eu-2024.adoc @@ -0,0 +1,227 @@ += Community Over Code (Europe) 2024 +Paul King +:revdate: 2024-06-17T17:00:00+00:00 +:draft: true +:description: This post looks at the ASF Community Over Code EU conference in Bratislava, Slovakia, June 3-5 2024, with a particular focus on the Groovy Track. +:keywords: groovy, asf, apachecon, communityovercode + +This year's European edition of the ASF conference, https://communityovercode.org/[Community Over Code], +featured three in-person days of sessions (June 3-5) at the Halifax Convention Centre, including a Groovy track on the last day. + +NOTE: The presentation slides and audio/video (where available) are still being added onto the conference site. +If additional material becomes available, this post will be updated with links to the additional content. + +This post gives a short trip report on the conference mostly focussed on the Groovy track. + +== The Conference, Venue, and Host city + +The conference was hosted at the Radisson Blu Carlton in Bratislava, Slovakia. The facilities were great, +and it was a great city to visit. + +image:https://eu.communityovercode.org/images/blog/images-bratislava1.jpg[width=47%] +image:https://photos.apachecon.com/_data/i/upload/2024/06/05/20240605134031-d3953d86-xx.jpg[width=42%] +image:https://photos.apachecon.com/_data/i/upload/2024/06/10/20240610202025-1ac29b1e-xx.jpg[width=44.4%] +image:https://photos.apachecon.com/_data/i/upload/2024/06/05/20240605081228-926eecf0-xx.jpg[width=44.4%] +image:img/coceu2024_tac_dinner.jpg[width=55%] +image:https://photos.apachecon.com/_data/i/upload/2023/10/20/20231020033313-d56c0136-me.jpg[stickers,width=33%] + +Kudos to all involved for making the event a fruitful and rewarding one! + +== Highlights from the Groovy BoF and Groovy Track + +We had a very engaging Birds-of-a-Feather (BoF) session with various users of the +Groovy programming language including a large contingent from the https://ofbiz.
(groovy-website) branch asf-site updated: clarify where `withExistingPool` static import comes from
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 01910a5 clarify where `withExistingPool` static import comes from 01910a5 is described below commit 01910a576e46c5f6e1b8cc5552ec64bffb22c645 Author: Paul King AuthorDate: Fri May 10 08:21:11 2024 +1000 clarify where `withExistingPool` static import comes from --- site/src/site/blog/gpars-meets-virtual-threads.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/site/blog/gpars-meets-virtual-threads.adoc b/site/src/site/blog/gpars-meets-virtual-threads.adoc index 5ddea15..7483e96 100644 --- a/site/src/site/blog/gpars-meets-virtual-threads.adoc +++ b/site/src/site/blog/gpars-meets-virtual-threads.adoc @@ -56,7 +56,7 @@ assert nums.parallelStream().map(n -> n ** 2).toList() == [1, 4, 9] Now, let's bring virtual threads into the picture. Luckily, GPars parallel collection facilities provide a hook for using -an _existing_ custom executor service. This makes using virtual +an _existing_ custom executor service (`GParsExecutorsPool.withExistingPool`). This makes using virtual threads for such code easy. First we create our pool (backed by virtual threads): [source,groovy]
(groovy) branch GROOVY_4_0_X updated: Fix description of Observable example code.
This is an automated email from the ASF dual-hosted git repository. paulk 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 58e44da4d7 Fix description of Observable example code. 58e44da4d7 is described below commit 58e44da4d721305cf02b90d16992997d54c2cfe5 Author: Dean Brettle AuthorDate: Tue Apr 30 21:20:38 2024 -0700 Fix description of Observable example code. The descriptions for 2 of the references were switched. --- src/spec/doc/core-gdk.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spec/doc/core-gdk.adoc b/src/spec/doc/core-gdk.adoc index 0a48c997b2..3719fa9d09 100644 --- a/src/spec/doc/core-gdk.adoc +++ b/src/spec/doc/core-gdk.adoc @@ -130,8 +130,8 @@ include::../test/gdk/ObservableTest.groovy[tags=observable_list,indent=0] <1> Declares a `PropertyChangeEventListener` that is capturing the fired events <2> `ObservableList.ElementEvent` and its descendant types are relevant for this listener -<3> Registers the listener -<4> Creates an `ObservableList` from the given list +<3> Creates an `ObservableList` from the given list +<4> Registers the listener <5> Triggers an `ObservableList.ElementAddedEvent` event [NOTE]
(groovy) branch master updated: minor refactor: replace deprecated method usage
This is an automated email from the ASF dual-hosted git repository.
paulk 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 950f397ed3 minor refactor: replace deprecated method usage
950f397ed3 is described below
commit 950f397ed3affac1aecad4ed0f71ee81addcd116
Author: Paul King
AuthorDate: Sat May 4 16:33:53 2024 +1000
minor refactor: replace deprecated method usage
---
src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
b/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
index 5cd913b118..2080c5e4b4 100644
--- a/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
+++ b/src/main/groovy/org/codehaus/groovy/tools/GrapeMain.groovy
@@ -26,17 +26,11 @@ import picocli.CommandLine.Command
import picocli.CommandLine.Option
import picocli.CommandLine.Parameters
import picocli.CommandLine.ParentCommand
-import picocli.CommandLine.RunLast
import picocli.CommandLine.Unmatched
@SuppressWarnings('Println')
@Command(name = 'grape', description = 'Allows for the inspection and
management of the local grape cache.',
-subcommands = [
-GrapeMain.Install,
-GrapeMain.Uninstall,
-GrapeMain.ListCommand,
-GrapeMain.Resolve,
-CommandLine.HelpCommand])
+subcommands = [Install, Uninstall, ListCommand, Resolve,
CommandLine.HelpCommand])
class GrapeMain implements Runnable {
@Option(names = ['-D', '--define'], description = 'define a system
property', paramLabel = '')
private final Map properties = new LinkedHashMap()
@@ -71,7 +65,7 @@ class GrapeMain implements Runnable {
parser.subcommands.findAll { k, v -> k != 'help' }.each { k, v ->
v.addMixin('helpOptions', new HelpOptionsMixin()) }
grape.parser = parser
-parser.parseWithHandler(new RunLast(), args)
+parser.execute(args)
}
void run() {
@@ -282,7 +276,7 @@ class GrapeMain implements Runnable {
}
try {
def results = []
-def uris = Grape.resolve(* params)
+def uris = Grape.resolve(*params)
if (!ivyFormatRequested) {
for (URI uri: uris) {
if (uri.scheme == 'file') {
(groovy) branch master updated: minor refactor: don't cache inner classes for the purpose of default import resolving
This is an automated email from the ASF dual-hosted git repository.
paulk 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 3164bbd5a1 minor refactor: don't cache inner classes for the purpose
of default import resolving
3164bbd5a1 is described below
commit 3164bbd5a1a87e02e4418c129ace7453ca429a8a
Author: Paul King
AuthorDate: Fri May 3 21:21:03 2024 +1000
minor refactor: don't cache inner classes for the purpose of default import
resolving
---
src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java | 7 ---
src/test/org/codehaus/groovy/vmplugin/v9/ClassFinderTest.groovy | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
b/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
index 290c30e00b..bcfc441470 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
@@ -85,6 +85,7 @@ public class ClassFinder {
public static Map> find(URI classpathEntryURI, String
packageName, boolean recursive) {
return find(classpathEntryURI, packageName, recursive, true);
}
+
/**
* Returns the found classes
*
@@ -122,7 +123,7 @@ public class ClassFinder {
return find(uri, prefix, packageName, recursive, innerClasses);
}
-private static Map> find(URI uri, String prefix,
String packageName, boolean recursive, final boolean innerClasses) {
+static Map> find(URI uri, String prefix, String
packageName, boolean recursive, final boolean innerClasses) {
boolean wfs = "file".equals(uri.getScheme());
if (wfs) prefix = prefix.replace("/", File.separator);
@@ -187,9 +188,9 @@ public class ClassFinder {
private static Tuple2 maybeNewFileSystem(URI uri)
throws IOException {
try {
-return new Tuple2(FileSystems.newFileSystem(uri,
Collections.emptyMap()), true);
+return new Tuple2<>(FileSystems.newFileSystem(uri,
Collections.emptyMap()), true);
} catch (FileSystemAlreadyExistsException e) {
-return new Tuple2(FileSystems.getFileSystem(uri), false);
+return new Tuple2<>(FileSystems.getFileSystem(uri), false);
}
}
diff --git a/src/test/org/codehaus/groovy/vmplugin/v9/ClassFinderTest.groovy
b/src/test/org/codehaus/groovy/vmplugin/v9/ClassFinderTest.groovy
index 824d5ff5a5..6ce0d51494 100644
--- a/src/test/org/codehaus/groovy/vmplugin/v9/ClassFinderTest.groovy
+++ b/src/test/org/codehaus/groovy/vmplugin/v9/ClassFinderTest.groovy
@@ -106,7 +106,7 @@ class ClassFinderTest {
@Test
void testGroovy9480() {
try {
-ClassFinder.find(URI.create("file:/"), "NOT_EXISTS", "org/", false)
+ClassFinder.find(URI.create("file:/"), "NOT_EXISTS", "org/",
false, true)
} catch (ClassFindFailedException e) {
assert e.message.contains('Failed to find classes')
}
(groovy) branch master updated: minor refactor: don't cache inner classes for the purpose of default import resolving
This is an automated email from the ASF dual-hosted git repository.
paulk 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 4de9597dde minor refactor: don't cache inner classes for the purpose
of default import resolving
4de9597dde is described below
commit 4de9597dde2e3d0177e6589d45aa2c9020bf2709
Author: Paul King
AuthorDate: Fri May 3 20:42:13 2024 +1000
minor refactor: don't cache inner classes for the purpose of default import
resolving
---
.../codehaus/groovy/vmplugin/v9/ClassFinder.java | 27 --
.../org/codehaus/groovy/vmplugin/v9/Java9.java | 2 +-
2 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
b/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
index 9c4befea33..290c30e00b 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/ClassFinder.java
@@ -83,6 +83,19 @@ public class ClassFinder {
* @since 3.0.2
*/
public static Map> find(URI classpathEntryURI, String
packageName, boolean recursive) {
+return find(classpathEntryURI, packageName, recursive, true);
+}
+/**
+ * Returns the found classes
+ *
+ * @param classpathEntryURI the classpath entry
+ * @param packageName the package under which we find classes
+ * @param recursive whether to find sub-packages
+ * @param innerClasses whether to find inner classes (class names
containing a "$")
+ * @return the found classes
+ * @since 5.0.0
+ */
+public static Map> find(URI classpathEntryURI, String
packageName, boolean recursive, boolean innerClasses) {
URI uri;
String prefix;
String scheme = classpathEntryURI.getScheme();
@@ -99,22 +112,22 @@ public class ClassFinder {
uri = URI.create("file:/");
prefix = path.toString();
} else {
-uri = URI.create("jar:" + classpathEntryURI.toString());
+uri = URI.create("jar:" + classpathEntryURI);
prefix = "";
}
} else {
throw new UnsupportedOperationException(classpathEntryURI + " is
not supported");
}
-return find(uri, prefix, packageName, recursive);
+return find(uri, prefix, packageName, recursive, innerClasses);
}
-private static Map> find(URI uri, String prefix,
String packageName, boolean recursive) {
+private static Map> find(URI uri, String prefix,
String packageName, boolean recursive, final boolean innerClasses) {
boolean wfs = "file".equals(uri.getScheme());
if (wfs) prefix = prefix.replace("/", File.separator);
-final String sepPatten = Pattern.quote(wfs ? File.separator : "/");
-final int prefixElemCnt = prefix.trim().isEmpty() ? 0 :
prefix.split(sepPatten).length;
+final String sepPattern = Pattern.quote(wfs ? File.separator : "/");
+final int prefixElemCnt = prefix.trim().isEmpty() ? 0 :
prefix.split(sepPattern).length;
Map> result = new LinkedHashMap<>();
Tuple2 fsMaybeNew = null;
@@ -128,14 +141,14 @@ public class ClassFinder {
@Override
public FileVisitResult visitFile(Path path,
BasicFileAttributes attrs) {
-String[] pathElems = path.toString().split(sepPatten);
+String[] pathElems = path.toString().split(sepPattern);
int nameCount = pathElems.length;
if (nameCount <= prefixElemCnt) {
return FileVisitResult.CONTINUE;
}
String filename = pathElems[nameCount - 1];
-if (!filename.endsWith(".class") ||
"module-info.class".equals(filename) || "package-info.class".equals(filename)) {
+if ((!innerClasses && filename.contains("$")) ||
!filename.endsWith(".class") || "module-info.class".equals(filename) ||
"package-info.class".equals(filename)) {
return FileVisitResult.CONTINUE;
}
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
index 76ac1af03f..f9db6051a0 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
@@ -132,7 +132,7 @@ public class Java9 extends Java8 {
}
private static Map> doFindClasses(final URI uri, final
String packageName, final List defaultPackageNames) {
-Ma
(groovy) branch master updated: avoid GrapeIvy as mentioned class (pre-work for replacing/making optional GrapeIvy)
This is an automated email from the ASF dual-hosted git repository.
paulk 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 bbe4557ca3 avoid GrapeIvy as mentioned class (pre-work for
replacing/making optional GrapeIvy)
bbe4557ca3 is described below
commit bbe4557ca32fd967e11a0ef5cc502f45513b06ac
Author: Paul King
AuthorDate: Fri May 3 11:52:17 2024 +1000
avoid GrapeIvy as mentioned class (pre-work for replacing/making optional
GrapeIvy)
---
src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
index 14d37343db..76ac1af03f 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
@@ -103,17 +103,18 @@ public class Java9 extends Java8 {
CompletableFuture>>
javaDefaultImportsFuture =
CompletableFuture.supplyAsync(() ->
doFindClasses(URI.create("jrt:/modules/java.base/"), "java", javaPackages));
try {
-URI gsLocation =
DefaultGroovyMethods.getLocation(gcl.loadClass("groovy.lang.GroovySystem")).toURI();
+// groovy-core (Java source)
+URI gcjLocation =
DefaultGroovyMethods.getLocation(gcl.loadClass("groovy.lang.GroovySystem")).toURI();
CompletableFuture>>
groovyDefaultImportsFuture1 =
-CompletableFuture.supplyAsync(() ->
doFindClasses(gsLocation, "groovy", groovyPackages));
+CompletableFuture.supplyAsync(() ->
doFindClasses(gcjLocation, "groovy", groovyPackages));
-// in production environment, groovy-core classes, e.g.
`GroovySystem`(java class) and `GrapeIvy`(groovy class) are all packaged in the
groovy-core jar file,
+// in production environment, groovy-core classes, e.g.
`GroovySystem`(java class) and `ListenerLister`(groovy class) are all packaged
in the groovy-core jar file,
// but in Groovy development environment, groovy-core classes
are distributed in different directories
-URI giLocation =
DefaultGroovyMethods.getLocation(gcl.loadClass("groovy.grape.GrapeIvy")).toURI();
+URI gcgLocation =
DefaultGroovyMethods.getLocation(gcl.loadClass("groovy.beans.ListenerList")).toURI();
CompletableFuture>>
groovyDefaultImportsFuture2 =
-gsLocation.equals(giLocation)
+gcjLocation.equals(gcgLocation)
?
CompletableFuture.completedFuture(Collections.emptyMap())
-: CompletableFuture.supplyAsync(() ->
doFindClasses(giLocation, "groovy", groovyPackages));
+: CompletableFuture.supplyAsync(() ->
doFindClasses(gcgLocation, "groovy", groovyPackages));
result.putAll(groovyDefaultImportsFuture1.get());
result.putAll(groovyDefaultImportsFuture2.get());
(groovy) branch master updated: Fix description of Observable example code.
This is an automated email from the ASF dual-hosted git repository. paulk 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 0cead05ece Fix description of Observable example code. 0cead05ece is described below commit 0cead05ece8176e68468445ab3b8e56698eff2f4 Author: Dean Brettle AuthorDate: Tue Apr 30 21:20:38 2024 -0700 Fix description of Observable example code. The descriptions for 2 of the references were switched. --- src/spec/doc/core-gdk.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/spec/doc/core-gdk.adoc b/src/spec/doc/core-gdk.adoc index 0a48c997b2..3719fa9d09 100644 --- a/src/spec/doc/core-gdk.adoc +++ b/src/spec/doc/core-gdk.adoc @@ -130,8 +130,8 @@ include::../test/gdk/ObservableTest.groovy[tags=observable_list,indent=0] <1> Declares a `PropertyChangeEventListener` that is capturing the fired events <2> `ObservableList.ElementEvent` and its descendant types are relevant for this listener -<3> Registers the listener -<4> Creates an `ObservableList` from the given list +<3> Creates an `ObservableList` from the given list +<4> Registers the listener <5> Triggers an `ObservableList.ElementAddedEvent` event [NOTE]
(groovy) branch master updated: Bump codecov/codecov-action from 3 to 4
This is an automated email from the ASF dual-hosted git repository. paulk 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 246ca1ef10 Bump codecov/codecov-action from 3 to 4 246ca1ef10 is described below commit 246ca1ef10f70c8d26a2f96c0e6f4e122b3ebc38 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Feb 8 09:17:34 2024 + Bump codecov/codecov-action from 3 to 4 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/groovy-build-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/groovy-build-coverage.yml b/.github/workflows/groovy-build-coverage.yml index 0633bb76b5..b9fbfffaa1 100644 --- a/.github/workflows/groovy-build-coverage.yml +++ b/.github/workflows/groovy-build-coverage.yml @@ -41,4 +41,4 @@ jobs: run: ./gradlew -Pcoverage=true jacocoAllReport timeout-minutes: 60 - name: Upload coverage to Codecov -uses: codecov/codecov-action@v3 +uses: codecov/codecov-action@v4
(groovy-website) branch asf-site updated: add multiversal equality blog post
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new b78dfea add multiversal equality blog post
b78dfea is described below
commit b78dfea57140e0d832f8ddbe66e68152ebd28469
Author: Paul King
AuthorDate: Wed Apr 24 22:37:02 2024 +1000
add multiversal equality blog post
---
site/src/site/blog/multiversal-equality.adoc | 387 +++
1 file changed, 387 insertions(+)
diff --git a/site/src/site/blog/multiversal-equality.adoc
b/site/src/site/blog/multiversal-equality.adoc
new file mode 100644
index 000..d937372
--- /dev/null
+++ b/site/src/site/blog/multiversal-equality.adoc
@@ -0,0 +1,387 @@
+= Groovy and Multiversal Equality
+Paul King
+:revdate: 2024-04-24T15:00:00+00:00
+:keywords: equals, equality, scala, type checking
+:description: This post looks at how Groovy could support multiversal equality.
+
+== Introduction
+
+In Scala 3, an opt-in feature called
+https://docs.scala-lang.org/scala3/reference/contextual/multiversal-equality.html[_multiversal
equality_]
+was introduced. Earlier versions of Scala supported _universal equality_,
+where any two objects can be compared for equality.
+Universal equality makes a lot of sense when you understand
+that Scala's (`==` and `!=`) equality operators, like Groovy's,
+is based on Java's `equals` method and that method takes
+any `Object` as its argument.
+
+[sidebar]
+Java folks might be more familiar with those operators
+when used with objects as being used for reference equality.
+Groovy, like Scala and Kotlin, reserves those operators for
+structural equality (since that is what we are interested in
+most of the time) and has identity operators (`===` and `!==`)
+for referential equality (pointing to the same instance).
+
+The Scala documentation has an online book which gives
+https://docs.scala-lang.org/scala3/book/ca-multiversal-equality.html[further
details]
+on the benefits of having multiversal equality as an option.
+Let's look at a concrete example inspired by one of their code snippets.
+Consider the following code:
+
+[source,groovy]
+
+var blue = getBlue() // returns Color.BLUE
+var pink = Color.PINK
+assert blue != pink
+
+
+Now, suppose the `getBlue` method is refactored to use a different color
+library, and now returns `RGBColor.BLUE`.
+In our case, the assertion will still fail, as before, but we aren't
+really testing what we thought. In general, the behavior of our
+code might change in subtle or catastrophic ways, and we may not
+find out until runtime. Multiversal equality takes a stricter
+stance on the types which can be checked for equality and
+would pick up the issue in our above example at compilation time.
+With multiversal equality enabled, you might see an error like this:
+
+
+[Static type checking] - Invalid equality check: com.threed.jpct.RGBColor !=
java.awt.Color
+ @ line 3, column 8.
+ assert blue != pink
+ ^
+
+
+Let's look at the `Book` case study from the online Scala
+https://docs.scala-lang.org/scala3/book/ca-multiversal-equality.html[documentation].
+
+== Book Case Study
+
+The case study involves an online bookstore which sells
+physical printed books, and audiobooks. We'll start without
+considering multiversal equality, and then look at how that
+could be added later in Groovy.
+
+As a first attempt, we might define a `Book` trait containing the
+common properties:
+
+[source,groovy]
+
+trait Book {
+String title
+String author
+int year
+}
+
+
+A domain class for printed books:
+
+[source,groovy]
+
+@Immutable(allProperties = true)
+class PrintedBook implements Book {
+int pages
+}
+
+
+The `@Immutable` annotation is a meta-annotation which conceptually
+expands into the `@EqualsAndHashCode` annotation (and others).
+`@EqualsAndHashCode` is an AST transform which instructs the
+compiler to inject an `equals` method into our code.
+
+In a similar way, we'll create a domain class for audiobooks:
+
+[source,groovy]
+
+@Immutable(allProperties = true)
+class AudioBook implements Book {
+int lengthInMinutes
+}
+
+
+At this stage, we can create and compare audio and printed books,
+but they will always be non-equal:
+
+[source,groovy]
+
+var pBook = new PrintedBook(328, "1984", "George Orwell", 1949)
+var aBook = new AudioBook(682, "1984", "George Orwell", 2006)
+assert pBook != aBook
+assert aBook != pBook
+
+
+The generated `equals` method in our code will always return false
+when comparing objects from other classes.
+It turns out that writing a correct equality method can be
+https://www.artima.com/articles/how-to-write-an-equality-method-in-java[surprisingly
difficult].
+As that article alludes to, a common best practice when wanting to
+
(groovy) branch master updated: deprecated build usage
This is an automated email from the ASF dual-hosted git repository.
paulk 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 0f443141c6 deprecated build usage
0f443141c6 is described below
commit 0f443141c6719c51d5733713c9f0ffbcf031c800
Author: Paul King
AuthorDate: Mon Apr 22 13:54:54 2024 +1000
deprecated build usage
---
build-logic/src/main/groovy/org.apache.groovy-base.gradle | 4 ++--
build.gradle | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
index 4c33055503..99b1334e45 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -308,8 +308,8 @@ components.groovyLibrary {
// By declaring a codehaus capability we can tell Gradle that the user has to
// choose between "old" groovy and "new" groovy
List capabilities = [
-
"org.codehaus.groovy:${archivesBaseName}:${sharedConfiguration.groovyVersion.get()}",
-
"org.apache.groovy:${archivesBaseName}:${sharedConfiguration.groovyVersion.get()}"
+
"org.codehaus.groovy:${base.archivesName.get()}:${sharedConfiguration.groovyVersion.get()}",
+
"org.apache.groovy:${base.archivesName.get()}:${sharedConfiguration.groovyVersion.get()}"
]
int targetJvmVersion =
Integer.valueOf(sharedConfiguration.targetJavaVersion.get())
// First we create the "API" and "runtime" variants of Groovy for publication
diff --git a/build.gradle b/build.gradle
index 74a002bb35..f24ee350b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,9 @@ buildScanRecipes {
recipes 'git-status', 'gc-stats', 'teamcity', 'travis-ci'
}
-archivesBaseName = 'groovy'
+base {
+archivesName = 'groovy'
+}
groovyLibrary {
registerOptionalFeature 'gpars'
(groovy) 03/03: revert: deprecated build usage (needs further work)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0b303ea03617cd0fe0bd3a9b658b67773d577f4b
Author: Paul King
AuthorDate: Fri Apr 19 15:30:27 2024 +1000
revert: deprecated build usage (needs further work)
---
build-logic/src/main/groovy/org.apache.groovy-base.gradle | 5 +++--
build.gradle | 4 +---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
index 86ee11bcfb..4c33055503 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -78,6 +78,7 @@ configurations {
}
}
sourcesForAggregation {
+canBeConsumed = true
canBeConsumed = true
canBeResolved = false
extendsFrom implementation, runtimeOnly
@@ -307,8 +308,8 @@ components.groovyLibrary {
// By declaring a codehaus capability we can tell Gradle that the user has to
// choose between "old" groovy and "new" groovy
List capabilities = [
-
"org.codehaus.groovy:${base.archivesName}:${sharedConfiguration.groovyVersion.get()}",
-
"org.apache.groovy:${base.archivesName}:${sharedConfiguration.groovyVersion.get()}"
+
"org.codehaus.groovy:${archivesBaseName}:${sharedConfiguration.groovyVersion.get()}",
+
"org.apache.groovy:${archivesBaseName}:${sharedConfiguration.groovyVersion.get()}"
]
int targetJvmVersion =
Integer.valueOf(sharedConfiguration.targetJavaVersion.get())
// First we create the "API" and "runtime" variants of Groovy for publication
diff --git a/build.gradle b/build.gradle
index f24ee350b3..74a002bb35 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,9 +33,7 @@ buildScanRecipes {
recipes 'git-status', 'gc-stats', 'teamcity', 'travis-ci'
}
-base {
-archivesName = 'groovy'
-}
+archivesBaseName = 'groovy'
groovyLibrary {
registerOptionalFeature 'gpars'
(groovy) branch master updated (10064a524e -> 0b303ea036)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from 10064a524e swap to develocity plugin cont'd new fe03dea478 swap to develocity plugin cont'd new 5f87cc3afa update dependency metadata new 0b303ea036 revert: deprecated build usage (needs further work) 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-rat-check.yml| 2 +- build-logic/src/main/groovy/org.apache.groovy-base.gradle | 5 +++-- build.gradle | 4 +--- gradle/verification-metadata.xml | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-)
(groovy) 02/03: update dependency metadata
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git commit 5f87cc3afa0580cb31e3f03e6cc408b92e202830 Author: Paul King AuthorDate: Fri Apr 19 15:12:37 2024 +1000 update dependency metadata --- gradle/verification-metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 721bfa1729..48bdb2bf7f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -279,7 +279,7 @@ - +
(groovy) 01/03: swap to develocity plugin cont'd
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit fe03dea4784135e06380879818ba8c647403e9fb
Author: Paul King
AuthorDate: Fri Apr 19 15:06:59 2024 +1000
swap to develocity plugin cont'd
---
.github/workflows/groovy-rat-check.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/groovy-rat-check.yml
b/.github/workflows/groovy-rat-check.yml
index 5ead04a9d6..c2e05872af 100644
--- a/.github/workflows/groovy-rat-check.yml
+++ b/.github/workflows/groovy-rat-check.yml
@@ -28,7 +28,7 @@ jobs:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
(groovy) branch master updated (3454c59c48 -> 10064a524e)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from 3454c59c48 swap to develocity plugin cont'd add 10064a524e swap to develocity plugin cont'd No new revisions were added by this update. Summary of changes: .github/workflows/groovy-rat-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(groovy) branch master updated (627a093f93 -> 3454c59c48)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from 627a093f93 swap to develocity plugin cont'd new 0ccad8ff96 deprecated build usage new 42dd0c0745 deprecated build usage new 59e4ad810b update dependency metadata new 3454c59c48 swap to develocity plugin cont'd The 4 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-coverage.yml | 2 +- .github/workflows/groovy-build-dist.yml | 2 +- .github/workflows/groovy-build-test.yml | 2 +- .github/workflows/micronaut-joint-validation.yml | 2 +- build-logic/src/main/groovy/org.apache.groovy-base.gradle | 4 ++-- build.gradle | 4 +++- gradle/verification-metadata.xml | 12 ++-- 7 files changed, 15 insertions(+), 13 deletions(-)
(groovy) 04/04: swap to develocity plugin cont'd
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3454c59c48f8e8c650e761a6017e0219c4a5f629
Author: Paul King
AuthorDate: Fri Apr 19 14:28:28 2024 +1000
swap to develocity plugin cont'd
---
.github/workflows/groovy-build-coverage.yml | 2 +-
.github/workflows/groovy-build-dist.yml | 2 +-
.github/workflows/groovy-build-test.yml | 2 +-
.github/workflows/micronaut-joint-validation.yml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/groovy-build-coverage.yml
b/.github/workflows/groovy-build-coverage.yml
index 5b152d1268..0633bb76b5 100644
--- a/.github/workflows/groovy-build-coverage.yml
+++ b/.github/workflows/groovy-build-coverage.yml
@@ -28,7 +28,7 @@ jobs:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
diff --git a/.github/workflows/groovy-build-dist.yml
b/.github/workflows/groovy-build-dist.yml
index 9f75f3c844..b52ab4961c 100644
--- a/.github/workflows/groovy-build-dist.yml
+++ b/.github/workflows/groovy-build-dist.yml
@@ -28,7 +28,7 @@ jobs:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- name: Install graphviz
run: sudo apt-get install -y graphviz
diff --git a/.github/workflows/groovy-build-test.yml
b/.github/workflows/groovy-build-test.yml
index c382aa5889..e78f7de114 100644
--- a/.github/workflows/groovy-build-test.yml
+++ b/.github/workflows/groovy-build-test.yml
@@ -21,7 +21,7 @@ permissions:
contents: read
env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
jobs:
lts:
diff --git a/.github/workflows/micronaut-joint-validation.yml
b/.github/workflows/micronaut-joint-validation.yml
index 931b500e66..219180d8f9 100644
--- a/.github/workflows/micronaut-joint-validation.yml
+++ b/.github/workflows/micronaut-joint-validation.yml
@@ -32,7 +32,7 @@ jobs:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
(groovy) 01/04: deprecated build usage
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0ccad8ff9623eef60e644bc0b74163b22f951951
Author: Paul King
AuthorDate: Fri Apr 19 14:16:13 2024 +1000
deprecated build usage
---
build-logic/src/main/groovy/org.apache.groovy-base.gradle | 4 ++--
build.gradle | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
index 6f4ca56449..4ed1ee4e6a 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -307,8 +307,8 @@ components.groovyLibrary {
// By declaring a codehaus capability we can tell Gradle that the user has to
// choose between "old" groovy and "new" groovy
List capabilities = [
-
"org.codehaus.groovy:${archivesBaseName}:${sharedConfiguration.groovyVersion.get()}",
-
"org.apache.groovy:${archivesBaseName}:${sharedConfiguration.groovyVersion.get()}"
+
"org.codehaus.groovy:${archivesName}:${sharedConfiguration.groovyVersion.get()}",
+
"org.apache.groovy:${archivesName}:${sharedConfiguration.groovyVersion.get()}"
]
int targetJvmVersion =
Integer.valueOf(sharedConfiguration.targetJavaVersion.get())
// First we create the "API" and "runtime" variants of Groovy for publication
diff --git a/build.gradle b/build.gradle
index 74a002bb35..457151df4a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ buildScanRecipes {
recipes 'git-status', 'gc-stats', 'teamcity', 'travis-ci'
}
-archivesBaseName = 'groovy'
+archivesName = 'groovy'
groovyLibrary {
registerOptionalFeature 'gpars'
(groovy) 03/04: update dependency metadata
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git commit 59e4ad810b9dbadb1401211d54feb5a44d53019d Author: Paul King AuthorDate: Fri Apr 19 14:28:11 2024 +1000 update dependency metadata --- gradle/verification-metadata.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 303d538fbe..721bfa1729 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -276,16 +276,16 @@ - - + + - + - - + + - +
(groovy) 02/04: deprecated build usage
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 42dd0c07457cfb9fb55a4ec08baac1b5b75b9cef
Author: Paul King
AuthorDate: Fri Apr 19 14:27:59 2024 +1000
deprecated build usage
---
build-logic/src/main/groovy/org.apache.groovy-base.gradle | 4 ++--
build.gradle | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
index 4ed1ee4e6a..86ee11bcfb 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-base.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-base.gradle
@@ -307,8 +307,8 @@ components.groovyLibrary {
// By declaring a codehaus capability we can tell Gradle that the user has to
// choose between "old" groovy and "new" groovy
List capabilities = [
-
"org.codehaus.groovy:${archivesName}:${sharedConfiguration.groovyVersion.get()}",
-
"org.apache.groovy:${archivesName}:${sharedConfiguration.groovyVersion.get()}"
+
"org.codehaus.groovy:${base.archivesName}:${sharedConfiguration.groovyVersion.get()}",
+
"org.apache.groovy:${base.archivesName}:${sharedConfiguration.groovyVersion.get()}"
]
int targetJvmVersion =
Integer.valueOf(sharedConfiguration.targetJavaVersion.get())
// First we create the "API" and "runtime" variants of Groovy for publication
diff --git a/build.gradle b/build.gradle
index 457151df4a..f24ee350b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,9 @@ buildScanRecipes {
recipes 'git-status', 'gc-stats', 'teamcity', 'travis-ci'
}
-archivesName = 'groovy'
+base {
+archivesName = 'groovy'
+}
groovyLibrary {
registerOptionalFeature 'gpars'
(groovy) branch master updated: swap to develocity plugin cont'd
This is an automated email from the ASF dual-hosted git repository.
paulk 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 627a093f93 swap to develocity plugin cont'd
627a093f93 is described below
commit 627a093f93662ecba60e51e53a2032643a584931
Author: Paul King
AuthorDate: Fri Apr 19 14:12:32 2024 +1000
swap to develocity plugin cont'd
---
.github/workflows/grails-joint-validation.yml | 2 +-
.github/workflows/groovy-rat-check.yml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/grails-joint-validation.yml
b/.github/workflows/grails-joint-validation.yml
index dfabc070d1..7a56052ab2 100644
--- a/.github/workflows/grails-joint-validation.yml
+++ b/.github/workflows/grails-joint-validation.yml
@@ -39,7 +39,7 @@ jobs:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
-GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
diff --git a/.github/workflows/groovy-rat-check.yml
b/.github/workflows/groovy-rat-check.yml
index 5ead04a9d6..c2e05872af 100644
--- a/.github/workflows/groovy-rat-check.yml
+++ b/.github/workflows/groovy-rat-check.yml
@@ -28,7 +28,7 @@ jobs:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
(groovy) branch master updated: swap to develocity plugin cont'd
This is an automated email from the ASF dual-hosted git repository.
paulk 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 af7aeaa7ef swap to develocity plugin cont'd
af7aeaa7ef is described below
commit af7aeaa7efac565ddaf2f1d1fd5cc18cfc85c0be
Author: Paul King
AuthorDate: Fri Apr 19 13:59:14 2024 +1000
swap to develocity plugin cont'd
---
gradle/build-scans.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle/build-scans.gradle b/gradle/build-scans.gradle
index b589c176be..0c532a0183 100644
--- a/gradle/build-scans.gradle
+++ b/gradle/build-scans.gradle
@@ -18,7 +18,7 @@
*/
def env = System.getenv()
-boolean isCI = env.CI || env.TRAVIS || env.TEAMCITY_VERSION ||
env.GITHUB_ACTIONS
+boolean isCI = env.CI || env.TEAMCITY_VERSION || env.GITHUB_ACTIONS
develocity {
server = "https://ge.apache.org;
@@ -26,7 +26,7 @@ develocity {
buildScan {
uploadInBackground = !isCI
-publishing.onlyIf { println "it.authenticated=" + it.authenticated;
it.authenticated }
+publishing.onlyIf { it.authenticated }
obfuscation {
ipAddresses { addresses -> addresses.collect { address ->
"0.0.0.0" } }
}
(groovy) 02/02: swap to develocity plugin cont'd
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 19832006c31ec6d42a11a8d281c37ec6b5f6e57a
Author: Paul King
AuthorDate: Fri Apr 19 06:43:27 2024 +1000
swap to develocity plugin cont'd
---
gradle/build-scans.gradle | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/gradle/build-scans.gradle b/gradle/build-scans.gradle
index 2b749d096c..b589c176be 100644
--- a/gradle/build-scans.gradle
+++ b/gradle/build-scans.gradle
@@ -20,15 +20,13 @@
def env = System.getenv()
boolean isCI = env.CI || env.TRAVIS || env.TEAMCITY_VERSION ||
env.GITHUB_ACTIONS
-gradleEnterprise {
+develocity {
server = "https://ge.apache.org;
allowUntrustedServer = false
buildScan {
-capture { taskInputFiles = true }
uploadInBackground = !isCI
-publishAlways()
-publishIfAuthenticated()
+publishing.onlyIf { println "it.authenticated=" + it.authenticated;
it.authenticated }
obfuscation {
ipAddresses { addresses -> addresses.collect { address ->
"0.0.0.0" } }
}
@@ -40,7 +38,7 @@ buildCache {
enabled = !isCI
}
-remote(gradleEnterprise.buildCache) {
+remote(develocity.buildCache) {
enabled = false
}
}
(groovy) branch master updated (d10f8d8984 -> 19832006c3)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from d10f8d8984 update dependency metadata new aca2957d11 GROOVY-11361: Bump Commons CLI to 1.7.0 (fix test) new 19832006c3 swap to develocity plugin cont'd 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/build-scans.gradle | 8 +++- .../src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy | 10 +- 2 files changed, 8 insertions(+), 10 deletions(-)
(groovy) 01/02: GROOVY-11361: Bump Commons CLI to 1.7.0 (fix test)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit aca2957d11d50aee46131acfcc34d863fb394249
Author: Paul King
AuthorDate: Fri Apr 19 06:43:04 2024 +1000
GROOVY-11361: Bump Commons CLI to 1.7.0 (fix test)
---
.../src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy
b/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy
index d23b64a177..7a439d889d 100644
---
a/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy
+++
b/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy
@@ -59,11 +59,11 @@ class CliBuilderTest extends GroovyTestCase {
cli.c(argName: 'charset', args: 1, longOpt: 'encoding', 'character
encoding')
cli.i(argName: 'extension', optionalArg: true, 'modify files in place,
create backup if extension is given (e.g. \'.bak\')')
def stringified = cli.options.toString()
-assert stringified =~ /i=\[ option: i :: modify files in place,
create backup if extension is given/
-assert stringified =~ /c=\[ option: c encoding \[ARG] :: character
encoding/
-assert stringified =~ /h=\[ option: h help :: usage information/
-assert stringified =~ /encoding=\[ option: c encoding \[ARG] ::
character encoding/
-assert stringified =~ /help=\[ option: h help :: usage information/
+assert stringified =~ /i=\[ [Oo]ption:? i ? :: modify files in place,
create backup if extension is given/
+assert stringified =~ /c=\[ [Oo]ption:? c encoding ? \[ARG] ::
character encoding/
+assert stringified =~ /h=\[ [Oo]ption:? h help ? :: usage information/
+assert stringified =~ /encoding=\[ [Oo]ption:? c encoding ? \[ARG] ::
character encoding/
+assert stringified =~ /help=\[ [Oo]ption:? h help ? :: usage
information/
def options = cli.parse(optionList)
assert options.hasOption('h')
assert options.hasOption('help')
(groovy) 01/03: swap to develocity plugin
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3eb4e2842b53b3aadf7464e9bdf20acbdb3a2c9a
Author: Paul King
AuthorDate: Thu Apr 18 23:24:03 2024 +1000
swap to develocity plugin
---
settings.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/settings.gradle b/settings.gradle
index 1aa5dd6494..79cd093bb7 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.enterprise" version "3.17.2"
+id "com.gradle.develocity" version "3.17.2"
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.1'
}
(groovy) branch master updated (fdf3a2b572 -> d10f8d8984)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git from fdf3a2b572 Bump com.gradle.enterprise from 3.16.2 to 3.17.2 new 3eb4e2842b swap to develocity plugin new 84265fa43d GROOVY-11361: Bump Commons CLI to 1.7.0 new d10f8d8984 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. Summary of changes: gradle/verification-metadata.xml | 11 ++- settings.gradle | 2 +- versions.properties | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-)
(groovy) 03/03: update dependency metadata
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git commit d10f8d89847aab067387272bd5d4b09e22daf6ce Author: Paul King AuthorDate: Fri Apr 19 05:57:22 2024 +1000 update dependency metadata --- gradle/verification-metadata.xml | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 5d1a57db99..303d538fbe 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -218,6 +218,7 @@ + @@ -227,9 +228,9 @@ - - - + + + @@ -348,8 +349,8 @@ - - + +
(groovy) 02/03: GROOVY-11361: Bump Commons CLI to 1.7.0
This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git commit 84265fa43d8266885028a4899705078a9e9e6f22 Author: Paul King AuthorDate: Thu Apr 18 23:24:44 2024 +1000 GROOVY-11361: Bump Commons CLI to 1.7.0 --- versions.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.properties b/versions.properties index b6bf6b5dde..a8b99e1f66 100644 --- a/versions.properties +++ b/versions.properties @@ -24,7 +24,7 @@ bridger=1.6.Final checkstyle=10.15.0 codenarc=3.4.0-groovy-4.0 cobertura=1.9.4.1 -commonsCli=1.6.0 +commonsCli=1.7.0 commonsMath3=3.6.1 gpars=1.2.1 ivy=2.5.2
(groovy-website) branch asf-site updated (29d7493 -> b31c4e3)
This is an automated email from the ASF dual-hosted git repository. paulk pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/groovy-website.git from 29d7493 Release 4.0.21: update sitemap new dabf358 add link to PDF new b31c4e3 add windows installers 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: site/src/site/pages/documentation.groovy | 2 ++ site/src/site/sitemap-dev.groovy | 14 ++ 2 files changed, 4 insertions(+), 12 deletions(-)
(groovy-website) 01/02: add link to PDF
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
commit dabf3584b316c730d16c0ea4a66b66bd5e9b6486
Author: Paul King
AuthorDate: Wed Mar 27 15:06:52 2024 +1000
add link to PDF
---
site/src/site/pages/documentation.groovy | 2 ++
1 file changed, 2 insertions(+)
diff --git a/site/src/site/pages/documentation.groovy
b/site/src/site/pages/documentation.groovy
index 08fd3af..02404fe 100644
--- a/site/src/site/pages/documentation.groovy
+++ b/site/src/site/pages/documentation.groovy
@@ -30,6 +30,8 @@ layout 'layouts/main.groovy', true,
p {
yield 'The documentation is available as a '
a(href: "single-page-documentation.html",
'single-page document')
+yield ', or a '
+a(href:
"https://docs.groovy-lang.org/docs/latest/html/documentation/index.pdf;, 'PDF')
yield ', or feel free to pick at a direct
section below.'
}
p "You can also browse ${$a(href: '#all-versions',
'documentation for other versions')}."
(groovy-website) 02/02: add windows installers
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git
commit b31c4e35a3b723f44560b1b8f1feb8a843f8c12c
Author: Paul King
AuthorDate: Wed Apr 10 08:29:36 2024 +1000
add windows installers
---
site/src/site/sitemap-dev.groovy | 14 ++
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index a6d787c..5aed213 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -86,12 +86,7 @@ downloads {
}
version('5.0.0-alpha-8') {
stable false
-//windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-5.0.0-alpha-8/'
-}
-version('5.0.0-alpha-7') {
-stable false
-archive true
-windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-5.0.0-alpha-7/'
+windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-5.0.0-alpha-8/'
}
}
distribution('Groovy 4.0') {
@@ -103,12 +98,7 @@ downloads {
}
version('4.0.21') {
stable true
-//windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-4.0.21/'
-}
-version('4.0.20') {
-stable true
-archive true
-windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-4.0.20/'
+windowsInstaller
'https://groovy.jfrog.io/artifactory/dist-release-local/groovy-windows-installer/groovy-4.0.21/'
}
}
distribution('Groovy 3.0') {
(groovy) branch GROOVY_4_0_X updated: Bump version on GROOVY_4_0_X branch
This is an automated email from the ASF dual-hosted git repository.
paulk 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 eaf26cfe6f Bump version on GROOVY_4_0_X branch
eaf26cfe6f is described below
commit eaf26cfe6fbb27fe09f63910a79e9a5679d8ee33
Author: Paul King
AuthorDate: Tue Apr 9 15:37:37 2024 +1000
Bump version on GROOVY_4_0_X branch
---
gradle.properties | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index dca271dfc2..abd1d345f3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-groovyVersion=4.0.21-SNAPSHOT
+groovyVersion=4.0.22-SNAPSHOT
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3
only digits)
-groovyBundleVersion=4.0.21.SNAPSHOT
+groovyBundleVersion=4.0.22.SNAPSHOT
groovyTargetBytecodeVersion=1.8
targetJavaVersion=8
