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 9c56e6c  general tidy up
9c56e6c is described below

commit 9c56e6cedb5eacdcea37f2f38b651bf92053a656
Author: Paul King <[email protected]>
AuthorDate: Fri Feb 17 08:46:44 2023 +1000

    general tidy up
---
 site/src/site/assets/css/style.css                 |   4 ++
 site/src/site/blog/apache-groovy-2022-year-in.adoc |  71 ++++++++++++++++-----
 .../apache-groovy-committer-graeme-rocher.adoc     |   7 +-
 .../blog/classifying-iris-flowers-with-deep.adoc   |  25 ++++----
 site/src/site/blog/img/apachecon_collage_2022.jpg  | Bin 0 -> 1666465 bytes
 site/src/site/blog/img/groovy4_release_tweet.png   | Bin 0 -> 26601 bytes
 .../site/blog/testing-your-java-with-groovy.adoc   |  20 +++---
 .../blog/whiskey-clustering-with-groovy-and.adoc   |   2 +-
 8 files changed, 88 insertions(+), 41 deletions(-)

diff --git a/site/src/site/assets/css/style.css 
b/site/src/site/assets/css/style.css
index a04d0d5..e9c963c 100644
--- a/site/src/site/assets/css/style.css
+++ b/site/src/site/assets/css/style.css
@@ -1304,6 +1304,10 @@ a.image object {
   background: #fafafa;
 }
 
+.gold {
+  color: #c4a000;
+}
+
 .yellow {
   color: #bfbf00;
 }
diff --git a/site/src/site/blog/apache-groovy-2022-year-in.adoc 
b/site/src/site/blog/apache-groovy-2022-year-in.adoc
index ebbf6ed..f44028f 100644
--- a/site/src/site/blog/apache-groovy-2022-year-in.adoc
+++ b/site/src/site/blog/apache-groovy-2022-year-in.adoc
@@ -4,31 +4,68 @@ Paul King
 :keywords: groovy, 2022, apachecon
 :description: This post looks back at some highlights for Groovy in 2022.
 
-The year 2022 has been a reasonably good one for the Groovy Programming 
Language. Here are just a few of the highlights.
+The year 2022 has been a reasonably good one for the Groovy Programming 
Language.
+Here are just a few of the highlights.
 
-The latest release of Groovy 4 is 4.0.7 which includes over 300 improvements 
and bug fixes since 4.0.0.
-For more details about Groovy 4, you can read the 
https://groovy-lang.org/releasenotes/groovy-4.0.html[release notes].
+== Releases & Contributions
+
+In 2022, Groovy had 18 releases starting with Groovy 4 in January:
+
+image:img/groovy4_release_tweet.png[Groovy 4 release tweet]
+
+The latest release of Groovy 4 is 4.0.7 which includes over 300 improvements
+and bug fixes since 4.0.0. For more details about Groovy 4, you can read the
+https://groovy-lang.org/releasenotes/groovy-4.0.html[release notes].
 There have also been bug fix releases for earlier Groovy versions.
-For our main branch of our main source code repo, there were 820 commits from 
28 contributors.
-This is the branch which corresponds to Groovy 5 but many fixes were also 
back-ported to earlier Groovy versions.
-Just on Groovy 5, we expect to have alpha versions available for review in the 
first quarter of 2023.
-Also, while discussing commit counts, we should note that 
https://github.com/eric-milles[Eric Milles]
-became the 5th person to overtake James Strachan (the original founder of 
Groovy) in numbers of commits to the project.
+
+For our main branch of our main source code repo, there were 820 commits from 
28
+contributors. This is the branch which corresponds to Groovy 5 but many fixes
+were also back-ported to earlier Groovy versions.
+
+Just on Groovy 5, we expect to have alpha versions available for review in the
+first quarter of 2023. Also, while discussing commit counts, we should note 
that
+https://github.com/eric-milles[Eric Milles] became the 5th person to overtake 
James
+Strachan (the original founder of Groovy) in numbers of commits to the project.
 Congrats Eric!
 
-There were also many contributions outside those code commits. _We thank all 
those involved in contributing to or promoting Groovy in 2022_!
+There were also many contributions outside those code commits.
+_We thank all those involved in contributing to or promoting Groovy in 2022_!
+
+== Downloads
 
-In early 2021, Groovy surpassed the 1 billion artifacts downloaded mark. This 
is downloads of artifacts from repositories
-like Maven Central and (at least until recently) Bintray. We now only collect 
stats from Maven Central.
-We don't collect stats on downloads of the zip releases nor attempt to account 
for the many downloads where
-Groovy is bundled within other products, so the stats are no doubt much higher.
-Well, the good news is that the rate of downloads is still increasing, so 
interest in Groovy remains high.
+In early 2021, Groovy surpassed the 1 billion artifacts downloaded mark.
+This is downloads of artifacts from repositories like Maven Central and
+(at least until recently) Bintray. We now only collect stats from Maven 
Central.
+We don't collect stats on downloads of the zip releases nor attempt to account
+for the many downloads where Groovy is bundled within other products, so
+the stats are no doubt much higher. Well, the good news is that the rate of
+downloads is still increasing, so interest in Groovy remains high.
 While the figures for December are not yet finalised, it looks like
 *_2022 will be the first year Groovy surpasses 1 Billion downloads in a single 
calendar year_*!
+
 image:img/downloads_until_2022.png[Groovy download stats]
 
-We also started increasing the number of posts in the 
https://groovy.apache.org/blog[Groovy project blog].
-There were nearly 30 posts for you to peruse from this year. We try to show 
off Groovy features and also have some fun.
+== Blogs
+
+We also started increasing the number of posts in the
+https://groovy.apache.org/blog[Groovy project blog].
+There were nearly 30 posts for you to peruse from this year.
+We try to show off Groovy features and also have some fun.
+
 image:img/blog_collage_2022.jpg[collage of blog post images]
+
 You might also like to check out the 
https://www.javaadvent.com/2022/12/groovy-and-data-science.html[Groovy and Data 
Science blog post] from
-the https://www.javaadvent.com/[JVM Advent] folks. It summarises a handful of 
the above-mentioned blog posts.
\ No newline at end of file
+the https://www.javaadvent.com/[JVM Advent] folks. It summarises a handful of 
the above-mentioned blog posts.
+
+== ApacheCon
+
+Several folks from the project and many friends of Groovy participated in the 
sold out
+ApacheCon conference in New Orleans in October. We thank the conference 
organisers,
+speakers and attendees for the wonderful conference.
+
+image:img/apachecon_collage_2022.jpg[Some photos from ApacheCon 2022]
+
+We have plenty more in store for 2023. We invite you to come on the journey 
with us!
+
+Social media: https://twitter.com/ApacheGroovy[@ApacheGroovy]
+https://fosstodon.org/@ApacheGroovy[@[email protected]]
\ No newline at end of file
diff --git a/site/src/site/blog/apache-groovy-committer-graeme-rocher.adoc 
b/site/src/site/blog/apache-groovy-committer-graeme-rocher.adoc
index f9c959b..b8f4d0f 100644
--- a/site/src/site/blog/apache-groovy-committer-graeme-rocher.adoc
+++ b/site/src/site/blog/apache-groovy-committer-graeme-rocher.adoc
@@ -4,9 +4,12 @@ Paul King
 :keywords: groovy, award
 :description: Congratulations to Graeme Rocher for receiving the Oracle 
Groundbreaker award.
 
-The http://groovy.apache.org/[Apache Groovy] team congratulates long-time 
Groovy committer Graeme Rocher on receiving his Groundbreaker award at Oracle 
Code One.
+The http://groovy.apache.org/[Apache Groovy] team congratulates long-time 
Groovy committer
+Graeme Rocher on receiving his Groundbreaker award at Oracle Code One.
 
-Graeme has made numerous significant contributions to Apache Groovy and has 
also founded two of the most important frameworks using Groovy: 
https://grails.org/[Grails] and http://micronaut.io/[Micronaut].
+Graeme has made numerous significant contributions to Apache Groovy and has 
also founded
+two of the most important frameworks using Groovy: https://grails.org/[Grails] 
and
+http://micronaut.io/[Micronaut].
 
 image:https://pbs.twimg.com/media/DqPOTAPU0AAK_5d.jpg[Graeme receiving the 
award,800,600]
 
diff --git a/site/src/site/blog/classifying-iris-flowers-with-deep.adoc 
b/site/src/site/blog/classifying-iris-flowers-with-deep.adoc
index 5546bf0..1a4448c 100644
--- a/site/src/site/blog/classifying-iris-flowers-with-deep.adoc
+++ b/site/src/site/blog/classifying-iris-flowers-with-deep.adoc
@@ -1,6 +1,7 @@
 = Classifying Iris Flowers with Deep Learning, Groovy and GraalVM
 Paul King
 :revdate: 2022-06-25T10:52:59+00:00
+:updated: 2022-06-27T11:16:59+00:00
 :keywords: groovy, machine learning, artificial intelligence, neural networks, 
tribuo, deep netts, encog, eclipse deeplearning4j, data science, deep learning, 
graalvm, native
 :description: This post looks at classifying Iris flowers using traditional 
and neural net based approaches \
 using Eclipse DeepLearning4j, Encog, Deep Netts and GraalVM.
@@ -83,9 +84,9 @@ println "Validation error: " + 
pretty(calculateRegressionError(bestMethod, model
 
 When we run the example, we see:
 
-[source,shell]
+[source,subs="quotes,macros"]
 ----
-paulk@pop-os:/extra/projects/iris_encog$ time groovy -cp "build/lib/*" 
IrisEncog.groovy 
+[lime]*paulk@pop-os*pass:v[:][blue]*/extra/projects/iris_encog*$ time groovy 
-cp "build/lib/*" IrisEncog.groovy
 1/5 : Fold #1
 1/5 : Fold #1/5: Iteration #1, Training Error: 1.43550735, Validation Error: 
0.73302237
 1/5 : Fold #1/5: Iteration #2, Training Error: 0.78845427, Validation Error: 
0.73302237
@@ -155,9 +156,9 @@ println eval.stats()
 
 When we run this example, we see:
 
-[source,shell]
+[source,subs="quotes,macros"]
 ----
-paulk@pop-os:/extra/projects/iris_dl4j$ time groovy -cp "build/lib/*" 
IrisDl4j.groovy 
+[lime]*paulk@pop-os*pass:v[:][blue]*/extra/projects/iris_encog*$ time groovy 
-cp "build/lib/*" IrisDl4j.groovy
 [main] INFO org.nd4j.linalg.factory.Nd4jBackend - Loaded [CpuBackend] backend
 [main] INFO org.nd4j.nativeblas.NativeOpsHolder - Number of threads used for 
linear algebra: 4
 [main] INFO org.nd4j.nativeblas.Nd4jBlas - Number of threads used for OpenMP 
BLAS: 4
@@ -249,9 +250,9 @@ new ClassifierEvaluator().with {
 
 When we run this command we see:
 
-[source,shell]
+[source,subs="quotes,macros"]
 ----
-paulk@pop-os:/extra/projects/iris_graalvm$ time groovy -cp "build/lib/*" 
Iris.groovy 
+[lime]*paulk@pop-os*pass:v[:][blue]*/extra/projects/iris_encog*$ time groovy 
-cp "build/lib/*" Iris.groovy
 16:49:27.089 [main] INFO deepnetts.core.DeepNetts - 
------------------------------------------------------------------------
 16:49:27.091 [main] INFO deepnetts.core.DeepNetts - TRAINING NEURAL NETWORK
 16:49:27.091 [main] INFO deepnetts.core.DeepNetts - 
------------------------------------------------------------------------
@@ -297,16 +298,16 @@ nature has a more limited set of metaprogramming 
capabilities but allows bytecod
 Java to be produced. Luckily, we aren't relying on any dynamic Groovy tricks 
for our example.
 We'll compile it up using static mode:
 
-[source,shell]
+[source,subs="quotes,macros"]
 ----
-paulk@pop-os:/extra/projects/iris_graalvm$ groovyc -cp "build/lib/*" 
--compile-static Iris.groovy
+[lime]*paulk@pop-os*pass:v[:][blue]*/extra/projects/iris_encog*$ groovyc -cp 
"build/lib/*" --compile-static Iris.groovy
 ----
 
 Next we build our native application:
 
-[source,shell]
+[source,subs="quotes,macros"]
 ----
-paulk@pop-os:/extra/projects/iris_graalvm$ native-image  
--report-unsupported-elements-at-runtime \
+[lime]*paulk@pop-os*pass:v[:][blue]*/extra/projects/iris_encog*$ native-image  
--report-unsupported-elements-at-runtime \
    
--initialize-at-run-time=groovy.grape.GrapeIvy,deepnetts.net.weights.RandomWeights
 \
    --initialize-at-build-time --no-fallback  
-H:ConfigurationFileDirectories=conf/  -cp ".:build/lib/*" Iris
 ----
@@ -317,9 +318,9 @@ We also did the same for the `RandomWeights` class to avoid 
it being locked into
 
 Now we are ready to run our application:
 
-[source,shell]
+[source,subs="quotes,macros"]
 ----
-paulk@pop-os:/extra/projects/iris_graalvm$ time ./iris
+[lime]*paulk@pop-os*pass:v[:][blue]*/extra/projects/iris_encog*$ time ./iris
 ...
 CLASSIFIER EVALUATION METRICS
 Accuracy: 0.93460923 (How often is classifier correct in total)
diff --git a/site/src/site/blog/img/apachecon_collage_2022.jpg 
b/site/src/site/blog/img/apachecon_collage_2022.jpg
new file mode 100644
index 0000000..264d445
Binary files /dev/null and b/site/src/site/blog/img/apachecon_collage_2022.jpg 
differ
diff --git a/site/src/site/blog/img/groovy4_release_tweet.png 
b/site/src/site/blog/img/groovy4_release_tweet.png
new file mode 100644
index 0000000..df408d0
Binary files /dev/null and b/site/src/site/blog/img/groovy4_release_tweet.png 
differ
diff --git a/site/src/site/blog/testing-your-java-with-groovy.adoc 
b/site/src/site/blog/testing-your-java-with-groovy.adoc
index d835b8f..aa43ff2 100644
--- a/site/src/site/blog/testing-your-java-with-groovy.adoc
+++ b/site/src/site/blog/testing-your-java-with-groovy.adoc
@@ -1,6 +1,8 @@
 = Testing your Java with Groovy, Spock, JUnit5, Jacoco, Jqwik and Pitest
 Paul King
-:revdate: '2022-07-15T08:26:15+00:00'
+:revdate: 2022-07-15T08:26:15+00:00
+:keywords: groovy, java, spock, testing, jqwik, pitest, junit, jacoco
+:description: This post looks at testing Java using Groovy, Spock, JUnit5, 
Jacoco, Jqwik and Pitest
 
 This blog post covers a common scenario seen in the Groovy community which is
 projects which use Java for their production code and Groovy for their tests.
@@ -16,9 +18,9 @@ For illustrative purposes, we will test a Java mathematics 
utility function
 `sumBiggestPair`. Given three numbers, it finds the two biggest and then adds 
them up.
 An initial stab at the code for this might look something like this:
 
-[source,groovy]
+[source,java]
 ----
-public class MathUtil {
+public class MathUtil {                       // Java
 
     public static int sumBiggestPair(int a, int b, int c) {
         int op1 = a;
@@ -133,9 +135,9 @@ image:img/ImperfectPuzzle.jpg[Imperfect puzzle,250]
 
 The good news is that we can fix this. Here is an updated algorithm:
 
-[source,groovy]
+[source,java]
 ----
-public static int sumBiggestPair(int a, int b, int c) {
+public static int sumBiggestPair(int a, int b, int c) {                // Java
     int op1 = a;
     int op2 = b;
     if (c > Math.min(a, b)) {
@@ -149,12 +151,12 @@ public static int sumBiggestPair(int a, int b, int c) {
 With this new algorithm, all 4 testcases now pass,
 and we again have 100% line and branch coverage.
 
-[source]
+[subs="quotes,macros"]
 ----
 > Task :SumBiggestPairPitest:test
-✔ Test sum of two biggest numbers [Tests: 4/4/0/0] [Time: 0.317 s]
-✔ Test util.MathUtilSpec [Tests: 4/4/0/0] [Time: 0.320 s]
-✔ Test Gradle Test Run :SumBiggestPairPitest:test [Tests: 4/4/0/0]
+[lime]*✔* Test sum of two biggest numbers pass:v[[]Tests: 
4/[lime]*4*/[red]*0*/[gold]*0*] [Time: 0.317 s]
+[lime]*✔* Test util.MathUtilSpec pass:v[[]Tests: 
4/[lime]*4*/[red]*0*/[gold]*0*] [Time: 0.320 s]
+[lime]*✔* Test Gradle Test Run :SumBiggestPairPitest:test pass:v[[]Tests: 
4/[lime]*4*/[red]*0*/[gold]*0*]
 ----
 
 But haven't we been here before? How can we be sure there isn't some 
additional test
diff --git a/site/src/site/blog/whiskey-clustering-with-groovy-and.adoc 
b/site/src/site/blog/whiskey-clustering-with-groovy-and.adoc
index a7e8a3b..1a1dc5a 100644
--- a/site/src/site/blog/whiskey-clustering-with-groovy-and.adoc
+++ b/site/src/site/blog/whiskey-clustering-with-groovy-and.adoc
@@ -5,7 +5,7 @@ Paul King
 :description: This post looks at using Apache Ignite with Apache Groovy and 
the K-Means algorithm to cluster scotch whiskeys.
 
 In a previous 
https://groovy.apache.org/blog/using-groovy-with-apache-wayang[blog post],
-image:https://ignite.apache.org/img/logo.svg[Ignite logo,150,float="right"] we 
looked at
+image:https://www.apache.org/logos/res/ignite/default.png[Ignite 
logo,150,float="right"] we looked at
 using https://wayang.apache.org/[Apache Wayang] (incubating) and
 https://spark.apache.org/[Apache Spark] to scale up the
 https://en.wikipedia.org/wiki/K-means_clustering[k-means] clustering algorithm.

Reply via email to