Repository: groovy Updated Branches: refs/heads/master 561e634e4 -> fbeeae04f
update copyright year in notices Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/fbeeae04 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/fbeeae04 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/fbeeae04 Branch: refs/heads/master Commit: fbeeae04f15245b195ffa3b67dc2b2f7f4f61852 Parents: 561e634 Author: paulk <[email protected]> Authored: Wed Jan 3 17:25:22 2018 +1000 Committer: paulk <[email protected]> Committed: Wed Jan 3 17:25:22 2018 +1000 ---------------------------------------------------------------------- NOTICE | 2 +- gradle/assemble.gradle | 2 +- gradle/docs.gradle | 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 +- .../main/java/org/apache/groovy/parser/antlr4/PositionInfo.java | 3 --- 12 files changed, 11 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 1b76d0d..caa674a 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Groovy -Copyright 2003-2017 The Apache Software Foundation +Copyright 2003-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/gradle/assemble.gradle ---------------------------------------------------------------------- diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index ee9dd2e..530a39a 100644 --- a/gradle/assemble.gradle +++ b/gradle/assemble.gradle @@ -586,7 +586,7 @@ task updateNotices { include '*-GROOID*.txt' include '*-BINZIP*.txt' }.sort { it.name } - def groovyconsoleFiles = fileTree(noticesDir) + def groovyconsoleFiles = fileTree(noticesDir).include('silkicons-ALLJARJAR-SRC.txt') [ (noticeBinZipFile) : binzipFiles, (noticeGrooidFile) : grooidFiles, http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/gradle/docs.gradle ---------------------------------------------------------------------- diff --git a/gradle/docs.gradle b/gradle/docs.gradle index 4057627..449524f 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -18,7 +18,7 @@ */ task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK', 'asciidocAll']) { - ext.footer = 'Copyright © 2003-2017 The Apache Software Foundation. All rights reserved.' + ext.footer = 'Copyright © 2003-2018 The Apache Software Foundation. All rights reserved.' ext.title = "Groovy ${groovyVersion}" } http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/notices/NOTICE-BASE ---------------------------------------------------------------------- diff --git a/notices/NOTICE-BASE b/notices/NOTICE-BASE index 8389b07..3ffcb8b 100644 --- a/notices/NOTICE-BASE +++ b/notices/NOTICE-BASE @@ -1,5 +1,5 @@ Apache Groovy -Copyright 2003-2017 The Apache Software Foundation +Copyright 2003-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/notices/NOTICE-BINZIP ---------------------------------------------------------------------- diff --git a/notices/NOTICE-BINZIP b/notices/NOTICE-BINZIP index dacb821..bf71a55 100644 --- a/notices/NOTICE-BINZIP +++ b/notices/NOTICE-BINZIP @@ -1,5 +1,5 @@ Apache Groovy -Copyright 2003-2017 The Apache Software Foundation +Copyright 2003-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/notices/NOTICE-GROOID ---------------------------------------------------------------------- diff --git a/notices/NOTICE-GROOID b/notices/NOTICE-GROOID index 032e0b8..cf3b065 100644 --- a/notices/NOTICE-GROOID +++ b/notices/NOTICE-GROOID @@ -1,5 +1,5 @@ Apache Groovy -Copyright 2003-2017 The Apache Software Foundation +Copyright 2003-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/notices/NOTICE-GROOIDJARJAR ---------------------------------------------------------------------- diff --git a/notices/NOTICE-GROOIDJARJAR b/notices/NOTICE-GROOIDJARJAR index 7ce0950..d88119a 100644 --- a/notices/NOTICE-GROOIDJARJAR +++ b/notices/NOTICE-GROOIDJARJAR @@ -1,5 +1,5 @@ Apache Groovy -Copyright 2003-2017 The Apache Software Foundation +Copyright 2003-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/notices/NOTICE-JARJAR ---------------------------------------------------------------------- diff --git a/notices/NOTICE-JARJAR b/notices/NOTICE-JARJAR index 4c5bbd8..b0c4cbe 100644 --- a/notices/NOTICE-JARJAR +++ b/notices/NOTICE-JARJAR @@ -1,5 +1,5 @@ Apache Groovy -Copyright 2003-2017 The Apache Software Foundation +Copyright 2003-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/notices/NOTICE-SDK ---------------------------------------------------------------------- diff --git a/notices/NOTICE-SDK b/notices/NOTICE-SDK index 5910cc8..e15b426 100644 --- a/notices/NOTICE-SDK +++ b/notices/NOTICE-SDK @@ -1,5 +1,5 @@ Apache Groovy -Copyright 2003-2017 The Apache Software Foundation +Copyright 2003-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java b/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java index 55d0ee3..2e140b2 100644 --- a/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java +++ b/src/main/java/org/codehaus/groovy/tools/FileSystemCompiler.java @@ -85,7 +85,7 @@ public class FileSystemCompiler { public static void displayVersion() { String version = GroovySystem.getVersion(); System.err.println("Groovy compiler version " + version); - System.err.println("Copyright 2003-2017 The Apache Software Foundation. http://groovy-lang.org/";); + System.err.println("Copyright 2003-2018 The Apache Software Foundation. http://groovy-lang.org/";); System.err.println(""); } http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/subprojects/groovy-console/NOTICE ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/NOTICE b/subprojects/groovy-console/NOTICE index 1b76d0d..caa674a 100644 --- a/subprojects/groovy-console/NOTICE +++ b/subprojects/groovy-console/NOTICE @@ -1,5 +1,5 @@ Apache Groovy -Copyright 2003-2017 The Apache Software Foundation +Copyright 2003-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/groovy/blob/fbeeae04/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/PositionInfo.java ---------------------------------------------------------------------- diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/PositionInfo.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/PositionInfo.java index b59aabb..f4a752c 100644 --- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/PositionInfo.java +++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/PositionInfo.java @@ -20,9 +20,6 @@ package org.apache.groovy.parser.antlr4; import java.util.Objects; -/** - * Created by Daniel on 2017/4/22. - */ public class PositionInfo { private int line; private int column;
