Merge branch 'develop' into releases/3.0.0-M1

eclipse-rdf4j · Jun 29, 2019 · cd7d29b · cd7d29b
2 parents 630e018 + d60bb49
commit cd7d29b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 20 deletions.
diff --git a/compliance/repository/pom.xml b/compliance/repository/pom.xml
@@ -17,7 +17,7 @@
 	<description>Compliance testing for the Repository API implementations</description>
 
 	<properties>
-		<jetty.version>7.0.2.v20100331</jetty.version>
+		<jetty.version>9.4.19.v20190610</jetty.version>
 	</properties>
 
 	<dependencies>
@@ -74,13 +74,6 @@
 			<version>${jetty.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty-jsp-2.1</artifactId>
-			<version>${jetty.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>

diff --git a/compliance/repository/src/test/java/org/eclipse/rdf4j/repository/http/HTTPMemServer.java b/compliance/repository/src/test/java/org/eclipse/rdf4j/repository/http/HTTPMemServer.java
@@ -10,9 +10,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.BlockingChannelConnector;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.rdf4j.http.protocol.Protocol;
 import org.eclipse.rdf4j.repository.Repository;
@@ -29,7 +27,7 @@ public class HTTPMemServer {
 
 	private static final String HOST = "localhost";
 
-	private static final int PORT = 18080;
+	private static final int PORT = 18081;
 
 	private static final String TEST_REPO_ID = "Test";
 
@@ -48,17 +46,9 @@ public class HTTPMemServer {
 	public HTTPMemServer() {
 		System.clearProperty("DEBUG");
 
-		jetty = new Server();
-
-		Connector conn = new BlockingChannelConnector();
-		conn.setHost(HOST);
-		conn.setPort(PORT);
-		jetty.addConnector(conn);
+		jetty = new Server(PORT);
 
 		WebAppContext webapp = new WebAppContext();
-		// TODO temporarily disabled so the integration test server shows server-side logging.
-		// webapp.addSystemClass("org.slf4j.");
-		// webapp.addSystemClass("ch.qos.logback.");
 		webapp.setContextPath(RDF4J_CONTEXT);
 		// warPath configured in pom.xml maven-war-plugin configuration
 		webapp.setWar("./target/rdf4j-server");

diff --git a/...rc/test/java/org/eclipse/rdf4j/repository/http/RDFSchemaHTTPRepositoryConnectionTest.java b/...rc/test/java/org/eclipse/rdf4j/repository/http/RDFSchemaHTTPRepositoryConnectionTest.java
@@ -20,6 +20,7 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+/* FIXME: are these tests really necessary, or are we just duplicating what is already tested locally? */
 public class RDFSchemaHTTPRepositoryConnectionTest extends RDFSchemaRepositoryConnectionTest {
 
 	private static HTTPMemServer server;
@@ -145,6 +146,34 @@ public void testAddMalformedLiteralsDefaultConfig() throws Exception {
 		}
 	}
 
+	@Override
+	@Test
+	@Ignore
+	public void testQueryDefaultGraph() throws Exception {
+		// ignore - schema caching inferencer uses different context handling
+	}
+
+	@Override
+	@Test
+	@Ignore
+	public void testDeleteDefaultGraph() throws Exception {
+		// ignore - schema caching inferencer uses different context handling
+	}
+
+	@Override
+	@Test
+	@Ignore
+	public void testContextStatementsNotDuplicated() throws Exception {
+		// ignore - schema caching inferencer uses different context handling
+	}
+
+	@Override
+	@Test
+	@Ignore
+	public void testContextStatementsNotDuplicated2() throws Exception {
+		// ignore - schema caching inferencer uses different context handling
+	}
+
 	@Test
 	@Override
 	@Ignore("See SES-1833")