Skip to content

Commit e76f5f0

Browse files
committed
Bump more versions.
* jjschema to 1.16 * testng to 6.10 Also clean up errorprone stuff duplicated in build.gradle.
1 parent 7167a57 commit e76f5f0

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

Diff for: project.gradle

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@ project.ext {
3232
* List of dependencies
3333
*/
3434
dependencies {
35-
errorprone("com.google.errorprone:error_prone_core:2.3.3")
36-
errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
3735
compile(group: "com.github.java-json-tools", name: "json-schema-validator",
3836
version: "2.2.12");
39-
compile(group: "com.github.reinert", name: "jjschema", version: "0.6") {
37+
compile(group: "com.github.reinert", name: "jjschema", version: "1.16") {
4038
exclude(group: "com.google.guava", module: "guava");
4139
exclude(group: "com.fasterxml.jackson.core", module: "jackson-core");
4240
exclude(group: "com.fasterxml.jackson.core", module: "jackson-databind");
@@ -50,7 +48,7 @@ dependencies {
5048
version: "0.1.5");
5149
compile(group: "com.github.java-json-tools", name: "json-patch",
5250
version: "1.11");
53-
testCompile(group: "org.testng", name: "testng", version: "6.8.7") {
51+
testCompile(group: "org.testng", name: "testng", version: "6.10") {
5452
exclude(group: "junit", module: "junit");
5553
exclude(group: "org.beanshell", module: "bsh");
5654
exclude(group: "org.yaml", module: "snakeyaml");

Diff for: src/main/java/com/github/fge/jjschema/JJSchemaProcessor.java

+8-5
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@
88
import com.github.fge.jsonschema.core.tree.CanonicalSchemaTree;
99
import com.github.fge.jsonschema.core.tree.SchemaTree;
1010
import com.github.fge.jsonschema.core.tree.key.SchemaKey;
11-
import com.github.reinert.jjschema.JsonSchemaGenerator;
12-
import com.github.reinert.jjschema.SchemaGeneratorBuilder;
11+
import com.github.reinert.jjschema.v1.JsonSchemaFactory;
12+
import com.github.reinert.jjschema.v1.JsonSchemaV4Factory;
1313

1414
public final class JJSchemaProcessor
1515
extends RawProcessor<Class<?>, SchemaTree>
1616
{
17-
private static final JsonSchemaGenerator GENERATOR
18-
= SchemaGeneratorBuilder.draftV4Schema().build();
17+
private static final JsonSchemaFactory FACTORY = new JsonSchemaV4Factory();
18+
19+
static {
20+
FACTORY.setAutoPutDollarSchema(true);
21+
}
1922

2023
public JJSchemaProcessor()
2124
{
@@ -29,7 +32,7 @@ protected SchemaTree rawProcess(final ProcessingReport report,
2932
{
3033
final ProcessingMessage message = newMessage(input);
3134
report.debug(message.setMessage("processing"));
32-
final JsonNode node = GENERATOR.generateSchema(input);
35+
final JsonNode node = FACTORY.createSchema(input);
3336
return new CanonicalSchemaTree(SchemaKey.anonymousKey(), node);
3437
}
3538
}

0 commit comments

Comments
 (0)