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

Signed-off-by:Bart Hanssens <[email protected]>
eclipse-rdf4j · Jul 5, 2020 · eccab2a · eccab2a
1 parent e64a739
commit eccab2a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/compliance/elasticsearch/pom.xml b/compliance/elasticsearch/pom.xml
@@ -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>

diff --git a/core/rio/jsonld/src/test/java/org/eclipse/rdf4j/rio/jsonld/JSONLDParserCustomTest.java b/core/rio/jsonld/src/test/java/org/eclipse/rdf4j/rio/jsonld/JSONLDParserCustomTest.java
@@ -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());
 		}
@@ -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());
 		}
@@ -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());
 		}
 	}

diff --git a/pom.xml b/pom.xml
@@ -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>