You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/01/01 12:19:40 UTC
[groovy] branch GROOVY_2_5_X updated (497c6fc -> 049b213)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 497c6fc remove repeat fields and other minor edits
new ce6fedc formatting
new 049b213 bump copyright year and 'updateNotices'
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:
NOTICE | 2 +-
notices/NOTICE-BASE | 2 +-
notices/NOTICE-BINZIP | 2 +-
notices/NOTICE-GROOID | 2 +-
notices/NOTICE-GROOIDJARJAR | 2 +-
notices/NOTICE-JARJAR | 2 +-
notices/NOTICE-SDK | 2 +-
src/main/groovy/groovy/grape/Grape.java | 4 ++--
src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java | 2 +-
subprojects/groovy-console/NOTICE | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
[groovy] 01/02: formatting
Posted by pa...@apache.org.
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
commit ce6fedced743ae6ca967efa60c2b52f82c99255b
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Nov 18 08:30:34 2019 +1000
formatting
---
src/main/groovy/groovy/grape/Grape.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/groovy/groovy/grape/Grape.java b/src/main/groovy/groovy/grape/Grape.java
index fe0239d..bc353ab 100644
--- a/src/main/groovy/groovy/grape/Grape.java
+++ b/src/main/groovy/groovy/grape/Grape.java
@@ -186,7 +186,7 @@ public class Grape {
public static URI[] resolve(Map<String, Object> args, Map... dependencies) {
return resolve(args, null, dependencies);
}
-
+
public static URI[] resolve(Map<String, Object> args, List depsInfo, Map... dependencies) {
URI[] uris = null;
if (enableGrapes) {
@@ -223,7 +223,7 @@ public class Grape {
}
}
-
+
public static void addResolver(Map<String, Object> args) {
if (enableGrapes) {
GrapeEngine instance = getInstance();
[groovy] 02/02: bump copyright year and 'updateNotices'
Posted by pa...@apache.org.
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
commit 049b213cf6ad3e2dc1b3cfcdff099ce01e3fa61b
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Jan 1 22:09:30 2020 +1000
bump copyright year and 'updateNotices'
---
NOTICE | 2 +-
notices/NOTICE-BASE | 2 +-
notices/NOTICE-BINZIP | 2 +-
notices/NOTICE-GROOID | 2 +-
notices/NOTICE-GROOIDJARJAR | 2 +-
notices/NOTICE-JARJAR | 2 +-
notices/NOTICE-SDK | 2 +-
src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java | 2 +-
subprojects/groovy-console/NOTICE | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/NOTICE b/NOTICE
index eb5add2..ac618fb 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Groovy
-Copyright 2003-2019 The Apache Software Foundation
+Copyright 2003-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/notices/NOTICE-BASE b/notices/NOTICE-BASE
index 3dcd79f..b22c377 100644
--- a/notices/NOTICE-BASE
+++ b/notices/NOTICE-BASE
@@ -1,5 +1,5 @@
Apache Groovy
-Copyright 2003-2019 The Apache Software Foundation
+Copyright 2003-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/notices/NOTICE-BINZIP b/notices/NOTICE-BINZIP
index c7ae112..0a14ad7 100644
--- a/notices/NOTICE-BINZIP
+++ b/notices/NOTICE-BINZIP
@@ -1,5 +1,5 @@
Apache Groovy
-Copyright 2003-2019 The Apache Software Foundation
+Copyright 2003-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/notices/NOTICE-GROOID b/notices/NOTICE-GROOID
index 27bc652..7928c9e 100644
--- a/notices/NOTICE-GROOID
+++ b/notices/NOTICE-GROOID
@@ -1,5 +1,5 @@
Apache Groovy
-Copyright 2003-2019 The Apache Software Foundation
+Copyright 2003-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/notices/NOTICE-GROOIDJARJAR b/notices/NOTICE-GROOIDJARJAR
index b53055c..f9c2438 100644
--- a/notices/NOTICE-GROOIDJARJAR
+++ b/notices/NOTICE-GROOIDJARJAR
@@ -1,5 +1,5 @@
Apache Groovy
-Copyright 2003-2019 The Apache Software Foundation
+Copyright 2003-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/notices/NOTICE-JARJAR b/notices/NOTICE-JARJAR
index 270d78f..81fd6a2 100644
--- a/notices/NOTICE-JARJAR
+++ b/notices/NOTICE-JARJAR
@@ -1,5 +1,5 @@
Apache Groovy
-Copyright 2003-2019 The Apache Software Foundation
+Copyright 2003-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/notices/NOTICE-SDK b/notices/NOTICE-SDK
index f67bebf..303f759 100644
--- a/notices/NOTICE-SDK
+++ b/notices/NOTICE-SDK
@@ -1,5 +1,5 @@
Apache Groovy
-Copyright 2003-2019 The Apache Software Foundation
+Copyright 2003-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java b/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java
index 8c80956..b01050f 100644
--- a/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java
+++ b/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java
@@ -357,7 +357,7 @@ public class FileSystemCompiler {
public String[] getVersion() {
return new String[]{
"Groovy compiler version " + GroovySystem.getVersion(),
- "Copyright 2003-2019 The Apache Software Foundation. http://groovy-lang.org/",
+ "Copyright 2003-2020 The Apache Software Foundation. http://groovy-lang.org/",
"",
};
}
diff --git a/subprojects/groovy-console/NOTICE b/subprojects/groovy-console/NOTICE
index eb5add2..ac618fb 100644
--- a/subprojects/groovy-console/NOTICE
+++ b/subprojects/groovy-console/NOTICE
@@ -1,5 +1,5 @@
Apache Groovy
-Copyright 2003-2019 The Apache Software Foundation
+Copyright 2003-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).