New Upstream Snapshot - jsonld-java
Ready changes
Summary
Merged new upstream version: 0.13.4+git20211213.1.f2f1cf2 (was: 0.13.4).
Resulting package
Built on 2022-10-28T07:12 (took 8m31s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots libjsonld-java
Lintian Result
Diff
diff --git a/core/pom.xml b/core/pom.xml
index faac5b8..0454727 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jsonld-java-parent</artifactId>
<groupId>com.github.jsonld-java</groupId>
- <version>0.13.4</version>
+ <version>0.13.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsonld-java</artifactId>
diff --git a/debian/changelog b/debian/changelog
index 96c81dc..b38c4c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jsonld-java (0.13.4+git20211213.1.f2f1cf2-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 28 Oct 2022 07:04:58 -0000
+
jsonld-java (0.13.4-1) unstable; urgency=medium
[ Andrius Merkys ]
diff --git a/debian/patches/add-httpclient-cache.patch b/debian/patches/add-httpclient-cache.patch
index 0f5cb23..1e11b43 100644
--- a/debian/patches/add-httpclient-cache.patch
+++ b/debian/patches/add-httpclient-cache.patch
@@ -1,7 +1,9 @@
Description: Adding missing httpclient-cache artifact.
Author: Andrius Merkys <merkys@debian.org>
---- a/core/pom.xml
-+++ b/core/pom.xml
+Index: jsonld-java.git/core/pom.xml
+===================================================================
+--- jsonld-java.git.orig/core/pom.xml
++++ jsonld-java.git/core/pom.xml
@@ -27,6 +27,10 @@
</dependency>
<dependency>
diff --git a/debian/patches/skip-network-tests.patch b/debian/patches/skip-network-tests.patch
index 49908e6..ecbbb52 100644
--- a/debian/patches/skip-network-tests.patch
+++ b/debian/patches/skip-network-tests.patch
@@ -1,8 +1,10 @@
Description: Ignoring tests that require network access.
Author: Andrius Merkys <merkys@debian.org>
---- a/core/src/test/java/com/github/jsonldjava/core/ContextCompactionTest.java
-+++ b/core/src/test/java/com/github/jsonldjava/core/ContextCompactionTest.java
-@@ -9,11 +9,13 @@
+Index: jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/ContextCompactionTest.java
+===================================================================
+--- jsonld-java.git.orig/core/src/test/java/com/github/jsonldjava/core/ContextCompactionTest.java
++++ jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/ContextCompactionTest.java
+@@ -9,11 +9,13 @@ import java.util.List;
import java.util.Map;
import com.github.jsonldjava.utils.JsonUtils;
@@ -16,7 +18,7 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void testCompaction() {
-@@ -44,6 +46,7 @@
+@@ -44,6 +46,7 @@ public class ContextCompactionTest {
compacted.get("@context") instanceof List);
}
@@ -24,9 +26,11 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void testCompactionSingleRemoteContext() throws Exception {
final String jsonString = "[{\"@type\": [\"http://schema.org/Person\"] } ]";
---- a/core/src/test/java/com/github/jsonldjava/core/DocumentLoaderTest.java
-+++ b/core/src/test/java/com/github/jsonldjava/core/DocumentLoaderTest.java
-@@ -105,6 +105,7 @@
+Index: jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/DocumentLoaderTest.java
+===================================================================
+--- jsonld-java.git.orig/core/src/test/java/com/github/jsonldjava/core/DocumentLoaderTest.java
++++ jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/DocumentLoaderTest.java
+@@ -105,6 +105,7 @@ public class DocumentLoaderTest {
}
// @Ignore("Integration test")
@@ -34,7 +38,7 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void fromURLredirectHTTPSToHTTP() throws Exception {
final URL url = new URL("https://w3id.org/bundle/context");
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@ public class DocumentLoaderTest {
}
// @Ignore("Integration test")
@@ -42,7 +46,7 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void fromURLredirect() throws Exception {
final URL url = new URL("http://purl.org/wf4ever/ro-bundle/context.json");
-@@ -126,6 +128,7 @@
+@@ -126,6 +128,7 @@ public class DocumentLoaderTest {
}
// @Ignore("Integration test")
@@ -50,7 +54,7 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void loadDocumentWf4ever() throws Exception {
final RemoteDocument document = documentLoader
-@@ -152,6 +155,7 @@
+@@ -152,6 +155,7 @@ public class DocumentLoaderTest {
assertFalse(((Map<?, ?>) context).isEmpty());
}
@@ -58,7 +62,7 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void loadDocumentSchemaOrg() throws Exception {
final RemoteDocument document = documentLoader.loadDocument("http://schema.org/");
-@@ -160,6 +164,7 @@
+@@ -160,6 +164,7 @@ public class DocumentLoaderTest {
assertFalse(((Map<?, ?>) context).isEmpty());
}
@@ -66,7 +70,7 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void loadDocumentSchemaOrgDirect() throws Exception {
final RemoteDocument document = documentLoader
-@@ -353,6 +358,7 @@
+@@ -353,6 +358,7 @@ public class DocumentLoaderTest {
}
}
@@ -74,7 +78,7 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void testDisallowRemoteContexts() throws Exception {
final String testUrl = "http://json-ld.org/contexts/person.jsonld";
-@@ -418,6 +424,7 @@
+@@ -418,6 +424,7 @@ public class DocumentLoaderTest {
assertEquals(5, v);
}
@@ -82,9 +86,11 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void testRemoteContextCaching() throws Exception {
final String[] urls = { "http://schema.org/", "http://schema.org/docs/jsonldcontext.json" };
---- a/core/src/test/java/com/github/jsonldjava/core/MinimalSchemaOrgRegressionTest.java
-+++ b/core/src/test/java/com/github/jsonldjava/core/MinimalSchemaOrgRegressionTest.java
-@@ -15,6 +15,7 @@
+Index: jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/MinimalSchemaOrgRegressionTest.java
+===================================================================
+--- jsonld-java.git.orig/core/src/test/java/com/github/jsonldjava/core/MinimalSchemaOrgRegressionTest.java
++++ jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/MinimalSchemaOrgRegressionTest.java
+@@ -15,6 +15,7 @@ import org.apache.http.impl.client.Defau
import org.apache.http.impl.client.cache.BasicHttpCacheStorage;
import org.apache.http.impl.client.cache.CacheConfig;
import org.apache.http.impl.client.cache.CachingHttpClientBuilder;
@@ -92,7 +98,7 @@ Author: Andrius Merkys <merkys@debian.org>
import org.junit.Test;
public class MinimalSchemaOrgRegressionTest {
-@@ -23,6 +24,7 @@
+@@ -23,6 +24,7 @@ public class MinimalSchemaOrgRegressionT
* Tests getting JSON from schema.org with the HTTP Accept header set to
* {@value com.github.jsonldjava.utils.JsonUtils#ACCEPT_HEADER}? .
*/
@@ -100,9 +106,11 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void testApacheHttpClient() throws Exception {
final URL url = new URL("http://schema.org/");
---- a/core/src/test/java/com/github/jsonldjava/core/LocalBaseTest.java
-+++ b/core/src/test/java/com/github/jsonldjava/core/LocalBaseTest.java
-@@ -10,11 +10,13 @@
+Index: jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/LocalBaseTest.java
+===================================================================
+--- jsonld-java.git.orig/core/src/test/java/com/github/jsonldjava/core/LocalBaseTest.java
++++ jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/LocalBaseTest.java
+@@ -10,11 +10,13 @@ import java.io.Reader;
import java.nio.charset.Charset;
import java.util.List;
@@ -116,7 +124,7 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void testMixedLocalRemoteBaseRemoteContextFirst() throws Exception {
-@@ -36,6 +38,7 @@
+@@ -36,6 +38,7 @@ public class LocalBaseTest {
assertEquals(expanded, output);
}
@@ -124,9 +132,11 @@ Author: Andrius Merkys <merkys@debian.org>
@Test
public void testMixedLocalRemoteBaseLocalContextFirst() throws Exception {
---- a/core/src/test/java/com/github/jsonldjava/core/ContextFlatteningTest.java
-+++ b/core/src/test/java/com/github/jsonldjava/core/ContextFlatteningTest.java
-@@ -9,11 +9,13 @@
+Index: jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/ContextFlatteningTest.java
+===================================================================
+--- jsonld-java.git.orig/core/src/test/java/com/github/jsonldjava/core/ContextFlatteningTest.java
++++ jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/ContextFlatteningTest.java
+@@ -9,11 +9,13 @@ import java.util.List;
import java.util.Map;
import com.github.jsonldjava.utils.JsonUtils;
@@ -140,7 +150,7 @@ Author: Andrius Merkys <merkys@debian.org>
public void testFlatenning() throws Exception {
final Map<String, Object> contextAbbrevs = new HashMap<>();
-@@ -46,6 +48,7 @@
+@@ -46,6 +48,7 @@ public class ContextFlatteningTest {
}
@Test
@@ -148,9 +158,11 @@ Author: Andrius Merkys <merkys@debian.org>
public void testFlatteningRemoteContext() throws Exception {
final String jsonString =
"{\"@context\": {\"@vocab\": \"http://schema.org/\"}, \"knows\": [{\"name\": \"a\"}, {\"name\": \"b\"}] }";
---- a/core/src/test/java/com/github/jsonldjava/core/ContextFramingTest.java
-+++ b/core/src/test/java/com/github/jsonldjava/core/ContextFramingTest.java
-@@ -9,11 +9,13 @@
+Index: jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/ContextFramingTest.java
+===================================================================
+--- jsonld-java.git.orig/core/src/test/java/com/github/jsonldjava/core/ContextFramingTest.java
++++ jsonld-java.git/core/src/test/java/com/github/jsonldjava/core/ContextFramingTest.java
+@@ -9,11 +9,13 @@ import java.util.List;
import java.util.Map;
import com.github.jsonldjava.utils.JsonUtils;
@@ -164,7 +176,7 @@ Author: Andrius Merkys <merkys@debian.org>
public void testFraming() throws Exception {
final Map<String, Object> contextAbbrevs = new HashMap<>();
-@@ -46,6 +48,7 @@
+@@ -46,6 +48,7 @@ public class ContextFramingTest {
}
@Test
diff --git a/pom.xml b/pom.xml
index 4222a72..48f6c85 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java-parent</artifactId>
- <version>0.13.4</version>
+ <version>0.13.5-SNAPSHOT</version>
<name>JSONLD Java :: Parent</name>
<description>Json-LD Java Parent POM</description>
<packaging>pom</packaging>
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/maven-repo/com/github/jsonld-java/jsonld-java-parent/0.13.5-SNAPSHOT/jsonld-java-parent-0.13.5-SNAPSHOT.pom -rw-r--r-- root/root /usr/share/maven-repo/com/github/jsonld-java/jsonld-java/0.13.5-SNAPSHOT/jsonld-java-0.13.5-SNAPSHOT.pom lrwxrwxrwx root/root /usr/share/java/jsonld-java-0.13.5-SNAPSHOT.jar -> jsonld-java.jar lrwxrwxrwx root/root /usr/share/maven-repo/com/github/jsonld-java/jsonld-java/0.13.5-SNAPSHOT/jsonld-java-0.13.5-SNAPSHOT.jar -> ../../../../../../java/jsonld-java.jar
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/maven-repo/com/github/jsonld-java/jsonld-java-parent/0.13.4/jsonld-java-parent-0.13.4.pom -rw-r--r-- root/root /usr/share/maven-repo/com/github/jsonld-java/jsonld-java/0.13.4/jsonld-java-0.13.4.pom lrwxrwxrwx root/root /usr/share/java/jsonld-java-0.13.4.jar -> jsonld-java.jar lrwxrwxrwx root/root /usr/share/maven-repo/com/github/jsonld-java/jsonld-java/0.13.4/jsonld-java-0.13.4.jar -> ../../../../../../java/jsonld-java.jar
Control files: lines which differ (wdiff format)
Depends: libcommons-io-java (>= 2.11.0), libguava-java, libhttpclient-java (>= 4.5.14), 4.5.13), libjackson2-core-java (>= 2.14.1), 2.13.0), libjackson2-databind-java, libslf4j-java (>= 1.7.32)