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.

Sign up for GitHub

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

Jump to bottom

GH-2192 upgrade jsonld-java and jackson + fix for test #2233

Merged
merged 1 commit into from
Jul 5, 2020
Merged

GH-2192 upgrade jsonld-java and jackson + fix for test #2233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions compliance/elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.25</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions core/rio/jsonld/src/test/java/org/eclipse/rdf4j/rio/jsonld/JSONLDParserCustomTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public void testIncludeSourceLocationDefault() throws Exception {
assertTrue(e.getCause() instanceof JsonProcessingException);
JsonProcessingException cause = (JsonProcessingException) e.getCause();
assertEquals(2, cause.getLocation().getLineNr());
assertEquals(1, cause.getLocation().getColumnNr());
assertEquals(3, cause.getLocation().getColumnNr());
assertNotNull(cause.getLocation().getSourceRef());
assertEquals(source, cause.getLocation().getSourceRef());
}
Expand All @@ -377,7 +377,7 @@ public void testIncludeSourceLocationEnabled() throws Exception {
assertTrue(e.getCause() instanceof JsonProcessingException);
JsonProcessingException cause = (JsonProcessingException) e.getCause();
assertEquals(2, cause.getLocation().getLineNr());
assertEquals(1, cause.getLocation().getColumnNr());
assertEquals(3, cause.getLocation().getColumnNr());
assertNotNull(cause.getLocation().getSourceRef());
assertEquals(source, cause.getLocation().getSourceRef());
}
Expand All @@ -394,7 +394,7 @@ public void testIncludeSourceLocationDisabled() throws Exception {
assertTrue(e.getCause() instanceof JsonProcessingException);
JsonProcessingException cause = (JsonProcessingException) e.getCause();
assertEquals(2, cause.getLocation().getLineNr());
assertEquals(1, cause.getLocation().getColumnNr());
assertEquals(3, cause.getLocation().getColumnNr());
assertNull(cause.getLocation().getSourceRef());
}
}
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@
<logback.version>1.1.11</logback.version>
<httpclient.version>4.5.10</httpclient.version>
<httpcore.version>4.4.12</httpcore.version>
<jackson.version>2.9.9</jackson.version>
<jsonldjava.version>0.12.5</jsonldjava.version>
<jackson.version>2.10.4</jackson.version>
<jsonldjava.version>0.13.0</jsonldjava.version>
<last.japicmp.compare.version>3.1.4</last.japicmp.compare.version>
<jaxb.version>2.3.1</jaxb.version>
<lucene.version>7.7.2</lucene.version>
Expand Down