[groovy] branch master updated: Trivial edit
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 f2ce106 Trivial edit
f2ce106 is described below
commit f2ce1064b356a4ebd41be1ca46336228049352cf
Author: Daniel Sun
AuthorDate: Fri Dec 4 07:41:06 2020 +0800
Trivial edit
---
src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
b/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
index 8419bd1..dcda3d8 100644
--- a/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
+++ b/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
@@ -120,6 +120,11 @@ public interface GroovyCodeVisitor {
default void visitEmptyStatement(EmptyStatement statement) {}
+default void visit(Statement statement) {
+if (null == statement) return;
+statement.visit(this);
+}
+
//--
// expressions
@@ -203,11 +208,6 @@ public interface GroovyCodeVisitor {
if (list != null) list.forEach(expr -> expr.visit(this));
}
-default void visit(Statement statement) {
-if (null == statement) return;
-statement.visit(this);
-}
-
default void visit(Expression expression) {
if (null == expression) return;
expression.visit(this);
[groovy-dev-site] branch asf-site updated: 2020/12/03 20:20:38: Generated dev website from groovy-website@113e6df
This is an automated email from the ASF dual-hosted git repository. git-site-role 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 f5872c3 2020/12/03 20:20:38: Generated dev website from groovy-website@113e6df f5872c3 is described below commit f5872c37c7ff4805ffde00359690f842ab7eb4b9 Author: jenkins AuthorDate: Thu Dec 3 20:20:38 2020 + 2020/12/03 20:20:38: Generated dev website from groovy-website@113e6df --- download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download.html b/download.html index fefc2f8..153d8a0 100644 --- a/download.html +++ b/download.html @@ -60,7 +60,7 @@ Improve this doc Download Download 3.0.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 [...] +See below for verification information' onclick='window.location.href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.7.zip;'> Download 3.0.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 [...]
[groovy] branch master updated: Tweak the general visiting methods
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 ac96f6b Tweak the general visiting methods
ac96f6b is described below
commit ac96f6b574129fe7ab13cbebd23d7a1931409d50
Author: Daniel Sun
AuthorDate: Fri Dec 4 00:20:20 2020 +0800
Tweak the general visiting methods
---
src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
b/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
index ba705d3..8419bd1 100644
--- a/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
+++ b/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
@@ -68,6 +68,7 @@ import org.codehaus.groovy.ast.stmt.ExpressionStatement;
import org.codehaus.groovy.ast.stmt.ForStatement;
import org.codehaus.groovy.ast.stmt.IfStatement;
import org.codehaus.groovy.ast.stmt.ReturnStatement;
+import org.codehaus.groovy.ast.stmt.Statement;
import org.codehaus.groovy.ast.stmt.SwitchStatement;
import org.codehaus.groovy.ast.stmt.SynchronizedStatement;
import org.codehaus.groovy.ast.stmt.ThrowStatement;
@@ -202,8 +203,13 @@ public interface GroovyCodeVisitor {
if (list != null) list.forEach(expr -> expr.visit(this));
}
-default void visit(ASTNode astNode) {
-if (null == astNode) return;
-astNode.visit(this);
+default void visit(Statement statement) {
+if (null == statement) return;
+statement.visit(this);
+}
+
+default void visit(Expression expression) {
+if (null == expression) return;
+expression.visit(this);
}
}
[groovy] branch master updated: Validate unknown clause in GINQ
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 3f440bc Validate unknown clause in GINQ
3f440bc is described below
commit 3f440bc89502fb46d35db463e8490d3cc8e0e9e7
Author: Daniel Sun
AuthorDate: Thu Dec 3 23:06:41 2020 +0800
Validate unknown clause in GINQ
---
.../org/codehaus/groovy/ast/GroovyCodeVisitor.java | 5
.../org/apache/groovy/ginq/dsl/GinqAstBuilder.java | 22 +-
.../groovy/ginq/dsl/expression/GinqExpression.java | 35 ++
.../groovy/ginq/dsl/expression/JoinExpression.java | 2 +-
.../ginq/provider/collection/GinqAstWalker.groovy | 10 ++-
.../org/apache/groovy/ginq/GinqErrorTest.groovy| 13
6 files changed, 84 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
b/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
index be45610..ba705d3 100644
--- a/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
+++ b/src/main/java/org/codehaus/groovy/ast/GroovyCodeVisitor.java
@@ -201,4 +201,9 @@ public interface GroovyCodeVisitor {
default void visitListOfExpressions(List list) {
if (list != null) list.forEach(expr -> expr.visit(this));
}
+
+default void visit(ASTNode astNode) {
+if (null == astNode) return;
+astNode.visit(this);
+}
}
diff --git
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/GinqAstBuilder.java
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/GinqAstBuilder.java
index 5ab1856..4d15e91 100644
---
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/GinqAstBuilder.java
+++
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/GinqAstBuilder.java
@@ -44,6 +44,7 @@ import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.syntax.Types;
import java.util.ArrayDeque;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Deque;
import java.util.HashSet;
@@ -64,6 +65,8 @@ public class GinqAstBuilder extends CodeVisitorSupport
implements SyntaxErrorRep
this.sourceUnit = sourceUnit;
}
+private final List ignoredMethodCallExpressionList =
new ArrayList<>();
+
public GinqExpression getGinqExpression() {
if (null == latestGinqExpression && !ginqExpressionStack.isEmpty()) {
GinqExpression latestGinqExpression = ginqExpressionStack.peek();
@@ -71,6 +74,20 @@ public class GinqAstBuilder extends CodeVisitorSupport
implements SyntaxErrorRep
latestGinqExpression.getLineNumber(),
latestGinqExpression.getColumnNumber()));
}
+latestGinqExpression.visit(new CodeVisitorSupport() {
+@Override
+public void visitMethodCallExpression(MethodCallExpression call) {
+ignoredMethodCallExpressionList.remove(call);
+super.visitMethodCallExpression(call);
+}
+});
+
+if (!ignoredMethodCallExpressionList.isEmpty()) {
+MethodCallExpression methodCallExpression =
ignoredMethodCallExpressionList.get(0);
+this.collectSyntaxError(new GinqSyntaxError("Unknown clause: " +
methodCallExpression.getMethodAsString(),
+methodCallExpression.getLineNumber(),
methodCallExpression.getColumnNumber()));
+}
+
return latestGinqExpression;
}
@@ -93,7 +110,10 @@ public class GinqAstBuilder extends CodeVisitorSupport
implements SyntaxErrorRep
super.visitMethodCallExpression(call);
final String methodName = call.getMethodAsString();
-if (!KEYWORD_SET.contains(methodName)) return;
+if (!KEYWORD_SET.contains(methodName)) {
+ignoredMethodCallExpressionList.add(call);
+return;
+}
if (KW_FROM.equals(methodName)) {
final GinqExpression ginqExpression = new GinqExpression();
diff --git
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/GinqExpression.java
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/GinqExpression.java
index 9163b5d..3e6b599 100644
---
a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/GinqExpression.java
+++
b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/dsl/expression/GinqExpression.java
@@ -19,6 +19,7 @@
package org.apache.groovy.ginq.dsl.expression;
import org.apache.groovy.ginq.dsl.GinqAstVisitor;
+import org.codehaus.groovy.ast.GroovyCodeVisitor;
import java.util.ArrayList;
import java.util.List;
@@ -52,6 +53,40 @@ public class GinqExpression extends AbstractGinqExpression {
private SelectExpression selectExpression;
@Override
+public void visit(GroovyCodeVisitor visitor)
[groovy] branch GROOVY_3_0_X updated: Minor tweak for `BigDecimal` and `BigInteger`
This is an automated email from the ASF dual-hosted git repository.
sunlan 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 92dc8c8 Minor tweak for `BigDecimal` and `BigInteger`
92dc8c8 is described below
commit 92dc8c8d06e82059339c0daa8305c2b297ffa0ab
Author: Daniel Sun
AuthorDate: Thu Dec 3 21:13:11 2020 +0800
Minor tweak for `BigDecimal` and `BigInteger`
---
src/main/java/groovy/lang/NumberRange.java | 13 +
src/main/java/groovy/lang/ObjectRange.java | 5 ++--
.../stdclasses/BigDecimalCachedClass.java | 12 ++--
.../groovy/runtime/DefaultGroovyMethods.java | 33 +-
.../typehandling/DefaultTypeTransformation.java| 14 ++---
.../groovy/runtime/typehandling/NumberMath.java| 8 +-
6 files changed, 28 insertions(+), 57 deletions(-)
diff --git a/src/main/java/groovy/lang/NumberRange.java
b/src/main/java/groovy/lang/NumberRange.java
index a58dd1b..11f2ab3 100644
--- a/src/main/java/groovy/lang/NumberRange.java
+++ b/src/main/java/groovy/lang/NumberRange.java
@@ -21,6 +21,7 @@ package groovy.lang;
import org.codehaus.groovy.runtime.InvokerHelper;
import org.codehaus.groovy.runtime.IteratorClosureAdapter;
import org.codehaus.groovy.runtime.RangeInfo;
+import org.codehaus.groovy.runtime.typehandling.NumberMath;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -418,16 +419,16 @@ public class NumberRange extends AbstractList
implements Range
implements Range
implements Range= 0) {
for (BigDecimal i = self; i.compareTo(to1) >= 0; i =
i.subtract(one)) {
closure.call(i);
@@ -16545,9 +16545,9 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
public static void step(Number self, Number to, Number stepNumber, Closure
closure) {
if (self instanceof BigDecimal || to instanceof BigDecimal ||
stepNumber instanceof BigDecimal) {
final BigDecimal zero = BigDecimal.valueOf(0, 1); // Same as
"0.0".
-BigDecimal self1 = (self instanceof BigDecimal) ? (BigDecimal)
self : new BigDecimal(self.toString());
-BigDecimal to1 = (to instanceof BigDecimal) ? (BigDecimal) to :
new BigDecimal(to.toString());
-BigDecimal stepNumber1 = (stepNumber instanceof BigDecimal) ?
(BigDecimal) stepNumber : new BigDecimal(stepNumber.toString());
+BigDecimal self1 = NumberMath.toBigDecimal(self);
+BigDecimal to1 = NumberMath.toBigDecimal(to);
+BigDecimal stepNumber1 = NumberMath.toBigDecimal(stepNumber);
if (stepNumber1.compareTo(zero) > 0 && to1.compareTo(self1) > 0) {
for (BigDecimal i = self1; i.compareTo(to1) < 0; i =
i.add(stepNumber1)) {
closure.call(i);
@@ -16981,16 +16981,7 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
* @since 1.0
*/
public static BigDecimal toBigDecimal(Number self) {
-// Quick method for scalars.
-if ((self instanceof Long)
-|| (self instanceof Integer)
-|| (self instanceof Short)
-|| (self instanceof Byte))
-{
-return BigDecimal.valueOf(self.longValue());
-}
-
-return new BigDecimal(self.toString());
+return NumberMath.toBigDecimal(self);
}
/**
@@ -17030,17 +17021,7 @@ public class DefaultGroovyMethods extends
DefaultGroovyMethodsSupport {
* @since 1.0
*/
public static BigInteger toBigInteger(Number self) {
-if (self instanceof BigInteger) {
-return (BigInteger) self;
-} else if (self instanceof BigDecimal) {
-return ((BigDecimal) self).toBigInteger();
-} else if (self instanceof Double) {
-return new BigDecimal((Double)self).toBigInteger();
-} else if (self instanceof Float) {
-return new BigDecimal((Float)self).toBigInteger();
-} else {
-return new BigInteger(Long.toString(self.longValue()));
-}
+return NumberMath.toBigInteger(self);
}
// Boolean based methods
diff --git
a/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
b/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
index d2e72c2..ec42a9d 100644
---
a/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
+++
b/src/main/java/org/codehaus/groovy/runtime/typehandling/DefaultTypeTransformation.java
@@ -309,20 +309,10 @@ public class DefaultTypeTransformation {
return answer;
}
if (type == BigDecimal.class) {
-if (n instanceof Float || n instanceof Double) {
-return new BigDecimal(n.doubleValue());
-
svn commit: r44823 - /release/groovy/3.0.6/
Author: paulk Date: Thu Dec 3 13:07:20 2020 New Revision: 44823 Log: archive 3.0.6 Removed: release/groovy/3.0.6/
svn commit: r44822 - /release/groovy/2.5.13/
Author: paulk Date: Thu Dec 3 13:05:29 2020 New Revision: 44822 Log: archive 2.5.13 Removed: release/groovy/2.5.13/
svn commit: r44821 - /release/groovy/2.4.20/
Author: paulk Date: Thu Dec 3 13:04:37 2020 New Revision: 44821 Log: archive 2.4.20 Removed: release/groovy/2.4.20/
svn commit: r44820 - /dev/groovy/3.0.7/
Author: paulk Date: Thu Dec 3 12:54:32 2020 New Revision: 44820 Log: Deleting version 3.0.7 from the DEV staging area Removed: dev/groovy/3.0.7/
svn commit: r44819 - in /release/groovy/3.0.7: ./ distribution/ sources/
Author: paulk Date: Thu Dec 3 12:54:27 2020 New Revision: 44819 Log: Releasing version 3.0.7 Added: release/groovy/3.0.7/ release/groovy/3.0.7/distribution/ release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip (with props) release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip.asc release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip.sha256 release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip (with props) release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip.asc release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip.sha256 release/groovy/3.0.7/distribution/apache-groovy-sdk-3.0.7.zip (with props) release/groovy/3.0.7/distribution/apache-groovy-sdk-3.0.7.zip.asc release/groovy/3.0.7/distribution/apache-groovy-sdk-3.0.7.zip.sha256 release/groovy/3.0.7/sources/ release/groovy/3.0.7/sources/apache-groovy-src-3.0.7.zip (with props) release/groovy/3.0.7/sources/apache-groovy-src-3.0.7.zip.asc release/groovy/3.0.7/sources/apache-groovy-src-3.0.7.zip.sha256 Added: release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip == Binary file - no diff available. Propchange: release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip -- svn:mime-type = application/octet-stream Added: release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip.asc == --- release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip.asc (added) +++ release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip.asc Thu Dec 3 12:54:27 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.64 + +iQIcBAABCgAGBQJfxJXTAAoJEGplF2oPsc0L3IYQAJLjY7g6gSGIOHwQtmyEFKhB +Z1VsPm2rkZFNTWRk6QW+zY7bGu+CnQIsMkCghFKHssemvJTwWrJ42nveDqHXD9lc +bsrXG3yTasdYnCGnKuFzUewKeZftn/bq1wh1AmMGcYRM3hL3J4sFyW2bmOkWq95m +PfPIdlZhottdk1xZPuhaRzbGXR6aQ+KxkDhU5ee5K9RaJsUnXgg8ScKwyGD1Ca5Z +7/ozHgZC+Hu+mtl7MEjMak3NQznQRrMP2mGKvY7nTemw4JhDw/TbGdNLBX/JIXdI +17RQ11Cibp5d9KprXezWBIrp57bOPUKxMQ+C4pJJsza7QaR0tk/MEKC96Bv6SMAB +nTJuPK0bTdvjM9PfdOqQQOx5riLzznYDb2VWLGyHjMvKUwaIBmZsFTId6lkbrPx6 +jgkHycI7koVdoFRRMs7IhvuzTfExr2ciEukKb8pB1QU5Ez1a4EkXwSoGQvuBXqXg +WTQ8ObcuPaV/BO6aY+rivQcpy0j0d6VcW4zC7019JoRCf/3WBELrvfZYFqsy7NDn +BQPquJNg3Yma4tdCGnmAx/ycTKWgwZzab2ucghuf8HArYyqTVocGlnJfmFYY8lhJ +kI4RQdHWobHI+LC7YNqwwLPo95+Z9k9xcS2oACOTFO98TutGGGohFgjglc5YLJhs +NHfmb/X9BPDW71bJtUz3 +=Bj03 +-END PGP SIGNATURE- Added: release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip.sha256 == --- release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip.sha256 (added) +++ release/groovy/3.0.7/distribution/apache-groovy-binary-3.0.7.zip.sha256 Thu Dec 3 12:54:27 2020 @@ -0,0 +1 @@ +b9e2041cb83a963922f6761a0b037c5784670616632142b8d7002b7c3a96b7f5 Added: release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip == Binary file - no diff available. Propchange: release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip -- svn:mime-type = application/octet-stream Added: release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip.asc == --- release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip.asc (added) +++ release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip.asc Thu Dec 3 12:54:27 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.64 + +iQIcBAABCgAGBQJfxJXTAAoJEGplF2oPsc0LiJQQAKdtAMmYllx116fZnX9Se4MR +QirFXGqOhmeD9FvaMVfXaE6bk7x8oDaYJz5T9FEwEvkCSKIJH8FvMYoX5DtnPhcx +U1ECWpSXRY2iIiVgd3uIwYih2HFJ39DM+NrB7Z3AiNS0hOoQzrkamTJjMEh+SRrE +Bn4xnScRlyCcbvhfw5W6igU6eWMMVGo6blGkFRhfjWn2Z2auBnLtJoQ8hCRt5Efn +c+l+9eNDnEylSMgkZQWly8qAftYAt90ApBouatjCaN4i5e7igWWLPmQWtWzYqR5Z +EhhmLrWMmsH+wZQOkAe4pcboHZyWBIg2Scif+g/1fmn1v4q7qcoGO8dxHd+W7AoN +GMmaopcR5UlJwFnUvLxheJI/oATiFjc9KNbL3cv3YZwn/y1xrXzJqQBSF52AlQT5 +99njAz1CypPe2kLXqrUUv3sZLKZ7esGvl4Lbyg9cQunL4/PqO0xzr7vf3G0f8YuI +m9Te6wqBW88ipqHHYp2Dq+F1DnF9MKwHrVGOHT5PZxHbg8jxbI/hAFMOkcoq1arB +bTp2vd3X3zPXK/rIwt7hOBn5dCd/tQ/D0nd5VccI3jP5h+ns1o9hIPI8rNlfi9Le +UcBubt20+fO+rUHtNUI1LodLFO5dLIk/ohFT540OdbbjMu3ZCJRn5TPIQNY2D1wl +YqDPMMZ+xsLCDcumcS1Y +=7SGV +-END PGP SIGNATURE- Added: release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip.sha256 == --- release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip.sha256 (added) +++ release/groovy/3.0.7/distribution/apache-groovy-docs-3.0.7.zip.sha256 Thu Dec 3
[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 85b3736 Bump version on GROOVY_3_0_X branch
85b3736 is described below
commit 85b37360c7ed15c97ec2159fa2f6cb92007b7623
Author: Paul King
AuthorDate: Thu Dec 3 21:58:04 2020 +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 198a5ef..c9eb9a4 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.7-SNAPSHOT
+groovyVersion = 3.0.8-SNAPSHOT
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3
only digits)
-groovyBundleVersion = 3.0.7.SNAPSHOT
+groovyBundleVersion = 3.0.8.SNAPSHOT
gradle_version=6.7.1
svn commit: r44817 - /dev/groovy/2.5.14/
Author: paulk Date: Thu Dec 3 11:55:08 2020 New Revision: 44817 Log: Deleting version 2.5.14 from the DEV staging area Removed: dev/groovy/2.5.14/
svn commit: r44816 - in /release/groovy/2.5.14: ./ distribution/ sources/
Author: paulk Date: Thu Dec 3 11:55:02 2020 New Revision: 44816 Log: Releasing version 2.5.14 Added: release/groovy/2.5.14/ release/groovy/2.5.14/distribution/ release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip (with props) release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip.asc release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip.sha256 release/groovy/2.5.14/distribution/apache-groovy-docs-2.5.14.zip (with props) release/groovy/2.5.14/distribution/apache-groovy-docs-2.5.14.zip.asc release/groovy/2.5.14/distribution/apache-groovy-docs-2.5.14.zip.sha256 release/groovy/2.5.14/distribution/apache-groovy-sdk-2.5.14.zip (with props) release/groovy/2.5.14/distribution/apache-groovy-sdk-2.5.14.zip.asc release/groovy/2.5.14/distribution/apache-groovy-sdk-2.5.14.zip.sha256 release/groovy/2.5.14/sources/ release/groovy/2.5.14/sources/apache-groovy-src-2.5.14.zip (with props) release/groovy/2.5.14/sources/apache-groovy-src-2.5.14.zip.asc release/groovy/2.5.14/sources/apache-groovy-src-2.5.14.zip.sha256 Added: release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip == Binary file - no diff available. Propchange: release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip -- svn:mime-type = application/octet-stream Added: release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip.asc == --- release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip.asc (added) +++ release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip.asc Thu Dec 3 11:55:02 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.58 + +iQIcBAABAgAGBQJfxIdmAAoJEGplF2oPsc0L+H4QAIm/Yw4JWCfUBIRfUvf4WS3B +aolBoshDptOubML67MOlnqUUZrqjUR4ckrkYYnaE7788NSl8ATLEaeVV0vgM1P31 +tnuwEfMuLfyrxsfMVTitFrpSYD9rDFTQ6s0yJwtU9cGFYntHHH2U0N610TJi8Rgy +UXDit3W35MlkjVujlnYpPnt0z8VtYgNmC3ERI9XfiPNqmR9C1YUHg/cRQxQT5abM +3j8zDEHzY47wZUBNIJN7jtJvgUjTgQjQY6QJsph43gmaYaFPUiW7qK4hl1nswKo/ +ubH/9jL9ArOMeBIq+Bm8sGazMNUa1HajU5ryKS63qvYA3iZ7PyvGt6Vfx2r61SSs +wGcEXY7ASrwMk3xRlGrmLoxJg9PK8V1Gg3BBSUQSqwvGsuYouXlQNZ81mwycNeQk +VCSVvDA4JRiS6Rbb86jVi6wRQKUTSIDQeEdI2NyjMMBwl5vGanuz2PIHypKVu0vM +8ZUMvyKKbzktupOh2SZTfVMH29O3ANY++usyDRUTm3k3gmpwXL4Ogt5thQc6ZQkV ++Y53TopSYzzIn63UUtiLdzYx9nyk151XjxXN6UyZt0p1F2KmrwmNo7IyqoC3qfzg +4I0Bmd9yA0fHGKs2w/+pjtzvbf6ZgsxcPiTSJtLTZgE13D1uRMKm20+irXgR5rbw +lhTXPV2gp8hdeKHtvfCy +=cem1 +-END PGP SIGNATURE- Added: release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip.sha256 == --- release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip.sha256 (added) +++ release/groovy/2.5.14/distribution/apache-groovy-binary-2.5.14.zip.sha256 Thu Dec 3 11:55:02 2020 @@ -0,0 +1 @@ +71a876a99a4e8f2ad10cc48becd3fc7442498b23915e93e5cd834dafed1c9699 Added: release/groovy/2.5.14/distribution/apache-groovy-docs-2.5.14.zip == Binary file - no diff available. Propchange: release/groovy/2.5.14/distribution/apache-groovy-docs-2.5.14.zip -- svn:mime-type = application/octet-stream Added: release/groovy/2.5.14/distribution/apache-groovy-docs-2.5.14.zip.asc == --- release/groovy/2.5.14/distribution/apache-groovy-docs-2.5.14.zip.asc (added) +++ release/groovy/2.5.14/distribution/apache-groovy-docs-2.5.14.zip.asc Thu Dec 3 11:55:02 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.58 + +iQIcBAABAgAGBQJfxIdmAAoJEGplF2oPsc0LLVQQALDfWR5LRzlIy/6zTSZvGKr+ +lRn0OSY3y+SgAkG2FDhfpDPdijNHRH2yiApnp15JdOdmNstoHPpTzcY98bIqp3/g +m4pCynd2kV5iZuZwRv2TN6IMACHsSTOTJRG1KjSQmlwsu3rLs1nbian0DOycF4LU +KwlUYIKPiOZixgfZ5g2gpYeUjxG8y+EKsHoHYzIv37mf2KYg4O0iwUWgn/IodtoY +btjA50s3AZaOAsxRrS+HGjnj2InM8Pe5sNFSLWXl8zlXLOfQwaDuKbp5dzGCpTzq +nX4tTqM1vlhAWqdu0ua58zarZ9dopyO4T/GfiYont/89rN1iwJAldg2J5fzP22MJ +qWKTtAWUB3y2mT5iwv1GQwnkOq6YYNs5AK+pdiHfs534xWFiMyDlJjb7eTfrcU6u +hRnQqoTJtkla/ZNo6fyhWe6BOq5Ftjbzqo7KCRZEBiGnJehL7Aaxb332GqvQpjKj +izxmKHrZvN6mtS9m9/IhvHKYOowGGbCYlVz0ft798qyOKXbHW/JNaOpbq0JGsVkK +Ms3bxIjiguk88a9cVATX+07qidmUKSxVhSFACwaBelS0j3JcUVXVuCReW3lHxSTs +F1CkEKRBw4cfFttJGa8+c9gArdK+BOxgOmno+Oi6QFiXKd/WpKe0b7dB90p/M8m9 +cmFkh2rQi4jCJD5SCgaS +=Tne1 +-END PGP SIGNATURE- Added: release/groovy/2.5.14/distribution/apache-groovy-docs-2.5.14.zip.sha256 == --- release/groovy/2.5.14/distribution/apache-groovy-docs-2.5.14.zip.sha256 (added) +++
[groovy] branch GROOVY_2_5_X updated: Bump version on GROOVY_2_5_X branch
This is an automated email from the ASF dual-hosted git repository. paulk 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 e1b338e Bump version on GROOVY_2_5_X branch e1b338e is described below commit e1b338e3dc815c668f60a885c4e7743b4d7b8c2f Author: Paul King AuthorDate: Thu Dec 3 21:40:31 2020 +1000 Bump version on GROOVY_2_5_X branch
[groovy] branch GROOVY_2_5_X updated: Bump version on GROOVY_2_5_X branch
This is an automated email from the ASF dual-hosted git repository.
paulk 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 0c5431d Bump version on GROOVY_2_5_X branch
0c5431d is described below
commit 0c5431d8ac0b74d1434b8e94d7f6ac6dcd724fc4
Author: Paul King
AuthorDate: Thu Dec 3 21:23:28 2020 +1000
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 29d316b..1792c55 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.14-SNAPSHOT
+groovyVersion = 2.5.15-SNAPSHOT
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3
only digits)
-groovyBundleVersion = 2.5.14.SNAPSHOT
+groovyBundleVersion = 2.5.15.SNAPSHOT
gradle_version=4.10.3
[groovy-dev-site] branch asf-site updated: 2020/12/03 11:15:13: Generated dev website from groovy-website@113e6df
This is an automated email from the ASF dual-hosted git repository. git-site-role 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 4e0f8ee 2020/12/03 11:15:13: Generated dev website from groovy-website@113e6df 4e0f8ee is described below commit 4e0f8ee2965bf239ec5389839b5671405c71f012 Author: jenkins AuthorDate: Thu Dec 3 11:15:13 2020 + 2020/12/03 11:15:13: Generated dev website from groovy-website@113e6df --- download.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/download.html b/download.html index 8249477..fefc2f8 100644 --- a/download.html +++ b/download.html @@ -59,8 +59,8 @@ Improve this doc - Download Download 3.0.6Ways 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 3.0.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 [...]
[groovy-website] branch asf-site updated: Release 2.4.21: 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 113e6df Release 2.4.21: update sitemap
113e6df is described below
commit 113e6dffa1cb2911924f2f7db43e063b459b5bf6
Author: Paul King
AuthorDate: Thu Dec 3 19:33:41 2020 +1000
Release 2.4.21: update sitemap
---
site/src/site/sitemap-dev.groovy | 25 -
site/src/site/sitemap-user.groovy | 33 -
2 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index 81be571..93ef350 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -80,9 +80,14 @@ downloads {
a(href: 'versioning.html', 'version')
yield ' of Groovy designed for JDK8+ with much improved JPMS
support.'
}
+//version('4.0.0-alpha-2') {
+//stable false
+//windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-4.0.0-alpha-2-installer#files'
+//}
version('4.0.0-alpha-1') {
stable false
-//windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-4.0.0-alpha-1-installer#files'
+archive true
+windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-4.0.0-alpha-1-installer#files'
}
}
distribution('Groovy 3.0') {
@@ -91,14 +96,14 @@ downloads {
a(href: 'versioning.html', 'version')
yield ' of Groovy designed for JDK8+ with a new more flexible
parser (aka Parrot parser).'
}
-version('3.0.6') {
+version('3.0.7') {
stable true
-//windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-3.0.6-installer#files'
+//windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-3.0.7-installer#files'
}
-version('3.0.5') {
+version('3.0.6') {
stable true
archive true
-windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-3.0.5-installer#files'
+windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-3.0.6-installer#files'
}
}
distribution('Groovy 2.5') {
@@ -107,8 +112,13 @@ downloads {
a(href: 'versioning.html', 'version')
yield ' of Groovy.'
}
+version('2.5.14') {
+stable true
+//windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-2.5.14-installer#files'
+}
version('2.5.13') {
stable true
+archive true
windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-2.5.13-installer#files'
}
}
@@ -117,8 +127,13 @@ downloads {
yield 'Groovy 2.4 is an earlier version of Groovy still in
widespread use.'
yieldUnescaped ''' Important: Releases before 2.4.4 weren't done
under the Apache Software Foundation and are provided as a convenience, without
any warranty.'''
}
+version('2.4.21') {
+stable true
+//windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-2.4.21-installer#files'
+}
version('2.4.20') {
stable true
+archive true
windowsInstaller
'https://bintray.com/groovy/Distributions/Windows-Installer/groovy-2.4.20-installer#files'
}
}
diff --git a/site/src/site/sitemap-user.groovy
b/site/src/site/sitemap-user.groovy
index 3fc62c0..845d360 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -86,12 +86,12 @@ documentation {
'2.1.0', '2.1.1', '2.1.2', '2.1.3', '2.1.4', '2.1.5', '2.1.6',
'2.1.7', '2.1.8', '2.1.9',
'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.4.18', '2.4.19', '2.4.20',
-'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.5.9',
'2.5.10', '2.5.11', '2.5.12', '2.5.13',
+'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-rc-1',
svn commit: r44814 - in /release/groovy/2.4.21: ./ distribution/ sources/
Author: paulk Date: Thu Dec 3 09:33:36 2020 New Revision: 44814 Log: Releasing version 2.4.21 Added: release/groovy/2.4.21/ release/groovy/2.4.21/distribution/ release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip (with props) release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip.asc release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip.sha256 release/groovy/2.4.21/distribution/apache-groovy-docs-2.4.21.zip (with props) release/groovy/2.4.21/distribution/apache-groovy-docs-2.4.21.zip.asc release/groovy/2.4.21/distribution/apache-groovy-docs-2.4.21.zip.sha256 release/groovy/2.4.21/distribution/apache-groovy-sdk-2.4.21.zip (with props) release/groovy/2.4.21/distribution/apache-groovy-sdk-2.4.21.zip.asc release/groovy/2.4.21/distribution/apache-groovy-sdk-2.4.21.zip.sha256 release/groovy/2.4.21/sources/ release/groovy/2.4.21/sources/apache-groovy-src-2.4.21.zip (with props) release/groovy/2.4.21/sources/apache-groovy-src-2.4.21.zip.asc release/groovy/2.4.21/sources/apache-groovy-src-2.4.21.zip.sha256 Added: release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip == Binary file - no diff available. Propchange: release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip -- svn:mime-type = application/octet-stream Added: release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip.asc == --- release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip.asc (added) +++ release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip.asc Thu Dec 3 09:33:36 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.51 + +iQIcBAABAgAGBQJfxIA5AAoJEGplF2oPsc0LKK0P/jnKdbWFfQ3RGT2Gcz6yt3VE +1IVvoQQ7EyQrLVzQXUSphRp/YA/X+3pAxuR9VRxBtJHRigLqOfEcjCXy5JfBbx+g +0IczZH/xjKVURc006ja6dBCR+eSc4MozrmJ5IVyng9hEvYN+emkhahNHMwDl1ZzP +7aaofzZ2o7zs4vPTSgN43eYee3WZQQe4mEh+qs8y55hL6vcOl2zS4FdYXZsRkW18 +KS8vtmELcwWAvLGYYKo1k/+cxYOi9ZMvzULcCHLVLqR6Cv/5CDZdH50ydCEtV5OI ++KtmxqmhNbK3Hs8x+TP4h7z4OVvJpjKZ61HqVVPgI5pu+atabqSdyYoJ22hzAGV8 +gOgAwpRY4m/TtKDyDDBy51i3PFNbVwz0ZB6JLsoQPSIoDZ0JsW+UzMdjhDIpqg1K +fcSVXdNZAiDi4np9N9pFkT0Dm+25PZe79q7YWeacIyWUgSlnk7TDcoJbVuEyVQvt +puJ77lRiZ7NyX+pGry7XB9cgvlNHJlwWmSWt3UzrhHD85DS+LxfbrXJ6kRSMP0kV +S6wFzDBG+aKQ5otoANUFFK8d66TSfcP9NkrEqJ+41BJdyGIa0DivQyKlrX4X51eV ++jEscW4ZcZzqAC8tGIDJZvCeHmbZRDQS/KXmrn73GsibUd6U4NwKwRaG8YGyBoPC +nAN2udoEetUmV73L7zCw +=eMi9 +-END PGP SIGNATURE- Added: release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip.sha256 == --- release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip.sha256 (added) +++ release/groovy/2.4.21/distribution/apache-groovy-binary-2.4.21.zip.sha256 Thu Dec 3 09:33:36 2020 @@ -0,0 +1 @@ +2f0f59aeaa054a241705b102111a2d823c19ee0f840a6c5bb3e2d26907058f40 Added: release/groovy/2.4.21/distribution/apache-groovy-docs-2.4.21.zip == Binary file - no diff available. Propchange: release/groovy/2.4.21/distribution/apache-groovy-docs-2.4.21.zip -- svn:mime-type = application/octet-stream Added: release/groovy/2.4.21/distribution/apache-groovy-docs-2.4.21.zip.asc == --- release/groovy/2.4.21/distribution/apache-groovy-docs-2.4.21.zip.asc (added) +++ release/groovy/2.4.21/distribution/apache-groovy-docs-2.4.21.zip.asc Thu Dec 3 09:33:36 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: BCPG v1.51 + +iQIcBAABAgAGBQJfxIA5AAoJEGplF2oPsc0LMzkP/iBb5jU5oRkdkKXLbjIEETmU +PflM0MzIyxL+xWMuiHL04caWmJuQgIJmfIrU1gsR5lyrWqKdnu3Fh4DBJxxhqCH4 +UoJgG9+bn7akYl/xgO3wtmEwZrIT2UBjRH8ICyYQDuC1YE8/V5dcLWEQoPgpTUYc +DaLWq7CRoDzbxHH2SGC2zN6DnQ6PpA3I24QhcHuTtmEa42ls0Ymgarr88wIMZarV +savMI0jK5YYeCWS/Rz5rDup3U6Otzmc4Lfm1n1Hd/8+kJ1RRBm4FhNOYnER/V/TP +rVTo6WB5cOFqqoIwVZ6lOc3lpg5WxuWKjKzR16LrwTW54Fxa/92lN4ixhJtLsCRz +XkzTsMjbMR1PsFYUC99BahoOcDUMHqxJ+TPNiBo4kylHUqdkdtX2TuCcH3inveBb +An8WDfmmjfUDJZHyvM8jbieyfmqcI75F5bCkRXipjucpq89GVFMFaT13Lhzu/TPj +XADuaVzTquTsqbeYcZYidiBdbVxyEFJcyS16PJIM/6CAbNkDrOakN/PudrX80LhK +Gg4QdkTDUN6eXKxR91eiOXNeEMS9MxKg6D9cFi+u9l12yVcWAMfStwF67gjGbscW +q0Opf6xucLr7onaOJOpyHpMG8iY0MAzGWYkxle4eguUMNHJgM7cThjo017fKrXzG +bCL3vDT5ZqOqAIPy6/E9 +=4fLF +-END PGP SIGNATURE- Added: release/groovy/2.4.21/distribution/apache-groovy-docs-2.4.21.zip.sha256 == --- release/groovy/2.4.21/distribution/apache-groovy-docs-2.4.21.zip.sha256 (added) +++
svn commit: r44815 - /dev/groovy/2.4.21/
Author: paulk Date: Thu Dec 3 09:33:41 2020 New Revision: 44815 Log: Deleting version 2.4.21 from the DEV staging area Removed: dev/groovy/2.4.21/
