Merge branch 'master' of https://github.com/eclipse/rdf4j into eclips…

…e-rdf4jGH-405-add-alt-bag-seq

.github/workflows/develop-status.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest    
     strategy:
       matrix:
-        jdk: [1.8, 11]
+        jdk: [1.8, 13]
 
     steps:
     - uses: actions/checkout@v1

.github/workflows/master-status.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest    
     strategy:
       matrix:
-        jdk: [1.8, 11]
+        jdk: [1.8, 13]
 
     steps:
     - uses: actions/checkout@v1

.github/workflows/new-issue.yml

@@ -10,5 +10,5 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_PROJECT_URL: https://github.com/eclipse/rdf4j/projects/19
-        GITHUB_PROJECT_COLUMN_NAME: Inbox
+        GITHUB_PROJECT_COLUMN_NAME: 📥 Inbox
 

.github/workflows/pr-verify.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [1.8, 11]
+        jdk: [1.8, 13]
 
     steps:
     - uses: actions/checkout@v1

README.md

@@ -2,8 +2,8 @@
 
 This is the main code repository for the Eclipse RDF4J project. 
 
-![](https://github.com/eclipse/rdf4j/workflows/master%20status/badge.svg)
-![](https://github.com/eclipse/rdf4j/workflows/develop%20status/badge.svg)
+[![master status](https://github.com/eclipse/rdf4j/workflows/master%20status/badge.svg)](https://github.com/eclipse/rdf4j/actions?query=workflow%3A%22master+status%22)
+[![develop status](https://github.com/eclipse/rdf4j/workflows/develop%20status/badge.svg)](https://github.com/eclipse/rdf4j/actions?query=workflow%3A%22develop+status%22)
 
 Visit the [project website](https://rdf4j.org/) for news, documentation, and downloadable releases.
 

assembly/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-assembly</artifactId>
 	<packaging>pom</packaging>

bom/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-bom</artifactId>
 	<packaging>pom</packaging>

compliance/elasticsearch/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-elasticsearch-compliance</artifactId>
 	<name>RDF4J Elasticsearch Sail Tests</name>

compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchIndexTest.java

@@ -40,7 +40,6 @@
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 @ClusterScope(numDataNodes = 1)
@@ -443,15 +442,17 @@ public void testRejectedDatatypes() {
 
 	private void assertStatement(Statement statement) throws Exception {
 		SearchDocument document = index.getDocument(statement.getSubject(), statement.getContext());
-		if (document == null)
+		if (document == null) {
 			fail("Missing document " + statement.getSubject());
+		}
 		assertStatement(statement, document);
 	}
 
 	private void assertNoStatement(Statement statement) throws Exception {
 		SearchDocument document = index.getDocument(statement.getSubject(), statement.getContext());
-		if (document == null)
+		if (document == null) {
 			return;
+		}
 		assertNoStatement(statement, document);
 	}
 
@@ -463,8 +464,9 @@ private void assertStatement(Statement statement, SearchDocument document) {
 		List<String> fields = document.getProperty(SearchFields.getPropertyField(statement.getPredicate()));
 		assertNotNull("field " + statement.getPredicate() + " not found in document " + document, fields);
 		for (String f : fields) {
-			if (((Literal) statement.getObject()).getLabel().equals(f))
+			if (((Literal) statement.getObject()).getLabel().equals(f)) {
 				return;
+			}
 		}
 		fail("Statement not found in document " + statement);
 	}
@@ -475,11 +477,13 @@ private void assertStatement(Statement statement, SearchDocument document) {
 	 */
 	private void assertNoStatement(Statement statement, SearchDocument document) {
 		List<String> fields = document.getProperty(SearchFields.getPropertyField(statement.getPredicate()));
-		if (fields == null)
+		if (fields == null) {
 			return;
+		}
 		for (String f : fields) {
-			if (((Literal) statement.getObject()).getLabel().equals(f))
+			if (((Literal) statement.getObject()).getLabel().equals(f)) {
 				fail("Statement should not be found in document " + statement);
+			}
 		}
 
 	}

compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailIndexedPropertiesTest.java

@@ -22,7 +22,6 @@
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 @ClusterScope(numDataNodes = 1)

compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailTest.java

@@ -22,7 +22,6 @@
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 @ClusterScope(numDataNodes = 1)

compliance/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/examples/ElasticsearchSailExample.java

@@ -29,14 +29,14 @@
 
 /**
  * Example code showing how to use the LuceneSail
- * 
+ *
  * @author sauermann
  */
 public class ElasticsearchSailExample {
 
 	/**
 	 * Create a lucene sail and use it
-	 * 
+	 *
 	 * @param args
 	 */
 	public static void main(String[] args) throws Exception {

compliance/elasticsearch/src/test/java/org/elasticsearch/bootstrap/JarHell.java

@@ -4,7 +4,6 @@
 import java.util.Collections;
 import java.util.Set;
 import java.util.function.Consumer;
-import java.util.logging.Logger;
 
 /**
  * test of elasticsearch pass. Thus as a workaround we deactivate this test. see

compliance/geosparql/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-geosparql-compliance</artifactId>
 	<name>RDF4J GeoSPARQL compliance tests</name>

compliance/lucene/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-lucene-compliance</artifactId>
 	<name>RDF4J Lucene Sail Tests</name>

compliance/lucene/src/test/java/org/eclipse/rdf4j/sail/lucene/LuceneGeoSPARQLTest.java

@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Distribution License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/org/documents/edl-v10.php.
-	 *******************************************************************************/
+ *******************************************************************************/
 package org.eclipse.rdf4j.sail.lucene;
 
 import java.io.File;

compliance/lucene/src/test/java/org/eclipse/rdf4j/sail/lucene/LuceneSailIndexedPropertiesTest.java

@@ -15,7 +15,7 @@ public class LuceneSailIndexedPropertiesTest extends AbstractLuceneSailIndexedPr
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.rdf4j.sail.lucene.AbstractLuceneSailIndexedPropertiesTest#configure(org.eclipse.rdf4j.sail.lucene.
 	 * LuceneSail)

compliance/lucene/src/test/java/org/eclipse/rdf4j/sail/lucene/LuceneSailTest.java

@@ -17,7 +17,7 @@ public class LuceneSailTest extends AbstractLuceneSailTest {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.rdf4j.sail.lucene.AbstractLuceneSailTest#configure(org.eclipse.rdf4j.sail.lucene.LuceneSail)
 	 */
 	@Override

compliance/model/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>rdf4j-compliance</artifactId>
 		<groupId>org.eclipse.rdf4j</groupId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.2.2-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>rdf4j-model-compliance</artifactId>

compliance/model/src/test/java/org/eclipse/rdf4j/model/DynamicModelTest.java

@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Eclipse RDF4J contributors, Aduna, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Distribution License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *******************************************************************************/
+package org.eclipse.rdf4j.model;
+
+import org.eclipse.rdf4j.model.impl.DynamicModel;
+import org.eclipse.rdf4j.model.impl.LinkedHashModelFactory;
+
+public class DynamicModelTest extends AbstractModelTest {
+
+	@Override
+	protected Model getNewModel() {
+		return new DynamicModel(new LinkedHashModelFactory());
+	}
+
+}

compliance/model/src/test/java/org/eclipse/rdf4j/model/LinkedHashModelNamespacesTest.java

@@ -12,7 +12,7 @@
 /**
  * Tests for {@link Namespace} support in {@link LinkedHashModel} using the abstract tests defined in
  * {@link ModelNamespacesTest}.
- * 
+ *
  * @author Peter Ansell p_ansell@yahoo.com
  */
 public class LinkedHashModelNamespacesTest extends ModelNamespacesTest {

compliance/model/src/test/java/org/eclipse/rdf4j/model/TreeModelNamespacesTest.java

@@ -12,7 +12,7 @@
 /**
  * Tests for {@link Namespace} support in {@link TreeModel} using the abstract tests defined in
  * {@link ModelNamespacesTest}.
- * 
+ *
  * @author Peter Ansell p_ansell@yahoo.com
  */
 public class TreeModelNamespacesTest extends ModelNamespacesTest {

compliance/model/src/test/java/org/eclipse/rdf4j/model/util/IsomorphicBenchmark.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 201 Eclipse RDF4J contributors.
+ * Copyright (c) 2019 Eclipse RDF4J contributors.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Distribution License v1.0
  * which accompanies this distribution, and is available at

compliance/model/src/test/java/org/eclipse/rdf4j/model/util/IsomorphicTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 201 Eclipse RDF4J contributors.
+ * Copyright (c) 2019 Eclipse RDF4J contributors.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Distribution License v1.0
  * which accompanies this distribution, and is available at

compliance/model/src/test/java/org/eclipse/rdf4j/model/util/Main.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 201 Eclipse RDF4J contributors.
+ * Copyright (c) 2019 Eclipse RDF4J contributors.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Distribution License v1.0
  * which accompanies this distribution, and is available at

compliance/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-compliance</artifactId>
 	<packaging>pom</packaging>

compliance/repository/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-compliance</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>rdf4j-repository-compliance</artifactId>
 	<packaging>war</packaging>
@@ -56,18 +56,6 @@
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>rdf4j-repository-sail</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>rdf4j-sail-memory</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>

compliance/repository/src/test/java/org/eclipse/rdf4j/repository/manager/LocalRepositoryManagerIntegrationTest.java

@@ -40,7 +40,7 @@
 
 /**
  * Integration tests for {@link LocalRepositoryManager}
- * 
+ *
  * @author Jeen Broekstra
  */
 public class LocalRepositoryManagerIntegrationTest extends RepositoryManagerIntegrationTest {

compliance/repository/src/test/java/org/eclipse/rdf4j/repository/manager/RepositoryManagerIntegrationTest.java

@@ -53,4 +53,4 @@ protected Repository createRepository(String id) throws RepositoryConfigExceptio
 		};
 	}
 
-}
+}