[groovy-dev-site] branch asf-site updated: add windows installers

2019-08-07 Thread paulk
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-dev-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new ed48d7b  add windows installers
ed48d7b is described below

commit ed48d7bb1c51fffa2cdaaca365616ec8e9357200
Author: Paul King 
AuthorDate: Thu Aug 8 14:40:57 2019 +1000

add windows installers
---
 download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/download.html b/download.html
index 55f50fe..7b38f74 100644
--- a/download.html
+++ b/download.html
@@ -60,7 +60,7 @@
  Improve this doc
 
  Download Download 2.5.8Ways to get 
Apache Groovy:Download a source or binary distribution.Use a package manager or bundle for 
your operating system.Refer to the 
appropriate Apache Groovy jars from your build tools [...]
+See below for verification information' 
onclick='window.location.href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.8.zip";'> Download 2.5.8Ways to get 
Apache Groovy:Download a source or binary distribution.Use a package manager or bundle for 
your operating system.Refer to the 
appropriate Apache Groovy jars from your build tools [...]
 
 
 



[groovy-website] branch asf-site updated: fix links for user site

2019-08-07 Thread paulk
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 9c85b9d  fix links for user site
9c85b9d is described below

commit 9c85b9d3605368b8477553b156cb897bf77a6f17
Author: Paul King 
AuthorDate: Thu Aug 8 14:38:22 2019 +1000

fix links for user site
---
 site/src/site/sitemap-user.groovy | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/site/src/site/sitemap-user.groovy 
b/site/src/site/sitemap-user.groovy
index 5575c94..88e54ce 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -151,11 +151,7 @@ downloads {
 }
 version('3.0.0-beta-3') {
 stable false
-// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-3-installer.exe'
-}
-version('3.0.0-beta-2') {
-stable false
-windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-2-installer.exe'
+windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-3-installer.exe'
 }
 }
 distribution('Groovy 2.6') {
@@ -173,7 +169,7 @@ downloads {
 }
 version('2.5.8') {
 stable true
-// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.5.7-installer.exe'
+windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.5.8-installer.exe'
 }
 }
 distribution('Groovy 2.4') {



[groovy-website] branch asf-site updated: add snapcraft link

2019-08-07 Thread paulk
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 a859d78  add snapcraft link
a859d78 is described below

commit a859d78fb07f2951546b1bf72b688ba43aee1523
Author: Paul King 
AuthorDate: Thu Aug 8 14:37:00 2019 +1000

add snapcraft link
---
 site/src/site/pages/download.groovy | 9 +
 1 file changed, 9 insertions(+)

diff --git a/site/src/site/pages/download.groovy 
b/site/src/site/pages/download.groovy
index 64a29e4..1bba811 100644
--- a/site/src/site/pages/download.groovy
+++ b/site/src/site/pages/download.groovy
@@ -291,6 +291,15 @@ layout 'layouts/main.groovy', true,
 }
 article {
 p {
+a(href: 'https://snapcraft.io/', 
'SnapCraft')
+yield ' is "the app store for Linux". 
Groovy is supported in the '
+a(href: 'https://snapcraft.io/groovy', 
'store')
+yield ' or via the commandline:'
+}
+pre { code '$ sudo snap install groovy 
--classic' }
+}
+article {
+p {
 a(href: 'http://www.macports.org/', 
'MacPorts')
 yield ' is a system for managing tools 
on macOS:'
 }



[groovy-dev-site] branch asf-site updated: add windows installers

2019-08-07 Thread paulk
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-dev-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 9886ead  add windows installers
9886ead is described below

commit 9886eadaed7f963a6edfc2d420ef5013c7f82b92
Author: Paul King 
AuthorDate: Thu Aug 8 12:46:29 2019 +1000

add windows installers
---
 download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/download.html b/download.html
index 7b0b5de..55f50fe 100644
--- a/download.html
+++ b/download.html
@@ -60,7 +60,7 @@
  Improve this doc
 
  Download Download 2.5.8Ways to get 
Apache Groovy:Download a source or binary distribution.Use a package manager or bundle for 
your operating system.Refer to the 
appropriate Apache Groovy jars from your build tools [...]
+See below for verification information' 
onclick='window.location.href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-2.5.8.zip";'> Download 2.5.8Ways to get 
Apache Groovy:Download a source or binary distribution.Use a package manager or bundle for 
your operating system.Refer to the 
appropriate Apache Groovy jars from your build tools [...]
 
 
 



[groovy-website] branch asf-site updated: add windows installers

2019-08-07 Thread paulk
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 3047085  add windows installers
3047085 is described below

commit 3047085a491b1e2120a722cc17cd4942b1de241d
Author: Paul King 
AuthorDate: Thu Aug 8 12:43:15 2019 +1000

add windows installers
---
 site/src/site/sitemap-dev.groovy | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index a0b0759..1c7a697 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -81,11 +81,7 @@ downloads {
 }
 version('3.0.0-beta-3') {
 stable false
-// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-3-installer.exe'
-}
-version('3.0.0-beta-2') {
-stable false
-windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-2-installer.exe'
+windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-3-installer.exe'
 }
 }
 distribution('Groovy 2.6') {
@@ -103,7 +99,7 @@ downloads {
 }
 version('2.5.8') {
 stable true
-// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.5.7-installer.exe'
+windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.5.8-installer.exe'
 }
 }
 distribution('Groovy 2.4') {



svn commit: r35170 - in /release/groovy: 3.0.0-beta-1/ 3.0.0-beta-2/

2019-08-07 Thread paulk
Author: paulk
Date: Thu Aug  8 00:23:31 2019
New Revision: 35170

Log:
archive old releases

Removed:
release/groovy/3.0.0-beta-1/
release/groovy/3.0.0-beta-2/



svn commit: r35169 - /release/groovy/2.5.7/

2019-08-07 Thread paulk
Author: paulk
Date: Thu Aug  8 00:18:16 2019
New Revision: 35169

Log:
archive 2.5.7

Removed:
release/groovy/2.5.7/



[groovy] branch master updated: GROOVY-9059: use redirect in generics spec if redirect is placeholder

2019-08-07 Thread sunlan
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
 new 6cb248a  GROOVY-9059: use redirect in generics spec if redirect is 
placeholder
6cb248a is described below

commit 6cb248a4716d3ed02ec1ea14a25adc776a8a68b6
Author: Eric Milles 
AuthorDate: Tue Aug 6 13:22:36 2019 -0500

GROOVY-9059: use redirect in generics spec if redirect is placeholder
---
 .../codehaus/groovy/ast/tools/GenericsUtils.java   | 85 --
 .../codehaus/groovy/classgen/ExtendedVerifier.java | 68 +++--
 .../org/codehaus/groovy/classgen/Verifier.java |  8 +-
 src/test/groovy/bugs/Groovy9059.groovy | 70 ++
 .../{Groovy6742Bug.groovy => Groovy6742.groovy}| 60 ---
 5 files changed, 180 insertions(+), 111 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java 
b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
index b28771a..f9beb91 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GenericsUtils.java
@@ -22,7 +22,6 @@ import antlr.RecognitionException;
 import antlr.TokenStreamException;
 import groovy.lang.Tuple2;
 import groovy.transform.stc.IncorrectTypeHintException;
-import org.apache.groovy.util.SystemUtil;
 import org.codehaus.groovy.GroovyBugError;
 import org.codehaus.groovy.antlr.AntlrParserPlugin;
 import org.codehaus.groovy.antlr.parser.GroovyLexer;
@@ -58,7 +57,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 
 import static groovy.lang.Tuple.tuple;
-import static org.codehaus.groovy.ast.GenericsType.GenericsTypeName;
+import static org.apache.groovy.util.SystemUtil.getSystemPropertySafe;
 import static 
org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.getCorrectedClassNode;
 import static 
org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.implementsInterfaceOrIsSubclassOf;
 
@@ -145,8 +144,8 @@ public class GenericsUtils {
 return gt;
 }
 
-public static Map 
extractPlaceholders(ClassNode cn) {
-Map ret = new 
HashMap();
+public static Map 
extractPlaceholders(ClassNode cn) {
+Map ret = new HashMap<>();
 extractPlaceholders(cn, ret);
 return ret;
 }
@@ -158,7 +157,7 @@ public class GenericsUtils {
  * @param node the class node to check
  * @param map the generics type information collector
  */
-public static void extractPlaceholders(ClassNode node, 
Map map) {
+public static void extractPlaceholders(ClassNode node, 
Map map) {
 if (node == null) return;
 
 if (node.isArray()) {
@@ -184,7 +183,7 @@ public class GenericsUtils {
 for (int i = 0; i < redirectGenericsTypes.length; i++) {
 GenericsType redirectType = redirectGenericsTypes[i];
 if (redirectType.isPlaceholder()) {
-GenericsTypeName name = new 
GenericsTypeName(redirectType.getName());
+GenericsType.GenericsTypeName name = new 
GenericsType.GenericsTypeName(redirectType.getName());
 if (!map.containsKey(name)) {
 GenericsType value = parameterized[i];
 map.put(name, value);
@@ -316,7 +315,7 @@ public class GenericsUtils {
 if (type.isArray()) {
 return makeClassSafeWithGenerics(type.getComponentType(), 
genericTypes).makeArray();
 }
-GenericsType[] gtypes = GenericsType.EMPTY_ARRAY;
+GenericsType[] gtypes = EMPTY_GENERICS_ARRAY;
 if (genericTypes != null) {
 gtypes = new GenericsType[genericTypes.length];
 System.arraycopy(genericTypes, 0, gtypes, 0, gtypes.length);
@@ -325,6 +324,7 @@ public class GenericsUtils {
 }
 
 public static MethodNode correctToGenericsSpec(Map 
genericsSpec, MethodNode mn) {
+if (mn.getGenericsTypes() != null) genericsSpec = 
addMethodGenerics(mn, genericsSpec);
 ClassNode correctedType = correctToGenericsSpecRecurse(genericsSpec, 
mn.getReturnType());
 Parameter[] origParameters = mn.getParameters();
 Parameter[] newParameters = new Parameter[origParameters.length];
@@ -361,15 +361,19 @@ public class GenericsUtils {
 if (type.isGenericsPlaceHolder() && 
!exclusions.contains(type.getUnresolvedName())) {
 String name = type.getGenericsTypes()[0].getName();
 type = genericsSpec.get(name);
-if (type != null && type.isGenericsPlaceHolder() && 
type.getGenericsTypes() == null) {
-ClassNode placeholder = 
ClassHelper.makeWithoutCaching(type.getUnresolvedName());
-placeholder.setGenericsPlaceHolder(true);
-type = makeClassSafeWithGenerics(type, new 
GenericsType(placeholder));

[groovy-release] branch master updated: tweaks from latest release

2019-08-07 Thread sunlan
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy-release.git


The following commit(s) were added to refs/heads/master by this push:
 new cb2b6fd  tweaks from latest release
cb2b6fd is described below

commit cb2b6fd1f869b1d865285d4235ce8a72b5b7126c
Author: Daniel Sun 
AuthorDate: Wed Aug 7 16:52:59 2019 +

tweaks from latest release
---
 gradle/phase2.gradle | 3 +++
 gradlew  | 0
 2 files changed, 3 insertions(+)

diff --git a/gradle/phase2.gradle b/gradle/phase2.gradle
index 066becc..5cfd88d 100644
--- a/gradle/phase2.gradle
+++ b/gradle/phase2.gradle
@@ -124,6 +124,9 @@ task promoteOnBintray(dependsOn: jiraCheckPhase2) {
 }
 }
 
+sdkReleaseVersion.dependsOn promoteOnBintray
+
+
 task synchronizeWithMavenCentral(dependsOn: promoteOnBintray) {
 group = "Post-passed phase"
 description = "Syncs with Maven Central/Sonatype"
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755



[groovy-dev-site] branch asf-site updated: updated for latest releases

2019-08-07 Thread paulk
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-dev-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new fa6b556  updated for latest releases
fa6b556 is described below

commit fa6b556ae75bf9d12c576c3a4879a0b8676fb8f1
Author: Paul King 
AuthorDate: Thu Aug 8 02:42:01 2019 +1000

updated for latest releases
---
 .idea/groovy-dev-site.iml |   9 
 .idea/modules.xml |   8 +++
 .idea/vcs.xml |   6 +++
 .idea/workspace.xml   | 122 ++
 buildstatus.html  |   2 +-
 download.html |   6 +--
 faq.html  |   2 +-
 img/confs/apacheconNA.png | Bin 0 -> 117420 bytes
 img/confs/codeone.png | Bin 0 -> 13432 bytes
 index.html|   2 +-
 search.html   |   2 +-
 versioning.html   |   2 +-
 12 files changed, 153 insertions(+), 8 deletions(-)

diff --git a/.idea/groovy-dev-site.iml b/.idea/groovy-dev-site.iml
new file mode 100644
index 000..d6ebd48
--- /dev/null
+++ b/.idea/groovy-dev-site.iml
@@ -0,0 +1,9 @@
+
+
+  
+
+
+
+
+  
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000..691c31b
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+  
+
+  
+
+  
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+  
+
+  
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 000..d22e157
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,122 @@
+
+
+  
+
+
+
+
+
+
+  
+  
+
+  
+  
+
+  mailing-lists
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+  
+
+
+
+
+  
+  
+
+  
+
+
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+  1563621673792
+  
+  
+  1563621673792
+
+
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+
+  1.8
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
\ No newline at end of file
diff --git a/buildstatus.html b/buildstatus.html
index 7ecfa7c..38a7554 100644
--- a/buildstatus.html
+++ b/buildstatus.html
@@ -56,7 +56,7 @@
 
 
 
-
+
  Improve this doc
 
  Continuous integration
diff --git a/download.html b/download.html
index 72a6bb8..7b0b5de 100644
--- a/download.html
+++ b/download.html
@@ -56,11 +56,11 @@
 
 
 Download 
GroovyDistributionsOS/package manager installFrom your build tools
+
  Improve this doc
 
- Download Download 2.5.7Ways to get 
Apache Groovy:Download a source or binary distribution.Use a package manager or bundle for 
your operating system.Refer to the 
appropriate Apache Groovy jars from your build tools [...]
+ Download Download 2.5.8Ways to get 
Apache Groovy:Download a source or binary distribution.Use a package manager or bundle for 
your operating system.Refer to the 
appropriate Apache Groovy jars from your build tools [...]
 
 
 
diff --git a/faq.html b/faq.html
index 7a4f49b..86758ba 100644
--- a/faq.html
+++ b/faq.html
@@ -56,7 +56,7 @@
 
 
 DocumentationDocumentation for 
other versionsFAQ
-
+
  Improve this doc
 
  Frequently Asked QuestionsIs Groovy an Open Source project?Yes, 
Groovy is an Open Source programming language project, licensed under the Apache License v2.

[groovy-website] branch asf-site updated: fix versions

2019-08-07 Thread paulk
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 afabcfb  fix versions
afabcfb is described below

commit afabcfb303bd1c056a650d8738ae77bb6efcfcc7
Author: Paul King 
AuthorDate: Thu Aug 8 02:39:32 2019 +1000

fix versions
---
 site/src/site/sitemap-dev.groovy  | 4 ++--
 site/src/site/sitemap-user.groovy | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index 4b8baa7..a0b0759 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -81,11 +81,11 @@ downloads {
 }
 version('3.0.0-beta-3') {
 stable false
-// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-1-installer.exe'
+// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-3-installer.exe'
 }
 version('3.0.0-beta-2') {
 stable false
-//windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-2-installer.exe'
+windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-2-installer.exe'
 }
 }
 distribution('Groovy 2.6') {
diff --git a/site/src/site/sitemap-user.groovy 
b/site/src/site/sitemap-user.groovy
index 938c44e..5575c94 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -151,11 +151,11 @@ downloads {
 }
 version('3.0.0-beta-3') {
 stable false
-// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-1-installer.exe'
+// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-3-installer.exe'
 }
 version('3.0.0-beta-2') {
 stable false
-//windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-2-installer.exe'
+windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-2-installer.exe'
 }
 }
 distribution('Groovy 2.6') {



[groovy-website] 01/02: Release 2.5.8: update sitemap

2019-08-07 Thread sunlan
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git

commit 72442d774c360181045373588235f9e9f6efa981
Author: Daniel Sun 
AuthorDate: Wed Aug 7 15:17:04 2019 +

Release 2.5.8: update sitemap



[groovy-website] branch asf-site updated (b1d7f95 -> a0be331)

2019-08-07 Thread sunlan
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git.


from b1d7f95  release 3.0.0-beta-3
 new 72442d7  Release 2.5.8: update sitemap
 new a0be331  release 2.5.8

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/sitemap-dev.groovy  | 4 ++--
 site/src/site/sitemap-user.groovy | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)



[groovy-website] 02/02: release 2.5.8

2019-08-07 Thread sunlan
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git

commit a0be3319b5192100537a67b91aa442288939c396
Author: Daniel Sun 
AuthorDate: Wed Aug 7 15:53:45 2019 +

release 2.5.8
---
 site/src/site/sitemap-dev.groovy  | 4 ++--
 site/src/site/sitemap-user.groovy | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index 443aafd..4b8baa7 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -101,9 +101,9 @@ downloads {
 a(href: 'versioning.html', 'version')
 yield ' of Groovy.'
 }
-version('2.5.7') {
+version('2.5.8') {
 stable true
-windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.5.7-installer.exe'
+// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.5.7-installer.exe'
 }
 }
 distribution('Groovy 2.4') {
diff --git a/site/src/site/sitemap-user.groovy 
b/site/src/site/sitemap-user.groovy
index 7fc0d26..938c44e 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -87,7 +87,7 @@ documentation {
 '2.2.0', '2.2.1', '2.2.2',
 '2.3.0', '2.3.1', '2.3.2', '2.3.3', '2.3.4', '2.3.5', '2.3.6', 
'2.3.7', '2.3.8', '2.3.9', '2.3.10', '2.3.11',
 '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.5.0-rc-1', '2.5.0-rc-2', '2.5.0-rc-3', '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.0-rc-1', '2.5.0-rc-2', '2.5.0-rc-3', '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.6.0-alpha-1', '2.6.0-alpha-2', '2.6.0-alpha-3', '2.6.0-alpha-4',
 '3.0.0-alpha-1', '3.0.0-alpha-2', '3.0.0-alpha-3', 
'3.0.0-alpha-4', '3.0.0-beta-1', '3.0.0-beta-2',
 '3.0.0-beta-3'
@@ -171,9 +171,9 @@ downloads {
 a(href: 'versioning.html', 'version')
 yield ' of Groovy.'
 }
-version('2.5.7') {
+version('2.5.8') {
 stable true
-windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.5.7-installer.exe'
+// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-2.5.7-installer.exe'
 }
 }
 distribution('Groovy 2.4') {



svn commit: r35164 - in /release/groovy/2.5.8: ./ distribution/ sources/

2019-08-07 Thread sunlan
Author: sunlan
Date: Wed Aug  7 15:17:00 2019
New Revision: 35164

Log:
Releasing version 2.5.8

Added:
release/groovy/2.5.8/
release/groovy/2.5.8/distribution/
release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip   (with 
props)
release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip.asc
release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip.sha256
release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip   (with 
props)
release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip.asc
release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip.sha256
release/groovy/2.5.8/distribution/apache-groovy-sdk-2.5.8.zip   (with props)
release/groovy/2.5.8/distribution/apache-groovy-sdk-2.5.8.zip.asc
release/groovy/2.5.8/distribution/apache-groovy-sdk-2.5.8.zip.sha256
release/groovy/2.5.8/sources/
release/groovy/2.5.8/sources/apache-groovy-src-2.5.8.zip   (with props)
release/groovy/2.5.8/sources/apache-groovy-src-2.5.8.zip.asc
release/groovy/2.5.8/sources/apache-groovy-src-2.5.8.zip.sha256

Added: release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip
==
Binary file - no diff available.

Propchange: release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip
--
svn:mime-type = application/octet-stream

Added: release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip.asc
==
--- release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip.asc (added)
+++ release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip.asc Wed 
Aug  7 15:17:00 2019
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: BCPG v1.58
+
+iQIcBAABAgAGBQJdRIObAAoJEB/5bhDw4TcGBIsP+gLAKirjH7H7rVNzHB4TJpoJ
+WtbmdOMv3tODN3nsQxZZ1U2vw7S4nY7hdLPULsb8uLc/Zo9YklQUVCxRfllFAg2D
+IoR+vEjaIlLG5opyy/gz6OTFqg7zJxtZe+g5HxrG82jRtORW+C47DdRZTJ8eRbyk
+CU6pPOwhshk1tWO94g/MDE5xaassh+Nq0ETeIu2WjfmHGQq/FUkKuiPTZvxZ1xQ6
+MVofoqsp3PxBwpI+3p/mGO+m/KqRpUv7hnH1R3BpLQtG/qxyVo+oOg3ypTKYs1pN
+muahndmk5GTjO0M0/oN0ve/eJGwlOrIdK7MWiY0w3FndkdpiGYZ3JMR/hADInPSR
+y37TGvUrYdAdryQ+mlOG2Nmc0AwAckOUM4h2E5amA5mEcZ1riy6MY7bS485ePhft
+R9S8BoDBKyBJiI88CB2f2StvN+R8xFWU0YWvuyqvIOwj3PUcvaF2Z+Tc0VMkOCr9
+aLfpwqZmqt4iXczIJERKWAXN3iCUhg9MLj/cKfnBWYu4o2A8AISLjFzLCxQO6u8u
+S26bNefSB/wmgjdjlbjjivkt4oisZAsE1JnbicmbNq/xiXwIKmI24udU6HgBG4De
+1aeDAuZY/Epi8dHIIK+EnnGEOBdU/B+HRWGCxi0yPOVjKiooYyLaPNPoGdnY6pzH
+HYJxB1VxXD2eH47TFRJR
+=gx7p
+-END PGP SIGNATURE-

Added: release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip.sha256
==
--- release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip.sha256 
(added)
+++ release/groovy/2.5.8/distribution/apache-groovy-binary-2.5.8.zip.sha256 Wed 
Aug  7 15:17:00 2019
@@ -0,0 +1 @@
+49fb14b98f9fed1744781e4383cf8bff76440032f58eb5fabdc9e67a5daa8742

Added: release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip
==
Binary file - no diff available.

Propchange: release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip
--
svn:mime-type = application/octet-stream

Added: release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip.asc
==
--- release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip.asc (added)
+++ release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip.asc Wed Aug  
7 15:17:00 2019
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: BCPG v1.58
+
+iQIcBAABAgAGBQJdRIObAAoJEB/5bhDw4TcG1f0QAI/lCXmPa+S3Pq+hxLAYv5Ij
+ruigogx0B1vRLDRzLGzqI6mujlQEc2GmABK9URplNwAAUMNRSCri4OJuJJvybHOj
+d0yLEDLYYPvbP5GofByN9IRTwH+HgIPKXHeNfAqJ5gi9bGhDcsqR//SdREJwgz97
+qVpW9RAy4vTs+GdTs0HOtjMy10gDTAcCSY3IhQDR3KNdwHHUdETpKpby3d+J+wac
+U/aDXyAkPkWKFiO5J4bw7A46+NNmjYQo9r4RlapP8Vz2IXStOxKKDC/MwcX42dmy
+X64MOgwDCh61iJ7stVbGCCAfEYnqwjg9kVdRTQ354ClrYNdUor8j0ZNjH/PXIzB4
+sIsFCQFAlsMotmjV3vwWVlfkzIm7sDs/x3abWRVGQ/VWgnTKq5zPJcajyLFhPzec
+gce2g+oucmxK5xmel3LM7Vp+/ZfngGojcG5AArFwGPQQE4SIz1UTHBv9RyJrNkDa
+WyGfIoPl7eVaflo7eY8OWMuHPYnnayNbORlEAV3HnxELV+kZr4sf8DTvVErlDsxY
+f4zJNykqtdJ6Vr7OTKGUjcQKbnxDkBNCrzBT0mNKz1g8JKEB8r5CCRRZ8xsHG1Ij
+NfhdPxg3+nAAWc+Qqc2sG1UiglA8DMVFh2OhYFRoujz2RQ5uafnuWtmrcwpQ/sE4
+4eh5wLdv1dWkZ17Lh8rV
+=S9B4
+-END PGP SIGNATURE-

Added: release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip.sha256
==
--- release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip.sha256 
(added)
+++ release/groovy/2.5.8/distribution/apache-groovy-docs-2.5.8.zip.sha256 Wed 
Aug  7 15:

svn commit: r35165 - /dev/groovy/2.5.8/

2019-08-07 Thread sunlan
Author: sunlan
Date: Wed Aug  7 15:17:03 2019
New Revision: 35165

Log:
Deleting version 2.5.8 from the DEV staging area

Removed:
dev/groovy/2.5.8/



[groovy] branch GROOVY_2_5_X updated: Bump version on GROOVY_2_5_X branch

2019-08-07 Thread sunlan
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
 new 65309d5  Bump version on GROOVY_2_5_X branch
65309d5 is described below

commit 65309d5a86db3c5fde1e902ecee1b2115390b742
Author: Daniel Sun 
AuthorDate: Wed Aug 7 14:24:53 2019 +

Bump version on GROOVY_2_5_X branch
---
 gradle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 0f6f512..0025e5b 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 = 2.5.8-SNAPSHOT
+groovyVersion = 2.5.9-SNAPSHOT
 # bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 
only digits)
-groovyBundleVersion = 2.5.8.SNAPSHOT
+groovyBundleVersion = 2.5.9.SNAPSHOT
 
 gradle_version=4.10.3
 



[groovy-website] branch asf-site updated: release 3.0.0-beta-3

2019-08-07 Thread sunlan
This is an automated email from the ASF dual-hosted git repository.

sunlan 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 b1d7f95  release 3.0.0-beta-3
b1d7f95 is described below

commit b1d7f952cbcc4543bdcc6c8cc45422ee614b117e
Author: Daniel Sun 
AuthorDate: Wed Aug 7 12:50:59 2019 +

release 3.0.0-beta-3
---
 site/src/site/sitemap-dev.groovy  | 8 
 site/src/site/sitemap-user.groovy | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index bdce644..443aafd 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -79,13 +79,13 @@ downloads {
 a(href: 'versioning.html', 'version')
 yield ' of Groovy designed for JDK8+ and with the new Parrot 
parser enabled by default. Pre-stable versions are available:'
 }
-version('3.0.0-beta-2') {
+version('3.0.0-beta-3') {
 stable false
-//windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-2-installer.exe'
+// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-1-installer.exe'
 }
-version('3.0.0-beta-1') {
+version('3.0.0-beta-2') {
 stable false
-windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-1-installer.exe'
+//windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-2-installer.exe'
 }
 }
 distribution('Groovy 2.6') {
diff --git a/site/src/site/sitemap-user.groovy 
b/site/src/site/sitemap-user.groovy
index 3ad931f..7fc0d26 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -149,13 +149,13 @@ downloads {
 a(href: 'versioning.html', 'version')
 yield ' of Groovy designed for JDK8+ and with the new Parrot 
parser enabled by default. Pre-stable versions are available:'
 }
-version('3.0.0-beta-2') {
+version('3.0.0-beta-3') {
 stable false
-//windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-2-installer.exe'
+// windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-1-installer.exe'
 }
-version('3.0.0-beta-1') {
+version('3.0.0-beta-2') {
 stable false
-windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-1-installer.exe'
+//windowsInstaller 
'https://dl.bintray.com/groovy/Distributions/groovy-3.0.0-beta-2-installer.exe'
 }
 }
 distribution('Groovy 2.6') {



[groovy-website] 01/02: Release 3.0.0-beta-3: update sitemap

2019-08-07 Thread sunlan
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git

commit 4908982d05c5706a27d1530a0bc480ca66286583
Author: Daniel Sun 
AuthorDate: Wed Aug 7 12:26:51 2019 +

Release 3.0.0-beta-3: update sitemap



[groovy-website] 02/02: release 3.0.0-beta-3

2019-08-07 Thread sunlan
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git

commit 36f799d536503ef94d8a4c9b5e9fae79bf2a9055
Author: Daniel Sun 
AuthorDate: Wed Aug 7 12:34:12 2019 +

release 3.0.0-beta-3
---
 site/src/site/sitemap-user.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site/src/site/sitemap-user.groovy 
b/site/src/site/sitemap-user.groovy
index 44704ee..3ad931f 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -89,7 +89,8 @@ 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.5.0-rc-1', '2.5.0-rc-2', '2.5.0-rc-3', '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.6.0-alpha-1', '2.6.0-alpha-2', '2.6.0-alpha-3', '2.6.0-alpha-4',
-'3.0.0-alpha-1', '3.0.0-alpha-2', '3.0.0-alpha-3', 
'3.0.0-alpha-4', '3.0.0-beta-1', '3.0.0-beta-2'
+'3.0.0-alpha-1', '3.0.0-alpha-2', '3.0.0-alpha-3', 
'3.0.0-alpha-4', '3.0.0-beta-1', '3.0.0-beta-2',
+'3.0.0-beta-3'
 ])
 
 section('Getting started','fa-graduation-cap') {



[groovy-website] branch asf-site updated (3530ef3 -> 36f799d)

2019-08-07 Thread sunlan
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git.


from 3530ef3  updated events
 new 4908982  Release 3.0.0-beta-3: update sitemap
 new 36f799d  release 3.0.0-beta-3

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/sitemap-user.groovy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)



svn commit: r35157 - in /release/groovy/3.0.0-beta-3: ./ distribution/ sources/

2019-08-07 Thread sunlan
Author: sunlan
Date: Wed Aug  7 12:26:46 2019
New Revision: 35157

Log:
Releasing version 3.0.0-beta-3

Added:
release/groovy/3.0.0-beta-3/
release/groovy/3.0.0-beta-3/distribution/

release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip  
 (with props)

release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip.asc

release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip.sha256

release/groovy/3.0.0-beta-3/distribution/apache-groovy-docs-3.0.0-beta-3.zip   
(with props)

release/groovy/3.0.0-beta-3/distribution/apache-groovy-docs-3.0.0-beta-3.zip.asc

release/groovy/3.0.0-beta-3/distribution/apache-groovy-docs-3.0.0-beta-3.zip.sha256
release/groovy/3.0.0-beta-3/distribution/apache-groovy-sdk-3.0.0-beta-3.zip 
  (with props)

release/groovy/3.0.0-beta-3/distribution/apache-groovy-sdk-3.0.0-beta-3.zip.asc

release/groovy/3.0.0-beta-3/distribution/apache-groovy-sdk-3.0.0-beta-3.zip.sha256
release/groovy/3.0.0-beta-3/sources/
release/groovy/3.0.0-beta-3/sources/apache-groovy-src-3.0.0-beta-3.zip   
(with props)
release/groovy/3.0.0-beta-3/sources/apache-groovy-src-3.0.0-beta-3.zip.asc

release/groovy/3.0.0-beta-3/sources/apache-groovy-src-3.0.0-beta-3.zip.sha256

Added: 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip
==
Binary file - no diff available.

Propchange: 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip
--
svn:mime-type = application/octet-stream

Added: 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip.asc
==
--- 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip.asc
 (added)
+++ 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip.asc
 Wed Aug  7 12:26:46 2019
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: BCPG v1.61
+
+iQIcBAABAgAGBQJdRHccAAoJEB/5bhDw4TcGN10P/0QsfiTfBSmHt1xhUWA3fACS
+6BEresS2ItdlhIbzmnN0g8lyb/z5SNs2ds26OpmR/jAlFY4/LvMGYhL8IZQ7UBNK
+gURbNQ1d4qDVXn34/31b9DOps5CVzQin4UQI1CRonERanCqw+Zh2anKkum+nTTan
+Egq9z5sOV3I/cbbk9MFFPTqLbg8m2ODDvSYoYPFU65hfHfWa+MS/+rUm056w5E9O
+uKSWbd7ZoORvJrv8MvvL9XZzoQFf50aGTtebdZjsrf/cHUDtWlP8ch5HeAjtpj/G
+MvpSCV/rrhteBhIVgN0UPAVT5WH9Agx/Jax/l2N9csPkNUGL8UYuSE/7cl769aGm
+2JOCdEpsvbOE2rfgHIYQvFy0KAbN+UsKyT7J631bVr/rJX/IqqGWKoUFSKCpK80l
+hBFa+/zzGP3KLWxOV+b8eMG6lR9vHi8GD4SkjJjb9Gk+C+Ef3oZincE8pOBvaaq0
+yArGhcCJIUFKcm3N91YuQ0+jWjVNfGPqSAnRwm303pTXBGaCFnK3fgbVRRMnMuE3
+C6gPw8hMRo7SjWzKyQatjZdfE+smPAhQrmR/yh4ZRD1kTONm8SElePxZtIxmve3h
+cwqusAgKanrZN8cIipjZjGBzeDOoLxy5MA69wCcXWfEa8lhYkEiO1fIZguO5S4/p
+10ozvCmQRGr7jxvy+8mx
+=I5Nl
+-END PGP SIGNATURE-

Added: 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip.sha256
==
--- 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip.sha256
 (added)
+++ 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-binary-3.0.0-beta-3.zip.sha256
 Wed Aug  7 12:26:46 2019
@@ -0,0 +1 @@
+4145f1a7dc0312c97c5cdc5456f57f3feea6a6ff9b6fcb83a01f8e087f3520b1

Added: 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-docs-3.0.0-beta-3.zip
==
Binary file - no diff available.

Propchange: 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-docs-3.0.0-beta-3.zip
--
svn:mime-type = application/octet-stream

Added: 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-docs-3.0.0-beta-3.zip.asc
==
--- 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-docs-3.0.0-beta-3.zip.asc
 (added)
+++ 
release/groovy/3.0.0-beta-3/distribution/apache-groovy-docs-3.0.0-beta-3.zip.asc
 Wed Aug  7 12:26:46 2019
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: BCPG v1.61
+
+iQIcBAABAgAGBQJdRHcdAAoJEB/5bhDw4TcGw+wP/0A0oYDB6wWAY88jb6RmYuXD
+MJlu5F1mADdYhhwuL2iVUkFXa+ETt1nY7Eb3aSE05b2mQ8fh3L3JRdT0UrAevCdm
+n39P90Sm6Tvatvpoo4l+u8CUeZsr/RrM4+nclypBT16t3fo5rXGFDMsgpIYN5zZY
+K3+WS2huxqz6+xprXb2pAIT1v9g4Aw3QJYKovffz71DAuyI0cheDAtW8OTNaY7Ol
+MZIqN/jXckm9wvnMbtU/x0t6aeSZeR9uAcT1RZbRZOP2weIbv6Hqms2WSiYkcKZ0
+qqv2AcZXzGpAihIVPa3u1oYtxqwHm+rHaakFuWHeh1W+o/01H+rlMIVItIPQ/pdd
+P6GvdO+Ou0JDMywNarUUCqzlnQXL7ZEvc/w23+6y2tCmAUpAH0BimEws/OEte3Jz
+83dRpNVigw9+lJx0M3BLP9bt8rsPPO2KPQ7aLWHQWVGdgfqZnVhBhS81Hf5la3FF
+bw0uOfrh4UrNqZE5dBEc0ndr6KfWBoiFw7Lj6Bq0LFw+s6r3izENvJABBGPWilnX
+3s7DSdKDKaMhamC6pv0r2znKJKWakGQM2/I9X3bIywnllZwt9eg4DcXWGoh2/c60
+0qcoTi81ZyBpzmFuCViIhVe2KZDY8LFrXBDw3pUurdodMIsF

svn commit: r35158 - /dev/groovy/3.0.0-beta-3/

2019-08-07 Thread sunlan
Author: sunlan
Date: Wed Aug  7 12:26:50 2019
New Revision: 35158

Log:
Deleting version 3.0.0-beta-3 from the DEV staging area

Removed:
dev/groovy/3.0.0-beta-3/



[groovy-website] branch asf-site updated: updated events

2019-08-07 Thread paulk
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 3530ef3  updated events
3530ef3 is described below

commit 3530ef327945c7b4f2bf170bd8ade319021e78c6
Author: Paul King 
AuthorDate: Wed Aug 7 21:40:29 2019 +1000

updated events
---
 site/src/site/assets/img/confs/apacheconNA.png | Bin 0 -> 117420 bytes
 site/src/site/assets/img/confs/codeone.png | Bin 0 -> 13432 bytes
 site/src/site/sitemap-user.groovy  |  48 -
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/site/src/site/assets/img/confs/apacheconNA.png 
b/site/src/site/assets/img/confs/apacheconNA.png
new file mode 100644
index 000..6d2b317
Binary files /dev/null and b/site/src/site/assets/img/confs/apacheconNA.png 
differ
diff --git a/site/src/site/assets/img/confs/codeone.png 
b/site/src/site/assets/img/confs/codeone.png
new file mode 100644
index 000..72d778f
Binary files /dev/null and b/site/src/site/assets/img/confs/codeone.png differ
diff --git a/site/src/site/sitemap-user.groovy 
b/site/src/site/sitemap-user.groovy
index db00cc9..44704ee 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -118,9 +118,9 @@ documentation {
 }
 
 section ('Tools','fa-gears') {
-item 'groovyc — the Groovy compiler',   'groovyc', 
 'tools-groovyc'
-item 'groovysh — the Groovy command -like shell',   'groovysh',
 'groovysh'
-item 'groovyConsole — the Groovy Swing console','groovyconsole',   
 'groovy-console'
+item 'groovyc - the Groovy compiler',   'groovyc', 
 'tools-groovyc'
+item 'groovysh - the Groovy repl-like shell',   'groovysh',
 'groovysh'
+item 'groovyConsole - the Groovy Swing console','groovyconsole',   
 'groovy-console'
 item 'IDE integration', 'ides', 'tools-ide'
 }
 
@@ -252,42 +252,38 @@ ecosystem {
 
 allEvents {
 // Note that the event image should be 257x180 to look nice
-event('Devnexus-2GM') {
-location 'Atlanta, GA, USA'
-date 'Pre conference: March 4-5, Conference March 6-8'
-url 'https://devnexus.com/2gm-home'
-logo 'img/confs/devnexus-2gm.png'
+event('ApacheCon-NA') {
+location 'Las Vegas, NV, USA'
+date 'September 9-12, 2019'
+url 'https://www.apachecon.com/acna19/'
+logo 'img/confs/apacheconNA.png'
 description '''
 
-For its 2019 conference, Devnexus has teamed up with the 2GM 
(Groovy, Grails, and Micronaut) communities, in furtherance of its mission, to 
promote and support open source values and technologies.
+Groovy highlights: Apache Groovy Update and Roadmap, possibly some 
Data Science with Groovy plus some planned hackerthon/BOF/barcamp activities.
 
+'''
+}
+event('Oracle Code One') {
+location 'Moscone Center, San Francisco'
+date 'September 16-19, 2019'
+url 'https://www.oracle.com/code-one/'
+logo 'img/confs/codeone.png'
+description '''
 
-Pre-Conference Training Event: MICRONAUT FROM IOT TO GCP 
-'''
-}
-event('Greach: The Groovy Spanish Conference') {
-location 'Madrid, Spain'
-date 'March 28 - 30, 2019'
-url 'http://greachconf.com'
-logo 'img/confs/greach.png'
-description '''
-Android + JVM langs + JVM frameworks conference in Madrid, 
Spain with 100% English talks.
-
-
-Greach is a community conference intended for networking and 
collaboration in the developer community.
-
-'''
+Groovy highlights: Talks on Micronaut, Spock, Venkat's cool JVM 
things talk
+
+'''
 }
 event('GR8Conf EU') {
 location 'Copenhagen, Denmark'
-date 'May 27 - 29, 2019'
+date 'May/June, 2020'
 url 'http://gr8conf.eu/'
 logo 'img/confs/gr8confeu.png'
 description '''
 
 Groovy, Grails, and related technologies have seen astounding 
growth in interest and adoption over the past few years, and with good reason.
 
-GR8Conf is a series of conferences founded to spread the word 
worldwide. The 2018 GR8Conf Europe was the 10th anniversary of the conference 
but expect even more excitement in 2019!
+GR8Conf is a series of conferences founded to spread the word 
worldwide. The 2020 GR8Conf Europe will be the 12th anniversary of the 
conference. Expect some exciting content!
 
 
 GR8Conf is an independent, affordable series of conferences and 
covers All Things Groovy