Skip to content

Commit 2b38d8b

Browse files
committedMay 27, 2020
Prepare for 2.2.14.
* Add missing project dependency on jackson-coreutils, moving it to be jackson-coreutils-equivalence, and converting references to JsonNumEquivalence. * Updated to json-schema-core 1.2.14-SNAPSHOT. * Updated jackson-databind javadoc link versions.
1 parent 0c76d52 commit 2b38d8b

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed
 

‎project.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* Project-specific settings. Unfortunately we cannot put the name in there!
2222
*/
2323
group = "com.github.java-json-tools";
24-
version = "2.2.13";
24+
version = "2.2.14-SNAPSHOT";
2525
sourceCompatibility = JavaVersion.VERSION_1_7;
2626
targetCompatibility = JavaVersion.VERSION_1_7; // defaults to sourceCompatibility
2727

@@ -34,7 +34,8 @@ project.ext {
3434
*/
3535
dependencies {
3636
compile(group: "com.google.guava", name: "guava", version: "28.2-android");
37-
compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.13");
37+
compile(group: "com.github.java-json-tools", name: "jackson-coreutils-equivalence", version: "1.0-SNAPSHOT");
38+
compile(group: "com.github.java-json-tools", name: "json-schema-core", version: "1.2.14-SNAPSHOT");
3839
// FIXME: 1.6.4 exists, but has different license (EDL 1.0, EPL 2.0). Can update?
3940
compile(group: "com.sun.mail", name: "mailapi", version: "1.6.2");
4041
compile(group: "joda-time", name: "joda-time", version: "2.10.5");
@@ -60,8 +61,8 @@ javadoc {
6061
}
6162
links("https://docs.oracle.com/javase/7/docs/api/");
6263
links("https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.2/");
63-
links("https://fasterxml.github.io/jackson-databind/javadoc/2.10/");
64-
links("https://fasterxml.github.io/jackson-core/javadoc/2.10/");
64+
links("https://fasterxml.github.io/jackson-databind/javadoc/2.11/");
65+
links("https://fasterxml.github.io/jackson-core/javadoc/2.11/");
6566
links("https://www.javadoc.io/doc/com.google.guava/guava/28.2-android/");
6667
links("https://java-json-tools.github.io/btf/");
6768
links("https://java-json-tools.github.io/msg-simple/");

‎src/main/java/com/github/fge/jsonschema/keyword/validator/common/EnumValidator.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package com.github.fge.jsonschema.keyword.validator.common;
2121

2222
import com.fasterxml.jackson.databind.JsonNode;
23-
import com.github.fge.jackson.JsonNumEquals;
23+
import com.github.fge.jackson.JsonNumEquivalence;
2424
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
2525
import com.github.fge.jsonschema.core.processing.Processor;
2626
import com.github.fge.jsonschema.core.report.ProcessingReport;
@@ -32,13 +32,13 @@
3232
/**
3333
* Keyword validator for {@code enum}
3434
*
35-
* @see JsonNumEquals
35+
* @see JsonNumEquivalence
3636
*/
3737
public final class EnumValidator
3838
extends AbstractKeywordValidator
3939
{
4040
private static final Equivalence<JsonNode> EQUIVALENCE
41-
= JsonNumEquals.getInstance();
41+
= JsonNumEquivalence.getInstance();
4242

4343
private final JsonNode values;
4444

‎src/main/java/com/github/fge/jsonschema/keyword/validator/common/UniqueItemsValidator.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package com.github.fge.jsonschema.keyword.validator.common;
2121

2222
import com.fasterxml.jackson.databind.JsonNode;
23-
import com.github.fge.jackson.JsonNumEquals;
23+
import com.github.fge.jackson.JsonNumEquivalence;
2424
import com.github.fge.jsonschema.core.exceptions.ProcessingException;
2525
import com.github.fge.jsonschema.core.processing.Processor;
2626
import com.github.fge.jsonschema.core.report.ProcessingReport;
@@ -35,13 +35,13 @@
3535
/**
3636
* Keyword validator for {@code uniqueItems}
3737
*
38-
* @see JsonNumEquals
38+
* @see JsonNumEquivalence
3939
*/
4040
public final class UniqueItemsValidator
4141
extends AbstractKeywordValidator
4242
{
4343
private static final Equivalence<JsonNode> EQUIVALENCE
44-
= JsonNumEquals.getInstance();
44+
= JsonNumEquivalence.getInstance();
4545

4646
private final boolean uniqueItems;
4747

‎src/test/java/com/github/fge/jsonschema/keyword/digest/AbstractDigesterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.fasterxml.jackson.databind.JsonNode;
2323
import com.github.fge.jackson.JsonLoader;
24-
import com.github.fge.jackson.JsonNumEquals;
24+
import com.github.fge.jackson.JsonNumEquivalence;
2525
import com.github.fge.jackson.NodeType;
2626
import com.github.fge.jsonschema.core.util.Dictionary;
2727
import com.google.common.base.Equivalence;
@@ -40,7 +40,7 @@
4040
public abstract class AbstractDigesterTest
4141
{
4242
private static final Equivalence<JsonNode> EQUIVALENCE
43-
= JsonNumEquals.getInstance();
43+
= JsonNumEquivalence.getInstance();
4444

4545
private final String keyword;
4646
private final Digester digester;

‎src/test/java/com/github/fge/jsonschema/processors/validation/ArraySchemaDigesterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.fasterxml.jackson.databind.JsonNode;
2323
import com.github.fge.jackson.JsonLoader;
24-
import com.github.fge.jackson.JsonNumEquals;
24+
import com.github.fge.jackson.JsonNumEquivalence;
2525
import com.github.fge.jsonschema.keyword.digest.Digester;
2626
import com.google.common.base.Equivalence;
2727
import com.google.common.collect.Lists;
@@ -37,7 +37,7 @@
3737
public final class ArraySchemaDigesterTest
3838
{
3939
private static final Equivalence<JsonNode> EQUIVALENCE
40-
= JsonNumEquals.getInstance();
40+
= JsonNumEquivalence.getInstance();
4141

4242
private final Digester digester = ArraySchemaDigester.getInstance();
4343
private final JsonNode testNode;

‎src/test/java/com/github/fge/jsonschema/processors/validation/ObjectSchemaDigesterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.fasterxml.jackson.databind.JsonNode;
2323
import com.github.fge.jackson.JsonLoader;
24-
import com.github.fge.jackson.JsonNumEquals;
24+
import com.github.fge.jackson.JsonNumEquivalence;
2525
import com.github.fge.jsonschema.keyword.digest.Digester;
2626
import com.google.common.base.Equivalence;
2727
import com.google.common.collect.Lists;
@@ -37,7 +37,7 @@
3737
public final class ObjectSchemaDigesterTest
3838
{
3939
private static final Equivalence<JsonNode> EQUIVALENCE
40-
= JsonNumEquals.getInstance();
40+
= JsonNumEquivalence.getInstance();
4141

4242
private final Digester digester = ObjectSchemaDigester.getInstance();
4343
private final JsonNode testNode;

0 commit comments

Comments
 (0)
Please sign in to comment.