Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace jackson-core with vendored minimal-json #323

Merged
merged 1 commit into from
Mar 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ THIRD PARTY COMPONENTS

This software includes third party software subject to the following copyrights.

minimal-json
Copyright (c) 2013, 2014 EclipseSource
https://github.com/ralfstx/minimal-json/blob/master/LICENSE


Apache Commons Text
Copyright 2014-2018 The Apache Software Foundation

Expand Down
3 changes: 3 additions & 0 deletions config/checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
<!-- Ignore "vendored" internal classes that have a different copyright. -->
<suppress checks="RegexpHeader" files="internal/*"/>

<suppress checks="EqualsHashCode" files="shapes/*"/>
<suppress checks="InnerAssignment" files="StringUtils"/>
<suppress checks="TypeName" files="AwsJson1_0Trait.java|AwsJson1_1Trait.java"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public void writesJsonFiles() throws IOException {

assertThat(Files.isDirectory(outputDirectory.resolve("foo")), is(true));
assertThat(Files.isRegularFile(outputDirectory.resolve("foo/file.json")), is(true));
assertThat(new String(Files.readAllBytes(outputDirectory.resolve("foo/file.json"))), equalTo("{ }\n"));
assertThat(new String(Files.readAllBytes(outputDirectory.resolve("foo/file.json"))), equalTo("{}\n"));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void throwsWithCorrectSyntaxErrorMessage() {
SmithyBuildConfig.load(Paths.get(getResourcePath("bad-syntax.json")));
});

assertThat(thrown.getMessage(), containsString("Error parsing file"));
assertThat(thrown.getMessage(), containsString("Error parsing"));
}

@Test
Expand Down
1 change: 0 additions & 1 deletion smithy-model/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ extra["moduleName"] = "software.amazon.smithy.model"

dependencies {
api(project(":smithy-utils"))
implementation("com.fasterxml.jackson.core:jackson-core:2.9.8")
}

This file was deleted.

This file was deleted.

Loading