Merge pull request #280 from eclipse/develop

develop to master

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,3 +6,7 @@ Briefly describe the changes proposed in this PR:
 * 
 * 
 * 
+
+#### Helpful tips
+ -  mvn formatter:format
+ - `// @formatter:off` and `// @formatter:on` 

README.md

@@ -18,14 +18,15 @@ guidelines](https://github.com/eclipse/rdf4j/blob/master/.github/CONTRIBUTING.md
 The short version:
 
 1. Digitally sign the [Eclipse Contributor Agreement (ECA)](https://www.eclipse.org/legal/ECA.php). You can do this by logging into the [Eclipse projects forge](http://www.eclipse.org/contribute/cla); click on "Eclipse Contributor Agreement"; and Complete the form. Be sure to use the same email address when you register for the account that you intend to use on Git commit records. See the [ECA FAQ](https://www.eclipse.org/legal/ecafaq.php) for more info. 
-2. Create an issue in the [issue tracker](https://github.com/eclipse/rdf4j/issues) that describes your improvement, new feature, or bug fix.
-3. Fork the GitHub repository.
-4. Create a new branch (starting from master) for your changes. 
-5. Make your changes on this branch. Apply the [RDF4J code formatting guidelines](https://github.com/eclipse/rdf4j-storage/blob/master/.github/CONTRIBUTING.md#code-formatting). Don't forget to include unit tests.
-6. **sign off** every commit (using the `-s` flag).
-7. Run `mvn verify` from the project root to make sure all tests succeed (both your own new ones, and existing).
-8. Use meaningful commit messages and include the issue number in each commit message.
-9. Once your fix is complete, put it up for review by opening a Pull Request against the master branch in the central Github repository.
+1. Create an issue in the [issue tracker](https://github.com/eclipse/rdf4j/issues) that describes your improvement, new feature, or bug fix.
+1. Fork the GitHub repository.
+1. Create a new branch (starting from master) for your changes. 
+1. Make your changes on this branch. Apply the [RDF4J code formatting guidelines](https://github.com/eclipse/rdf4j-storage/blob/master/.github/CONTRIBUTING.md#code-formatting). Don't forget to include unit tests.
+1. **sign off** every commit (using the `-s` flag).
+1. Run `mvn formatter:format` to format your code.
+1. Run `mvn verify` from the project root to make sure all tests succeed (both your own new ones, and existing).
+1. Use meaningful commit messages and include the issue number in each commit message.
+1. Once your fix is complete, put it up for review by opening a Pull Request against the master branch in the central Github repository.
 
 These steps are explained in more detail in the [Contributor
 guidelines](https://github.com/eclipse/rdf4j-storage/blob/master/.github/CONTRIBUTING.md).

compliance/elasticsearch/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-storage-compliance</artifactId>
-		<version>2.5-SNAPSHOT</version>
+		<version>3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-elasticsearch-compliance</artifactId>
@@ -16,8 +16,8 @@
 	<description>Tests for Elasticsearch.</description>
 
 	<properties>
-		<lucene.version>6.6.1</lucene.version>
-		<elasticsearch.version>5.6.9</elasticsearch.version>
+		<lucene.version>7.5.0</lucene.version>
+		<elasticsearch.version>6.5.4</elasticsearch.version>
 	</properties>
 
 	<!-- disable the Java security manager for elasticsearch tests -->
@@ -116,5 +116,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.11.1</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
+
 </project>

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

@@ -38,15 +38,12 @@
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
-import org.elasticsearch.test.ESIntegTestCase.SuppressLocalMode;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 @ClusterScope(numDataNodes = 1)
-@SuppressLocalMode
-@Ignore("timeouts on JIPP due to ES cluster being spun up - see https://github.com/eclipse/rdf4j/issues/1196")
 public class ElasticsearchIndexTest extends ESIntegTestCase {
 
 	private static final ValueFactory vf = SimpleValueFactory.getInstance();

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

@@ -20,15 +20,12 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
-import org.elasticsearch.test.ESIntegTestCase.SuppressLocalMode;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 @ClusterScope(numDataNodes = 1)
-@SuppressLocalMode
-@Ignore("timeouts on JIPP due to ES cluster being spun up - see https://github.com/eclipse/rdf4j/issues/1196")
 public class ElasticsearchSailGeoSPARQLTest extends ESIntegTestCase {
 
 	AbstractLuceneSailGeoSPARQLTest delegateTest;

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

@@ -20,15 +20,12 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
-import org.elasticsearch.test.ESIntegTestCase.SuppressLocalMode;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 @ClusterScope(numDataNodes = 1)
-@SuppressLocalMode
-@Ignore("timeouts on JIPP due to ES cluster being spun up - see https://github.com/eclipse/rdf4j/issues/1196")
 public class ElasticsearchSailIndexedPropertiesTest extends ESIntegTestCase {
 
 	AbstractLuceneSailIndexedPropertiesTest delegateTest;

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

@@ -20,15 +20,12 @@
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESIntegTestCase;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
-import org.elasticsearch.test.ESIntegTestCase.SuppressLocalMode;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 @ClusterScope(numDataNodes = 1)
-@SuppressLocalMode
-@Ignore("timeouts on JIPP due to ES cluster being spun up - see https://github.com/eclipse/rdf4j/issues/1196")
 public class ElasticsearchSailTest extends ESIntegTestCase {
 
 	AbstractLuceneSailTest delegateTest;

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

@@ -3,6 +3,8 @@
 import java.net.URL;
 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
@@ -29,4 +31,6 @@ public static Set<URL> parseClassPath() {
 		return Collections.emptySet();
 	}
 
+	public static void checkJarHell(Consumer o) {
+	}
 }

compliance/geosparql/pom.xml

@@ -1,12 +1,13 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-storage-compliance</artifactId>
-		<version>2.5-SNAPSHOT</version>
+		<version>3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-geosparql-compliance</artifactId>
@@ -25,17 +26,16 @@
 			<artifactId>rdf4j-queryalgebra-geosparql</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>rdf4j-queryparser-serql</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<webappDirectory>${project.build.directory}/openrdf-sesame</webappDirectory>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>

compliance/lucene/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-storage-compliance</artifactId>
-		<version>2.5-SNAPSHOT</version>
+		<version>3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-lucene-compliance</artifactId>
@@ -64,7 +64,7 @@
 		<profile>
 			<id>jdk9</id>
 			<activation>
-				<jdk>[1.9,9,)</jdk>
+				<jdk>[1.9,9,10)</jdk>
 			</activation>
 		</profile>
 	</profiles>

compliance/pom.xml

@@ -5,16 +5,15 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-storage-parent</artifactId>
-		<version>2.5-SNAPSHOT</version>
+		<version>3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-storage-compliance</artifactId>
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>sail-model</module>
 		<module>sparql</module>
-        <module>lucene</module>
+		<module>lucene</module>
 		<module>elasticsearch</module>
 		<module>solr</module>
 		<module>store</module>

compliance/serql/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.rdf4j</groupId>
 		<artifactId>rdf4j-storage-compliance</artifactId>
-		<version>2.5-SNAPSHOT</version>
+		<version>3.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>rdf4j-serql-compliance</artifactId>
@@ -14,12 +14,6 @@
 	<description>Tests for the SeRQL query language implementation</description>
 
 	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>rdf4j-runtime</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>rdf4j-serql-testsuite</artifactId>