You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/12/31 12:12:32 UTC
[1/3] groovy git commit: Use UTF-8 as the default encoding
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 3bc016add -> 0c67ddc42
Use UTF-8 as the default encoding
(cherry picked from commit 891edd7)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/afaa9029
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/afaa9029
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/afaa9029
Branch: refs/heads/GROOVY_2_6_X
Commit: afaa9029914e4c402e91d1665467b29005849328
Parents: 3bc016a
Author: sunlan <su...@apache.org>
Authored: Sun Dec 31 18:31:30 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sun Dec 31 19:51:38 2017 +0800
----------------------------------------------------------------------
.../java/org/codehaus/groovy/control/CompilerConfiguration.java | 2 +-
.../org/codehaus/groovy/control/CompilerConfigurationTest.java | 2 +-
src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java | 5 +++--
.../xml/streamingmarkupsupport/StreamingMarkupWriter.java | 3 ++-
4 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/afaa9029/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 9f6babe..54c53c6 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -468,7 +468,7 @@ public class CompilerConfiguration {
//
text = configuration.getProperty("groovy.source.encoding");
if (text == null) {
- text = configuration.getProperty("file.encoding", "US-ASCII");
+ text = configuration.getProperty("file.encoding", DEFAULT_SOURCE_ENCODING);
}
setSourceEncoding(text);
http://git-wip-us.apache.org/repos/asf/groovy/blob/afaa9029/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
index ddf0738..51e5dbb 100644
--- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
+++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
@@ -70,7 +70,7 @@ public class CompilerConfigurationTest extends GroovyTestCase {
}
private String getSystemEncoding() {
- return System.getProperty("file.encoding", "US-ASCII");
+ return System.getProperty("file.encoding", CompilerConfiguration.DEFAULT_SOURCE_ENCODING);
}
private static String getVMVersion() {
http://git-wip-us.apache.org/repos/asf/groovy/blob/afaa9029/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java b/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
index 11cffe7..e5bdec5 100644
--- a/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
+++ b/src/test/org/codehaus/groovy/runtime/InvokeMethodTest.java
@@ -23,6 +23,7 @@ import groovy.lang.GroovyRuntimeException;
import groovy.lang.IntRange;
import groovy.util.GroovyTestCase;
import junit.framework.AssertionFailedError;
+import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
import java.math.BigDecimal;
@@ -228,13 +229,13 @@ public class InvokeMethodTest extends GroovyTestCase {
}
public void testCoerceGStringToStringOnGetBytes() throws Throwable {
- GString param = new GString(new Object[]{"US-ASCII"}) {
+ GString param = new GString(new Object[]{CompilerConfiguration.DEFAULT_SOURCE_ENCODING}) {
public String[] getStrings() {
return new String[]{""};
}
};
Object value = invoke("test", "getBytes", new Object[]{param});
- assertEquals("converted GString to string", "test".getBytes("US-ASCII").getClass(), value.getClass());
+ assertEquals("converted GString to string", "test".getBytes(CompilerConfiguration.DEFAULT_SOURCE_ENCODING).getClass(), value.getClass());
}
public void testBadBDToDoubleCoerce() throws Throwable {
http://git-wip-us.apache.org/repos/asf/groovy/blob/afaa9029/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
index 21d467e..75c2189 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
@@ -19,6 +19,7 @@
package groovy.xml.streamingmarkupsupport;
import groovy.io.EncodingAwareBufferedWriter;
+import org.codehaus.groovy.control.CompilerConfiguration;
import java.io.IOException;
import java.io.OutputStreamWriter;
@@ -105,7 +106,7 @@ public class StreamingMarkupWriter extends Writer {
this.encoding = getNormalizedEncoding(((EncodingAwareBufferedWriter) writer).getEncoding());
this.encodingKnown = true;
} else {
- this.encoding = "US-ASCII";
+ this.encoding = CompilerConfiguration.DEFAULT_SOURCE_ENCODING;
this.encodingKnown = false;
}
[3/3] groovy git commit: Revert "Use UTF-8 as the default encoding"
for StreamingMarkupWriter
Posted by su...@apache.org.
Revert "Use UTF-8 as the default encoding" for StreamingMarkupWriter
(cherry picked from commit 2fd9a0d)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/0c67ddc4
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/0c67ddc4
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/0c67ddc4
Branch: refs/heads/GROOVY_2_6_X
Commit: 0c67ddc42d2167e521cf7dc0d204260fe36455d7
Parents: aeb70eb
Author: sunlan <su...@apache.org>
Authored: Sun Dec 31 19:46:24 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sun Dec 31 19:51:45 2017 +0800
----------------------------------------------------------------------
.../groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/0c67ddc4/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
index 75c2189..21d467e 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/streamingmarkupsupport/StreamingMarkupWriter.java
@@ -19,7 +19,6 @@
package groovy.xml.streamingmarkupsupport;
import groovy.io.EncodingAwareBufferedWriter;
-import org.codehaus.groovy.control.CompilerConfiguration;
import java.io.IOException;
import java.io.OutputStreamWriter;
@@ -106,7 +105,7 @@ public class StreamingMarkupWriter extends Writer {
this.encoding = getNormalizedEncoding(((EncodingAwareBufferedWriter) writer).getEncoding());
this.encodingKnown = true;
} else {
- this.encoding = CompilerConfiguration.DEFAULT_SOURCE_ENCODING;
+ this.encoding = "US-ASCII";
this.encodingKnown = false;
}
[2/3] groovy git commit: Generate INDEX.LIST for jar files to speed
up classloading
Posted by su...@apache.org.
Generate INDEX.LIST for jar files to speed up classloading
(cherry picked from commit a9cc446)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/aeb70eb2
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/aeb70eb2
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/aeb70eb2
Branch: refs/heads/GROOVY_2_6_X
Commit: aeb70eb209052ec3a092a4e41b6bcb20264b9904
Parents: afaa902
Author: sunlan <su...@apache.org>
Authored: Sun Dec 31 19:33:36 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Sun Dec 31 19:51:41 2017 +0800
----------------------------------------------------------------------
.../src/main/groovy/org/codehaus/groovy/gradle/JarJarTask.groovy | 2 +-
gradle/assemble.gradle | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/aeb70eb2/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/JarJarTask.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/JarJarTask.groovy b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/JarJarTask.groovy
index 37fb67c..df5588f 100644
--- a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/JarJarTask.groovy
+++ b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/JarJarTask.groovy
@@ -142,7 +142,7 @@ class JarJarTask extends DefaultTask {
// so that we can put it into the final jar
project.ant.copy(file: tmpJar, tofile: outputFile)
- project.ant.jar(destfile: outputFile, update: true, manifest: manifestFile) {
+ project.ant.jar(destfile: outputFile, update: true, index: true, manifest: manifestFile) {
manifest {
// because we don't want to use JDK 1.8.0_91, we don't care and it will
// introduce cache misses
http://git-wip-us.apache.org/repos/asf/groovy/blob/aeb70eb2/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 4443dcb..ee9dd2e 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -24,7 +24,6 @@ apply plugin: 'osgi'
group = 'org.codehaus.groovy'
archivesBaseName = 'groovy'
-final jarjarTaskClassName = 'org.pantsbuild.jarjar.JarJarTask'
ext.srcSpec = copySpec {
from(projectDir) {