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 a9e29e2d8c3a529415687c352904e3e612cf029c
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon May 20 18:44:21 2019 +1000

    Reflect the aggregation status of .0 releases more accurately
---
 site/src/site/pages/changelogs.groovy | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/site/src/site/pages/changelogs.groovy 
b/site/src/site/pages/changelogs.groovy
index 450e0f3..7efd865 100644
--- a/site/src/site/pages/changelogs.groovy
+++ b/site/src/site/pages/changelogs.groovy
@@ -28,17 +28,15 @@ layout 'layouts/main.groovy', true,
                                 a(name: "changelog$mj") {}
                                 h2("Groovy $mj")
                                 ul {
-                                    minor.each { raw ->
-                                        def v = raw
+                                    minor.each { v ->
+                                        def ver = v
                                         def unreleased = ''
-                                        if (v.endsWith('-placeholder')) {
-                                            v -= '-placeholder'
-                                            unreleased = ' (unreleased)'
+                                        if (v.endsWith('-unreleased')) {
+                                            ver = (v - '-unreleased') + ' 
(unreleased)'
                                         }
                                         li {
-                                            yieldUnescaped ( !v.contains('-') 
&& versions.any{ it.startsWith("$v-") } ? "Aggregate c" : "C" ) + "hangelog for 
"
-                                            a(href: 
"changelogs/changelog-${v}.html", "Groovy $v")
-                                            yieldUnescaped unreleased
+                                            yieldUnescaped ( 
v.endsWith('-unreleased') || (!v.contains('-') && versions.any{ 
it.startsWith("$v-") }) ? "Aggregate c" : "C" ) + "hangelog for "
+                                            a(href: 
"changelogs/changelog-${v}.html", "Groovy $ver")
                                         }
                                     }
                                 }

Reply via email to