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/11/27 04:52:42 UTC
[groovy] branch master updated (7d48c55 -> 49a01fc)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 7d48c55 Try to fix the failing build
new ec1cbdf Grape usage not needed for this test (another case)
new 49a01fc remove whitespace
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:
gradle/verification-metadata.xml.bak | 6 ++++++
subprojects/groovy-json/build.gradle | 10 ++--------
.../src/spec/test/json/StreamingJsonBuilderTest.groovy | 6 ++----
3 files changed, 10 insertions(+), 12 deletions(-)
[groovy] 02/02: remove whitespace
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 49a01fc1db5b2ec49dda4a438a84596bf572d711
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Nov 27 14:52:31 2020 +1000
remove whitespace
---
.../groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy b/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy
index a54c5ed..b34cbdf 100644
--- a/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy
+++ b/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy
@@ -45,7 +45,7 @@ class StreamingJsonBuilderTest extends GroovyTestCase {
}
'''
// end::json_string[]
-
+
// tag::streaming_json_builder[]
StringWriter writer = new StringWriter()
StreamingJsonBuilder builder = new StreamingJsonBuilder(writer)
@@ -63,7 +63,7 @@ class StreamingJsonBuilderTest extends GroovyTestCase {
}
String json = JsonOutput.prettyPrint(writer.toString())
// end::streaming_json_builder[]
-
+
// tag::json_assert[]
JsonAssert.assertJsonEquals(json, carRecords)
// end::json_assert[]
[groovy] 01/02: Grape usage not needed for this test (another case)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit ec1cbdf865e8fec66a336674c11541cc24ada066
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Nov 27 14:48:24 2020 +1000
Grape usage not needed for this test (another case)
---
gradle/verification-metadata.xml.bak | 6 ++++++
subprojects/groovy-json/build.gradle | 10 ++--------
.../src/spec/test/json/StreamingJsonBuilderTest.groovy | 2 --
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/gradle/verification-metadata.xml.bak b/gradle/verification-metadata.xml.bak
index 4495bf4..d2674c6 100644
--- a/gradle/verification-metadata.xml.bak
+++ b/gradle/verification-metadata.xml.bak
@@ -148,6 +148,7 @@
<trusted-key id="b94797af54ae59b1e3c154da8e1ad594207b7fb2" group="org.reflections" name="reflections" version="0.9.12"/>
<trusted-key id="ba926f64ca647b6d853a38672e2010f8a7ff4a41" group="org.codehaus.plexus"/>
<trusted-key id="bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae" group="com.google.guava"/>
+ <trusted-key id="c5c776287800887af679da34d03081ee195be743" group="net.javacrumbs.json-unit"/>
<trusted-key id="c739ce4075d9f0f0ded13a7d39be51a1084c9113" group="org.apache.maven.doxia"/>
<trusted-key id="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0">
<trusting group="org.apache.commons"/>
@@ -307,6 +308,11 @@
<pgp value="7616eb882daf57a11477aaf559a252fb1199d873"/>
</artifact>
</component>
+ <component group="com.google.code.gson" name="gson" version="2.8.6">
+ <artifact name="gson-2.8.6.jar">
+ <pgp value="afcc4c7594d09e2182c60e0f7a01b0f236e5430f"/>
+ </artifact>
+ </component>
<component group="com.google.errorprone" name="error_prone_annotations" version="2.2.0">
<artifact name="error_prone_annotations-2.2.0.jar">
<pgp value="e77417ac194160a3fabd04969a259c7ee636c5ed"/>
diff --git a/subprojects/groovy-json/build.gradle b/subprojects/groovy-json/build.gradle
index 3818d07..b84dd20 100644
--- a/subprojects/groovy-json/build.gradle
+++ b/subprojects/groovy-json/build.gradle
@@ -24,16 +24,10 @@ dependencies {
api rootProject // JsonBuilder extends GroovyObjectSupport...
testImplementation project(':groovy-test')
testImplementation project(':groovy-dateutil')
- testImplementation 'net.javacrumbs.json-unit:json-unit:1.5.6'
+ testImplementation 'net.javacrumbs.json-unit:json-unit:2.9.0'
testRuntimeOnly "org.slf4j:slf4j-api:${versions.slf4j}"
testRuntimeOnly project(':groovy-ant') // for JavadocAssertionTests
- testRuntimeOnly 'com.google.code.gson:gson:2.3.1' // json-unit requires gson, jackson1, or jackson2
- testRuntimeOnly(project(':')) {
- because "Tests are using Grapes"
- capabilities {
- requireCapability("org.apache.groovy:groovy-grapes")
- }
- }
+ testRuntimeOnly 'com.google.code.gson:gson:2.8.6' // json-unit requires gson, jackson1, or jackson2
}
plugins.withId('eclipse') {
diff --git a/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy b/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy
index 4c44743..a54c5ed 100644
--- a/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy
+++ b/subprojects/groovy-json/src/spec/test/json/StreamingJsonBuilderTest.groovy
@@ -24,8 +24,6 @@ class StreamingJsonBuilderTest extends GroovyTestCase {
void testStreamingJsonBuilder() {
assertScript """
- @Grab('com.google.code.gson:gson:2.8.6') //required by json-unit
- @Grab('net.javacrumbs.json-unit:json-unit:2.9.0')
import groovy.json.*
import net.javacrumbs.jsonunit.JsonAssert