From 8dbf91c73ee0d733b0955f4c850aea7bf01e4aa6 Mon Sep 17 00:00:00 2001
From: Aaron Coburn <aaronc@inrupt.com>
Date: Fri, 29 Aug 2025 14:57:30 -0500
Subject: [PATCH 1/2] JCL-476: Set Java 17 as minimum support version

---
 .github/workflows/ci-config.yml               |   2 +-
 README.md                                     |   2 +-
 access-grant/pom.xml                          |   4 -
 api/pom.xml                                   |   4 -
 bom/pom.xml                                   |   5 -
 core/pom.xml                                  |   4 -
 examples/cli/pom.xml                          |   2 -
 examples/pom.xml                              |  22 +-
 examples/spring-web/pom.xml                   |   1 -
 examples/springboot/pom.xml                   |   1 -
 examples/webapp/pom.xml                       |   2 -
 okhttp/pom.xml                                |   4 -
 openid/pom.xml                                |   4 -
 parser/pom.xml                                |   4 -
 pom.xml                                       |  36 +--
 rdf-legacy/pom.xml                            | 215 ------------------
 .../client/rdf/legacy/RDFLegacyService.java   | 122 ----------
 .../client/rdf/legacy/package-info.java       |  24 --
 .../services/com.inrupt.client.spi.RdfService |   1 -
 rdf-legacy/src/site/resources/css/site.css    |  22 --
 .../resources/images/inrupt_logo-2020.svg     |   1 -
 rdf-legacy/src/site/site.xml                  |  14 --
 .../client/rdf/legacy/RDF4JTestModel.java     |  52 -----
 .../rdf/legacy/RDFLegacyServiceTest.java      | 213 -----------------
 .../src/test/resources/relativeURIs.ttl       |   7 -
 .../test/resources/simplelogger.properties    |   1 -
 rdf4j/pom.xml                                 |   1 -
 reports/pom.xml                               |   5 -
 solid/pom.xml                                 |   4 -
 spring/pom.xml                                |  12 -
 uma/pom.xml                                   |   4 -
 31 files changed, 14 insertions(+), 781 deletions(-)
 delete mode 100644 rdf-legacy/pom.xml
 delete mode 100644 rdf-legacy/src/main/java/com/inrupt/client/rdf/legacy/RDFLegacyService.java
 delete mode 100644 rdf-legacy/src/main/java/com/inrupt/client/rdf/legacy/package-info.java
 delete mode 100644 rdf-legacy/src/main/resources/META-INF/services/com.inrupt.client.spi.RdfService
 delete mode 100644 rdf-legacy/src/site/resources/css/site.css
 delete mode 100644 rdf-legacy/src/site/resources/images/inrupt_logo-2020.svg
 delete mode 100644 rdf-legacy/src/site/site.xml
 delete mode 100644 rdf-legacy/src/test/java/com/inrupt/client/rdf/legacy/RDF4JTestModel.java
 delete mode 100644 rdf-legacy/src/test/java/com/inrupt/client/rdf/legacy/RDFLegacyServiceTest.java
 delete mode 100644 rdf-legacy/src/test/resources/relativeURIs.ttl
 delete mode 100644 rdf-legacy/src/test/resources/simplelogger.properties

diff --git a/.github/workflows/ci-config.yml b/.github/workflows/ci-config.yml
index d75d5219a6b..c605968ec9c 100644
--- a/.github/workflows/ci-config.yml
+++ b/.github/workflows/ci-config.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11, 17, 21 ]
+        java: [ 17, 21 ]
       fail-fast: false
 
     steps:
diff --git a/README.md b/README.md
index e4400febcd8..9fe376d3ac5 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ After cloning the repository locally you can work with the code as follows:
 
 ### Code build
 
-The project can be built with Maven and a Java 11+ build environment.
+The project can be built with Maven and a Java 17+ build environment.
 
 ```bash
     ./mvnw install
diff --git a/access-grant/pom.xml b/access-grant/pom.xml
index 6c115115d7f..044a3db370e 100644
--- a/access-grant/pom.xml
+++ b/access-grant/pom.xml
@@ -13,10 +13,6 @@
       Access Grant support for the Inrupt Client Libraries.
   </description>
 
-  <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.inrupt.client</groupId>
diff --git a/api/pom.xml b/api/pom.xml
index 1ff147b79cb..b203e9deafa 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -13,10 +13,6 @@
       The Application Programming Interfaces for the Inrupt Java Client Libraries.
   </description>
 
-  <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>commons-io</groupId>
diff --git a/bom/pom.xml b/bom/pom.xml
index db5e4d53ade..40e32442a73 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -88,11 +88,6 @@
         <artifactId>inrupt-client-rdf4j</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.inrupt.client</groupId>
-        <artifactId>inrupt-client-rdf-legacy</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.inrupt.client</groupId>
         <artifactId>inrupt-client-runtime</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 11d33375233..58b5755b143 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -13,10 +13,6 @@
       Core Classes and Utilities for the Inrupt Java Client Libraries.
   </description>
 
-  <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
diff --git a/examples/cli/pom.xml b/examples/cli/pom.xml
index e08f1d6f1a3..48c444761e4 100644
--- a/examples/cli/pom.xml
+++ b/examples/cli/pom.xml
@@ -16,8 +16,6 @@
   </description>
 
   <properties>
-    <maven.compiler.release>17</maven.compiler.release>
-
     <quarkus.version>3.24.3</quarkus.version>
   </properties>
 
diff --git a/examples/pom.xml b/examples/pom.xml
index 32f9f0ebee3..50de44944f7 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -14,6 +14,13 @@
   </description>
   <packaging>pom</packaging>
 
+  <modules>
+    <module>cli</module>
+    <module>springboot</module>
+    <module>spring-web</module>
+    <module>webapp</module>
+  </modules>
+
   <build>
     <plugins>
       <plugin>
@@ -40,19 +47,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>java-17</id>
-      <activation>
-        <jdk>[17,)</jdk>
-      </activation>
-      <modules>
-        <module>cli</module>
-        <module>springboot</module>
-        <module>spring-web</module>
-        <module>webapp</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>
diff --git a/examples/spring-web/pom.xml b/examples/spring-web/pom.xml
index e0515da5bd0..924092e32c7 100644
--- a/examples/spring-web/pom.xml
+++ b/examples/spring-web/pom.xml
@@ -16,7 +16,6 @@
   </description>
 
   <properties>
-    <maven.compiler.release>17</maven.compiler.release>
     <springboot.version>3.5.4</springboot.version>
   </properties>
 
diff --git a/examples/springboot/pom.xml b/examples/springboot/pom.xml
index c4174970d9a..06fc2df65c0 100644
--- a/examples/springboot/pom.xml
+++ b/examples/springboot/pom.xml
@@ -16,7 +16,6 @@
   </description>
 
   <properties>
-    <maven.compiler.release>17</maven.compiler.release>
     <springboot.version>3.5.4</springboot.version>
   </properties>
 
diff --git a/examples/webapp/pom.xml b/examples/webapp/pom.xml
index d141d35ef8b..183d0dec735 100644
--- a/examples/webapp/pom.xml
+++ b/examples/webapp/pom.xml
@@ -16,8 +16,6 @@
   </description>
 
   <properties>
-    <maven.compiler.release>17</maven.compiler.release>
-
     <quarkus.version>3.24.3</quarkus.version>
   </properties>
 
diff --git a/okhttp/pom.xml b/okhttp/pom.xml
index e7ee07bbb01..589466375dc 100644
--- a/okhttp/pom.xml
+++ b/okhttp/pom.xml
@@ -13,10 +13,6 @@
       The OkHttp bindings for the Inrupt Java Client Libraries.
   </description>
 
-  <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.inrupt.client</groupId>
diff --git a/openid/pom.xml b/openid/pom.xml
index c55318257e2..9f034d5c109 100644
--- a/openid/pom.xml
+++ b/openid/pom.xml
@@ -13,10 +13,6 @@
       An OpenID library for the Inrupt Java Client Libraries.
   </description>
 
-  <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.inrupt.client</groupId>
diff --git a/parser/pom.xml b/parser/pom.xml
index 0d6b236f7fc..87ed18d71d3 100644
--- a/parser/pom.xml
+++ b/parser/pom.xml
@@ -13,10 +13,6 @@
       Parsing utilities for the Inrupt Java Client Libraries.
   </description>
 
-  <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.antlr</groupId>
diff --git a/pom.xml b/pom.xml
index 4e07a3d03c3..5430dcd8706 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 
   <properties>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <maven.compiler.release>11</maven.compiler.release>
+    <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -34,8 +34,7 @@
     <okhttp.version>5.1.0</okhttp.version>
     <quarkus.version>3.24.3</quarkus.version>
     <slf4j.version>2.0.17</slf4j.version>
-    <!-- pinning to Spring 5.x for Java 11 support -->
-    <spring.security.version>5.8.14</spring.security.version>
+    <spring.security.version>6.5.3</spring.security.version>
     <inrupt.commons.rdf4j.version>0.6.0</inrupt.commons.rdf4j.version>
     <inrupt.rdf.wrapping.version>1.1.1</inrupt.rdf.wrapping.version>
 
@@ -110,18 +109,19 @@
     <module>okhttp</module>
     <module>openid</module>
     <module>parser</module>
+    <module>quarkus</module>
     <module>rdf4j</module>
-    <module>rdf-legacy</module>
     <module>solid</module>
+    <module>spring</module>
     <module>test</module>
     <module>uma</module>
     <module>webid</module>
     <module>vocabulary</module>
     <module>runtime</module>
-    <module>spring</module>
     <module>integration</module>
     <module>performance</module>
     <module>archetypes</module>
+    <module>reports</module>
   </modules>
 
   <distributionManagement>
@@ -769,26 +769,6 @@
   </reporting>
 
   <profiles>
-    <profile>
-      <id>java-11</id>
-      <activation>
-        <jdk>11</jdk>
-      </activation>
-      <properties>
-        <jena.version>4.10.0</jena.version>
-        <smallrye.config.version>3.10.2</smallrye.config.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>java-17</id>
-      <activation>
-        <jdk>[17,)</jdk>
-      </activation>
-      <modules>
-        <module>quarkus</module>
-        <module>reports</module>
-      </modules>
-    </profile>
     <profile>
       <id>publish</id>
       <!-- skip tests for publish profile, since these tests have already run -->
@@ -850,12 +830,6 @@
         <archetype.test.skip>true</archetype.test.skip>
       </properties>
     </profile>
-    <profile>
-      <id>java-21</id>
-      <activation>
-        <jdk>[11,21)</jdk>
-      </activation>
-    </profile>
   </profiles>
 
   <developers>
diff --git a/rdf-legacy/pom.xml b/rdf-legacy/pom.xml
deleted file mode 100644
index c37d7ebaade..00000000000
--- a/rdf-legacy/pom.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.inrupt.client</groupId>
-    <artifactId>inrupt-client</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>inrupt-client-rdf-legacy</artifactId>
-  <name>Inrupt Java Client Libraries - Java 8 RDF Support</name>
-  <description>
-      Java 8 RDF support for the Inrupt Java Client Libraries.
-  </description>
-
-  <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-
-    <!-- version management -->
-    <commons.text.version>1.14.0</commons.text.version>
-    <!-- do not advance to v4.x -->
-    <legacy.rdf4j.version>3.7.7</legacy.rdf4j.version>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.junit</groupId>
-        <artifactId>junit-bom</artifactId>
-        <version>${junit.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>com.fasterxml.jackson</groupId>
-        <artifactId>jackson-bom</artifactId>
-        <version>${jackson.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>org.eclipse.rdf4j</groupId>
-        <artifactId>rdf4j-bom</artifactId>
-        <version>${legacy.rdf4j.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>${commons.io.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.inrupt.client</groupId>
-      <artifactId>inrupt-client-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.inrupt.rdf</groupId>
-      <artifactId>inrupt-commons-rdf4j</artifactId>
-      <version>${inrupt.commons.rdf4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-rio-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-model</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-query</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-repository-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-repository-sparql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-rio-turtle</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-rio-trig</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-rio-ntriples</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-rio-nquads</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-repository-sail</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.rdf4j</groupId>
-      <artifactId>rdf4j-sail-memory</artifactId>
-    </dependency>
-
-    <!-- transitive dependencies -->
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-text</artifactId>
-      <version>${commons.text.version}</version>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>org.wiremock</groupId>
-      <artifactId>wiremock</artifactId>
-      <version>${wiremock.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>${slf4j.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.inrupt.client</groupId>
-      <artifactId>inrupt-client-httpclient</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.inrupt.client</groupId>
-      <artifactId>inrupt-client-okhttp</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.inrupt.client</groupId>
-      <artifactId>inrupt-client-test</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-test</id>
-            <phase>none</phase>
-          </execution>
-          <execution>
-            <id>httpclient-test</id>
-            <phase>test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <classpathDependencyExcludes>
-                <classpathDependencyExclude>com.inrupt.client:inrupt-client-okhttp</classpathDependencyExclude>
-              </classpathDependencyExcludes>
-            </configuration>
-          </execution>
-          <execution>
-            <id>okhttp-test</id>
-            <phase>test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-            <configuration>
-              <classpathDependencyExcludes>
-                <classpathDependencyExclude>com.inrupt.client:inrupt-client-httpclient</classpathDependencyExclude>
-              </classpathDependencyExcludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables />
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/rdf-legacy/src/main/java/com/inrupt/client/rdf/legacy/RDFLegacyService.java b/rdf-legacy/src/main/java/com/inrupt/client/rdf/legacy/RDFLegacyService.java
deleted file mode 100644
index ade9a0249f0..00000000000
--- a/rdf-legacy/src/main/java/com/inrupt/client/rdf/legacy/RDFLegacyService.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright Inrupt Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.inrupt.client.rdf.legacy;
-
-import com.inrupt.client.spi.RdfService;
-import com.inrupt.commons.rdf4j.RDF4J;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-import org.apache.commons.rdf.api.Dataset;
-import org.apache.commons.rdf.api.Graph;
-import org.apache.commons.rdf.api.RDFSyntax;
-import org.eclipse.rdf4j.model.Model;
-import org.eclipse.rdf4j.model.Statement;
-import org.eclipse.rdf4j.repository.Repository;
-import org.eclipse.rdf4j.repository.RepositoryConnection;
-import org.eclipse.rdf4j.repository.sail.SailRepository;
-import org.eclipse.rdf4j.rio.RDFFormat;
-import org.eclipse.rdf4j.rio.RDFWriter;
-import org.eclipse.rdf4j.rio.Rio;
-import org.eclipse.rdf4j.sail.memory.MemoryStore;
-
-/**
- * An {@link RdfService} that uses a Java 8-compatible version of the RDF4J library.
- */
-public class RDFLegacyService implements RdfService {
-
-    private static final Map<RDFSyntax, RDFFormat> SYNTAX_TO_FORMAT = buildSyntaxMapping();
-    private static final RDF4J rdf = new RDF4J();
-
-    @Override
-    public void fromDataset(final Dataset dataset, final RDFSyntax syntax, final OutputStream output)
-            throws IOException {
-        final RDFFormat format = Objects.requireNonNull(SYNTAX_TO_FORMAT.get(syntax));
-        final RDFWriter writer = Rio.createWriter(format, output);
-        try {
-            writer.startRDF();
-            try (final Stream<Statement> statements = dataset.stream().map(rdf::asStatement)) {
-                statements.sequential().forEach(writer::handleStatement);
-            }
-            writer.endRDF();
-        } catch (final org.eclipse.rdf4j.RDF4JException ex) {
-            throw new IOException("Error serializing dataset", ex);
-        }
-    }
-
-    @Override
-    public void fromGraph(final Graph graph, final RDFSyntax syntax, final OutputStream output) throws IOException {
-        final RDFFormat format = Objects.requireNonNull(SYNTAX_TO_FORMAT.get(syntax));
-        final RDFWriter writer = Rio.createWriter(format, output);
-        try {
-            writer.startRDF();
-            try (final Stream<Statement> statements = graph.stream().map(rdf::asStatement)) {
-                statements.sequential().forEach(writer::handleStatement);
-            }
-            writer.endRDF();
-        } catch (final org.eclipse.rdf4j.RDF4JException ex) {
-            throw new IOException("Error serializing graph", ex);
-        }
-    }
-
-    @Override
-    public Dataset toDataset(final RDFSyntax syntax, final InputStream input, final String baseUri) throws IOException {
-        final RDFFormat format = Objects.requireNonNull(SYNTAX_TO_FORMAT.get(syntax));
-        final Repository repository = new SailRepository(new MemoryStore());
-        try {
-            try (final RepositoryConnection conn = repository.getConnection()) {
-                conn.add(input, baseUri, format);
-            }
-            return rdf.asDataset(repository);
-        } catch (final org.eclipse.rdf4j.RDF4JException ex) {
-            throw new IOException("Error parsing dataset", ex);
-        }
-    }
-
-    @Override
-    public Graph toGraph(final RDFSyntax syntax, final InputStream input, final String baseUri) throws IOException {
-        final RDFFormat format = Objects.requireNonNull(SYNTAX_TO_FORMAT.get(syntax));
-
-        try {
-            final Model model = Rio.parse(input, baseUri, format);
-            return rdf.asGraph(model);
-        } catch (final org.eclipse.rdf4j.RDF4JException ex) {
-            throw new IOException("Error parsing graph", ex);
-        }
-    }
-
-    static Map<RDFSyntax, RDFFormat> buildSyntaxMapping() {
-        final Map<RDFSyntax, RDFFormat> mapping = new HashMap<>();
-        mapping.put(RDFSyntax.TURTLE, RDFFormat.TURTLE);
-        mapping.put(RDFSyntax.TRIG, RDFFormat.TRIG);
-        mapping.put(RDFSyntax.JSONLD, RDFFormat.JSONLD);
-        mapping.put(RDFSyntax.NTRIPLES, RDFFormat.NTRIPLES);
-        mapping.put(RDFSyntax.NQUADS, RDFFormat.NQUADS);
-        return Collections.unmodifiableMap(mapping);
-    }
-}
diff --git a/rdf-legacy/src/main/java/com/inrupt/client/rdf/legacy/package-info.java b/rdf-legacy/src/main/java/com/inrupt/client/rdf/legacy/package-info.java
deleted file mode 100644
index 29dd762ea69..00000000000
--- a/rdf-legacy/src/main/java/com/inrupt/client/rdf/legacy/package-info.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Inrupt Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-/**
- * <h2>Legacy (Java 8) RDF support for the Inrupt Java Client Libraries.</h2>
- */
-package com.inrupt.client.rdf.legacy;
diff --git a/rdf-legacy/src/main/resources/META-INF/services/com.inrupt.client.spi.RdfService b/rdf-legacy/src/main/resources/META-INF/services/com.inrupt.client.spi.RdfService
deleted file mode 100644
index 093a00615d2..00000000000
--- a/rdf-legacy/src/main/resources/META-INF/services/com.inrupt.client.spi.RdfService
+++ /dev/null
@@ -1 +0,0 @@
-com.inrupt.client.rdf.legacy.RDFLegacyService
diff --git a/rdf-legacy/src/site/resources/css/site.css b/rdf-legacy/src/site/resources/css/site.css
deleted file mode 100644
index 97fdf4abca6..00000000000
--- a/rdf-legacy/src/site/resources/css/site.css
+++ /dev/null
@@ -1,22 +0,0 @@
-#banner img {
-  width: 200px;
-}
-
-table.bodyTable tr.a {
-  background-color: #ddd;
-}
-
-table.bodyTable tr.b {
-  background-color: #eee;
-}
-
-div.sidebar-nav {
-    display: none;
-}
-
-a.externalLink,
-a.externalLink[href^=http],
-a.externalLink[href^=https] {
-    background: none;
-    padding-right: 0px;
-}
diff --git a/rdf-legacy/src/site/resources/images/inrupt_logo-2020.svg b/rdf-legacy/src/site/resources/images/inrupt_logo-2020.svg
deleted file mode 100644
index 05e59ed4a5d..00000000000
--- a/rdf-legacy/src/site/resources/images/inrupt_logo-2020.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 242.92 69.18"><defs><style>.cls-1{fill:#7f3fff;}.cls-2{fill:#0d6796;}.cls-3{fill:url(#linear-gradient);}.cls-10,.cls-11,.cls-12,.cls-4,.cls-5,.cls-6,.cls-7,.cls-8,.cls-9{fill:none;stroke-miterlimit:10;stroke-width:1.32px;}.cls-4{stroke:url(#linear-gradient-2);}.cls-5{stroke:url(#linear-gradient-3);}.cls-6{stroke:url(#linear-gradient-4);}.cls-7{stroke:url(#linear-gradient-5);}.cls-8{stroke:url(#linear-gradient-6);}.cls-9{stroke:url(#linear-gradient-7);}.cls-10{stroke:url(#linear-gradient-8);}.cls-11{stroke:url(#linear-gradient-9);}.cls-12{stroke:url(#linear-gradient-10);}</style><linearGradient id="linear-gradient" x1="90.95" y1="59.24" x2="231.93" y2="59.24" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2a88af"/><stop offset="0.1" stop-color="#2c8fb5"/><stop offset="0.23" stop-color="#31a2c4"/><stop offset="0.39" stop-color="#3ac0de"/><stop offset="0.49" stop-color="#40d6f0"/><stop offset="1" stop-color="#80e3f5"/></linearGradient><linearGradient id="linear-gradient-2" x1="228.04" y1="9.99" x2="242.92" y2="9.99" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1ad5ea"/><stop offset="0.1" stop-color="#1ed5eb"/><stop offset="0.6" stop-color="#2ed3ee"/><stop offset="1" stop-color="#33d3ef"/></linearGradient><linearGradient id="linear-gradient-3" x1="228.1" y1="35.09" x2="240.46" y2="35.09" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-4" x1="209.63" y1="8.74" x2="216.02" y2="8.74" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-5" x1="206.07" y1="44.67" x2="212.39" y2="44.67" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-6" x1="220.87" y1="50.02" x2="226.97" y2="50.02" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-7" x1="214.45" y1="36.83" x2="221.44" y2="36.83" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-8" x1="221.23" y1="25.79" x2="228.27" y2="25.79" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-9" x1="213.42" y1="19.32" x2="218.95" y2="19.32" xlink:href="#linear-gradient-2"/><linearGradient id="linear-gradient-10" x1="205.83" y1="27.27" x2="210.27" y2="27.27" xlink:href="#linear-gradient-2"/></defs><polygon class="cls-1" points="3.53 12.24 10.6 12.24 14.13 6.12 10.6 0 3.53 0 0 6.12 3.53 12.24"/><path class="cls-2" d="M28.78,76.12v-37H40.06v37Z" transform="translate(-27.35 -21.95)"/><path class="cls-2" d="M83.48,76.12H72.2V55.33c0-2.45-.45-4.22-1.37-5.33a4.5,4.5,0,0,0-3.63-1.65,6.24,6.24,0,0,0-2.4.49,9.79,9.79,0,0,0-2.32,1.38,9.93,9.93,0,0,0-2,2.08,9.68,9.68,0,0,0-1.38,2.6V76.12H47.81v-37H58v6.21a13.45,13.45,0,0,1,5.78-5.11,19.59,19.59,0,0,1,8.6-1.8,11.17,11.17,0,0,1,5.78,1.3,9.34,9.34,0,0,1,3.39,3.39,12.85,12.85,0,0,1,1.58,4.54,30.83,30.83,0,0,1,.39,4.8Z" transform="translate(-27.35 -21.95)"/><path class="cls-3" d="M114.43,48.77a21.52,21.52,0,0,0-7.4,1.34,9,9,0,0,0-4.8,3.81v22.2H91v-37h10.37v7.48a15.72,15.72,0,0,1,4.89-5.86,11.33,11.33,0,0,1,6.38-2.18h1.13a3.42,3.42,0,0,1,.71.07Zm15.93,28.06q-5.72,0-8.64-3.56T118.8,62.8V39.11h11.28V60.33a8.58,8.58,0,0,0,1.33,5.18,4.48,4.48,0,0,0,3.81,1.8,8.75,8.75,0,0,0,4.37-1.2A10.2,10.2,0,0,0,143.33,62V39.11h11.28V63.43a3.93,3.93,0,0,0,.52,2.36,2.62,2.62,0,0,0,1.87.81v9.52a24.87,24.87,0,0,1-2.75.46c-.75.07-1.43.1-2,.1-4,0-6.35-1.57-6.91-4.72l-.21-2.25a15.45,15.45,0,0,1-6.31,5.39A20,20,0,0,1,130.36,76.83Zm56.39,0a14.55,14.55,0,0,1-7.33-1.77,12.12,12.12,0,0,1-4.8-4.93v21H163.35v-52h9.79v6a15,15,0,0,1,5.11-4.93,14.48,14.48,0,0,1,7.3-1.76,15.84,15.84,0,0,1,6.87,1.48,16.94,16.94,0,0,1,5.43,4,19.11,19.11,0,0,1,3.6,6.06,21.51,21.51,0,0,1,1.3,7.51,23.65,23.65,0,0,1-1.2,7.68,19.22,19.22,0,0,1-3.31,6.1,15.24,15.24,0,0,1-5.08,4A14.09,14.09,0,0,1,186.75,76.83Zm-3.81-9.52a7,7,0,0,0,3.35-.81,9,9,0,0,0,2.64-2.15,9.3,9.3,0,0,0,1.73-3.14,11.81,11.81,0,0,0,.6-3.77,10.27,10.27,0,0,0-.67-3.77,9.66,9.66,0,0,0-1.83-3,8.2,8.2,0,0,0-2.82-2,9,9,0,0,0-3.56-.7,8.19,8.19,0,0,0-4.48,1.37,9,9,0,0,0-3.28,3.7v7.61A11.85,11.85,0,0,0,178,65.41,7.53,7.53,0,0,0,182.94,67.31Zm49,6.84A43.71,43.71,0,0,1,226.61,76a22.21,22.21,0,0,1-6,.85,14.74,14.74,0,0,1-4-.53,9.13,9.13,0,0,1-3.28-1.69,7.93,7.93,0,0,1-2.22-3.07,11.69,11.69,0,0,1-.81-4.58V47.64h-4.72V39.11h4.72V27.34h11.28V39.11h7.54v8.53h-7.54V63.08a3,3,0,0,0,3.24,3.45,8.67,8.67,0,0,0,2.61-.42,15.94,15.94,0,0,0,2.33-.92Z" transform="translate(-27.35 -21.95)"/><polygon class="cls-4" points="238.82 4.21 232.14 4.21 228.8 9.99 232.14 15.78 238.82 15.78 242.16 9.99 238.82 4.21"/><polygon class="cls-5" points="235.75 29.66 230.3 31.1 228.83 36.54 232.81 40.53 238.25 39.08 239.72 33.65 235.75 29.66"/><polygon class="cls-6" points="213.27 6.13 210.79 7.05 210.34 9.66 212.38 11.35 214.86 10.43 215.31 7.82 213.27 6.13"/><polygon class="cls-7" points="210.43 42.6 208.03 42.6 206.84 44.67 208.03 46.74 210.43 46.74 211.63 44.67 210.43 42.6"/><polygon class="cls-8" points="223.3 47.71 221.61 49.41 222.23 51.72 224.54 52.34 226.24 50.64 225.62 48.33 223.3 47.71"/><polygon class="cls-9" points="218.41 33.89 215.63 34.96 215.16 37.91 217.48 39.78 220.26 38.71 220.72 35.76 218.41 33.89"/><polygon class="cls-10" points="227.03 23.87 224.23 22.85 221.95 24.77 222.48 27.71 225.28 28.72 227.56 26.8 227.03 23.87"/><polygon class="cls-11" points="216.99 17.46 214.98 17.69 214.17 19.55 215.38 21.17 217.39 20.94 218.19 19.09 216.99 17.46"/><polygon class="cls-12" points="209.61 26.36 208.05 25.46 206.49 26.36 206.49 28.17 208.05 29.07 209.61 28.17 209.61 26.36"/></svg>
\ No newline at end of file
diff --git a/rdf-legacy/src/site/site.xml b/rdf-legacy/src/site/site.xml
deleted file mode 100644
index 7339e95160d..00000000000
--- a/rdf-legacy/src/site/site.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<site name="Inrupt Java Client Libraries: Java 8 RDF Support">
-
-  <bannerRight name="Inrupt" href="https://inrupt.com">
-    <image src="images/inrupt_logo-2020.svg"/>
-  </bannerRight>
-
-  <body>
-    <menu name="Module: RDF Legacy" inherit="top">
-        <item name="Summary" href="summary.html"/>
-        <item name="Dependencies" href="dependencies.html"/>
-        <item name="Plugins" href="plugins.html"/>
-    </menu>
-  </body>
-</site>
diff --git a/rdf-legacy/src/test/java/com/inrupt/client/rdf/legacy/RDF4JTestModel.java b/rdf-legacy/src/test/java/com/inrupt/client/rdf/legacy/RDF4JTestModel.java
deleted file mode 100644
index 12f603dbbb6..00000000000
--- a/rdf-legacy/src/test/java/com/inrupt/client/rdf/legacy/RDF4JTestModel.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright Inrupt Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.inrupt.client.rdf.legacy;
-
-import com.inrupt.client.test.RdfTestModel;
-
-import org.eclipse.rdf4j.model.IRI;
-import org.eclipse.rdf4j.model.Literal;
-import org.eclipse.rdf4j.model.Resource;
-import org.eclipse.rdf4j.model.ValueFactory;
-import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
-
-final class RDF4JTestModel {
-
-    //RDF4J properties
-    public static final ValueFactory VF = SimpleValueFactory.getInstance();
-
-    public static final Resource S_RDF4J = VF.createIRI(RdfTestModel.S_VALUE);
-    public static final IRI P_RDF4J = VF.createIRI(RdfTestModel.P_VALUE);
-    public static final Literal O_RDF4J = VF.createLiteral(RdfTestModel.O_VALUE);
-    public static final Resource G_RDF4J = VF.createIRI(RdfTestModel.G_VALUE);
-
-    public static final Resource S1_RDF4J = VF.createIRI(RdfTestModel.S1_VALUE);
-    public static final IRI P1_RDF4J = VF.createIRI(RdfTestModel.P1_VALUE);
-    public static final Literal O1_RDF4J = VF.createLiteral(RdfTestModel.O1_VALUE);
-
-    public static final Resource S2_RDF4J = VF.createIRI(RdfTestModel.S2_VALUE);
-    public static final IRI P2_RDF4J = VF.createIRI(RdfTestModel.P2_VALUE);
-    public static final Literal O2_RDF4J = VF.createLiteral(RdfTestModel.O2_VALUE);
-
-    private RDF4JTestModel() {
-        // Prevent instantiation
-    }
-}
diff --git a/rdf-legacy/src/test/java/com/inrupt/client/rdf/legacy/RDFLegacyServiceTest.java b/rdf-legacy/src/test/java/com/inrupt/client/rdf/legacy/RDFLegacyServiceTest.java
deleted file mode 100644
index 16cc5a6986f..00000000000
--- a/rdf-legacy/src/test/java/com/inrupt/client/rdf/legacy/RDFLegacyServiceTest.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright Inrupt Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.inrupt.client.rdf.legacy;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import com.inrupt.client.spi.RdfService;
-import com.inrupt.client.spi.ServiceProvider;
-import com.inrupt.client.test.RdfServices;
-import com.inrupt.client.test.RdfTestModel;
-import com.inrupt.commons.rdf4j.RDF4J;
-import com.inrupt.commons.rdf4j.RDF4JDataset;
-import com.inrupt.commons.rdf4j.RDF4JGraph;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.apache.commons.rdf.api.Dataset;
-import org.apache.commons.rdf.api.Graph;
-import org.apache.commons.rdf.api.IRI;
-import org.apache.commons.rdf.api.Quad;
-import org.apache.commons.rdf.api.RDFSyntax;
-import org.apache.commons.rdf.api.Triple;
-import org.eclipse.rdf4j.model.Model;
-import org.eclipse.rdf4j.model.Statement;
-import org.eclipse.rdf4j.model.ValueFactory;
-import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
-import org.eclipse.rdf4j.model.util.ModelBuilder;
-import org.eclipse.rdf4j.repository.Repository;
-import org.eclipse.rdf4j.repository.RepositoryConnection;
-import org.eclipse.rdf4j.repository.sail.SailRepository;
-import org.eclipse.rdf4j.sail.memory.MemoryStore;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-class RDFLegacyServiceTest extends RdfServices {
-
-    private final RdfService service = ServiceProvider.getRdfService();
-    private static RDF4JDataset rdf4jDataset;
-    private static RDF4JGraph rdf4jGraph;
-    private static RDF4J rdf = new RDF4J();
-
-    public static final ValueFactory VF = SimpleValueFactory.getInstance();
-
-    @BeforeAll
-    static void setup() {
-        // create a RDF4JDataset
-        final Statement st = VF.createStatement(
-            RDF4JTestModel.S_RDF4J,
-            RDF4JTestModel.P_RDF4J,
-            RDF4JTestModel.O_RDF4J,
-            RDF4JTestModel.G_RDF4J
-        );
-        final Statement st1 = VF.createStatement(
-            RDF4JTestModel.S1_RDF4J,
-            RDF4JTestModel.P1_RDF4J,
-            RDF4JTestModel.O1_RDF4J
-        );
-        final Repository repository = new SailRepository(new MemoryStore());
-        try (final RepositoryConnection conn = repository.getConnection()) {
-            conn.add(st);
-            conn.add(st1);
-        }
-        rdf4jDataset = rdf.asDataset(repository);
-
-        // create a RDF4JGraph
-        final ModelBuilder builder = new ModelBuilder();
-        builder.namedGraph(RDF4JTestModel.G_RDF4J)
-                .subject(RdfTestModel.S_VALUE)
-                    .add(RdfTestModel.P_VALUE, RdfTestModel.O_VALUE);
-        builder.defaultGraph().subject(RdfTestModel.S1_VALUE).add(RdfTestModel.P_VALUE, RdfTestModel.O1_VALUE);
-        final Model m = builder.build();
-        rdf4jGraph = rdf.asGraph(m);
-    }
-
-    @Test
-    void checkInstance() {
-        assertTrue(service instanceof RDFLegacyService);
-    }
-
-    @Test
-    void parseToDatasetRelativeURIsButNoBaseURI() throws IOException {
-        try (final InputStream input = RdfServices.class.getResourceAsStream("/relativeURIs.ttl")) {
-            assertThrows(IOException.class, () -> service.toDataset(RDFSyntax.TURTLE, input, null));
-        }
-    }
-
-    @Test
-    void serializeFromDatasetTRIGRoundtrip() throws Exception {
-        try (final ByteArrayOutputStream output = new ByteArrayOutputStream()) {
-            service.fromDataset(rdf4jDataset, RDFSyntax.TRIG, output);
-            try (final InputStream input = new ByteArrayInputStream(output.toByteArray());
-                    final Dataset roundtrip = service.toDataset(RDFSyntax.TRIG, input, null)) {
-                assertEquals(2, roundtrip.size());
-                assertEquals(rdf4jDataset.size(), roundtrip.size());
-                String st1 = null;
-                try (final Stream<Quad> stream = rdf4jDataset
-                        .stream(Optional.of(RdfTestModel.G_RDFNode), null, null, null).map(Quad.class::cast)) {
-                    st1 = stream.map(Quad::getSubject).filter(IRI.class::isInstance).map(IRI.class::cast)
-                        .map(IRI::getIRIString).findFirst().orElse(null);
-                }
-
-                String st2 = null;
-                try (final Stream<Quad> stream = roundtrip.stream(Optional.of(RdfTestModel.G_RDFNode),
-                        RdfTestModel.S_RDFNode, RdfTestModel.P_RDFNode, RdfTestModel.O_RDFNode).map(Quad.class::cast)) {
-                    st2 = stream.map(Quad::getSubject).filter(IRI.class::isInstance).map(IRI.class::cast)
-                        .map(IRI::getIRIString).findFirst().orElse(null);
-                }
-                assertEquals(st1, st2);
-            }
-        }
-    }
-
-    @Test
-    void serializeFromDatasetTURTLERoundtrip() throws Exception {
-        try (final ByteArrayOutputStream output = new ByteArrayOutputStream()) {
-            service.fromDataset(rdf4jDataset, RDFSyntax.TURTLE, output);
-            try (final InputStream input = new ByteArrayInputStream(output.toByteArray());
-                    final Dataset roundtrip = service.toDataset(RDFSyntax.TURTLE, input, null)) {
-
-                assertEquals(2, roundtrip.size());
-                assertEquals(rdf4jDataset.size(), roundtrip.size());
-
-                String st1 = null;
-                try (final Stream<Quad> stream = rdf4jDataset
-                        .stream(Optional.of(RdfTestModel.G_RDFNode), null, null, null).map(Quad.class::cast)) {
-                    st1 = stream.map(Quad::getSubject).filter(IRI.class::isInstance).map(IRI.class::cast)
-                        .map(IRI::getIRIString).findFirst().orElse(null);
-                }
-                String st2 = null;
-                try (final Stream<Quad> stream = roundtrip.stream(null, RdfTestModel.S_RDFNode, RdfTestModel.P_RDFNode,
-                        RdfTestModel.O_RDFNode).map(Quad.class::cast)) {
-                    st2 = stream.map(Quad::getSubject).filter(IRI.class::isInstance).map(IRI.class::cast)
-                        .map(IRI::getIRIString).findFirst().orElse(null);
-                }
-                assertEquals(st1, st2);
-            }
-        }
-    }
-
-    @Test
-    void serializeFromGraphRoundtrip() throws Exception {
-        try (final ByteArrayOutputStream output = new ByteArrayOutputStream()) {
-            service.fromGraph(rdf4jGraph, RDFSyntax.TURTLE, output);
-            try (final InputStream input = new ByteArrayInputStream(output.toByteArray());
-                    final Graph roundtrip = service.toGraph(RDFSyntax.TURTLE, input, null)) {
-                assertEquals(2, roundtrip.size());
-                assertEquals(rdf4jGraph.size(), roundtrip.size());
-
-                String st1 = null;
-                try (final Stream<Triple> stream = rdf4jGraph.stream(RdfTestModel.S_RDFNode, null, null)
-                        .map(Triple.class::cast)) {
-                    st1 = stream.map(Triple::getSubject).filter(IRI.class::isInstance).map(IRI.class::cast)
-                        .map(IRI::getIRIString).findFirst().orElse(null);
-                }
-
-                String st2 = null;
-                try (final Stream<Triple> stream = roundtrip
-                        .stream(RdfTestModel.S_RDFNode, RdfTestModel.P_RDFNode, RdfTestModel.O_RDFNode)
-                        .map(Triple.class::cast)) {
-                    st2 = stream.map(Triple::getSubject).filter(IRI.class::isInstance).map(IRI.class::cast)
-                        .map(IRI::getIRIString).findFirst().orElse(null);
-                }
-                assertEquals(st1, st2);
-            }
-        }
-    }
-
-    @Test
-    void serializeFromDatasetException() throws IOException {
-        final File tmp = Files.createTempFile(null, null).toFile();
-        try (final OutputStream output = new FileOutputStream(tmp)) {
-            output.close();
-            assertThrows(IOException.class, () -> service.fromDataset(rdf4jDataset, RDFSyntax.TRIG, output));
-        }
-    }
-
-    @Test
-    void serializeFromGraphException() throws IOException {
-        final File tmp = Files.createTempFile(null, null).toFile();
-        try (final OutputStream output = new FileOutputStream(tmp)) {
-            output.close();
-            assertThrows(IOException.class,
-                    () -> service.fromGraph(rdf4jGraph, RDFSyntax.TURTLE, output));
-        }
-    }
-}
diff --git a/rdf-legacy/src/test/resources/relativeURIs.ttl b/rdf-legacy/src/test/resources/relativeURIs.ttl
deleted file mode 100644
index 283e62e4bf5..00000000000
--- a/rdf-legacy/src/test/resources/relativeURIs.ttl
+++ /dev/null
@@ -1,7 +0,0 @@
-#use of relative URIs
-@prefix : <#>.
-@prefix foaf: <http://xmlns.com/foaf/0.1/>.
-@prefix schema: <http://schema.org/>.
-
-:me
-    a schema:Person, foaf:Person.
\ No newline at end of file
diff --git a/rdf-legacy/src/test/resources/simplelogger.properties b/rdf-legacy/src/test/resources/simplelogger.properties
deleted file mode 100644
index 682ae67e438..00000000000
--- a/rdf-legacy/src/test/resources/simplelogger.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.slf4j.simpleLogger.log.org.eclipse.jetty=warn
diff --git a/rdf4j/pom.xml b/rdf4j/pom.xml
index db849bd7d25..224ba42fc6a 100644
--- a/rdf4j/pom.xml
+++ b/rdf4j/pom.xml
@@ -14,7 +14,6 @@
   </description>
 
   <properties>
-    <maven.compiler.release>8</maven.compiler.release>
     <rdf4j.version>5.1.4</rdf4j.version>
   </properties>
 
diff --git a/reports/pom.xml b/reports/pom.xml
index c687bfa0796..8f2cdee7550 100644
--- a/reports/pom.xml
+++ b/reports/pom.xml
@@ -82,11 +82,6 @@
       <artifactId>inrupt-client-rdf4j</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.inrupt.client</groupId>
-      <artifactId>inrupt-client-rdf-legacy</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.inrupt.client</groupId>
       <artifactId>inrupt-client-runtime</artifactId>
diff --git a/solid/pom.xml b/solid/pom.xml
index d2856442f55..9593fc54031 100644
--- a/solid/pom.xml
+++ b/solid/pom.xml
@@ -13,10 +13,6 @@
       Solid resource body handlers for the Inrupt Java Client Libraries.
   </description>
 
-  <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.inrupt.client</groupId>
diff --git a/spring/pom.xml b/spring/pom.xml
index 0e5f273869a..a36aa0ebace 100644
--- a/spring/pom.xml
+++ b/spring/pom.xml
@@ -100,18 +100,6 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>java-17</id>
-      <activation>
-        <jdk>[17,)</jdk>
-      </activation>
-      <properties>
-        <spring.security.version>6.5.3</spring.security.version>
-      </properties>
-    </profile>
-  </profiles>
-
   <build>
     <plugins>
       <plugin>
diff --git a/uma/pom.xml b/uma/pom.xml
index a7bc275ec75..cd0d0ecbd4a 100644
--- a/uma/pom.xml
+++ b/uma/pom.xml
@@ -13,10 +13,6 @@
       UMA abstractions for the Inrupt Java Client Libraries.
   </description>
 
-  <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.inrupt.client</groupId>

From b28de4f89f518c3f1a689d63dead95e3fec373a5 Mon Sep 17 00:00:00 2001
From: Aaron Coburn <aaronc@inrupt.com>
Date: Fri, 29 Aug 2025 18:23:53 -0500
Subject: [PATCH 2/2] Adjust site workflow

---
 .github/workflows/site-ci-config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/site-ci-config.yml b/.github/workflows/site-ci-config.yml
index ba7e9ff08a3..e5aa1d7d8bc 100644
--- a/.github/workflows/site-ci-config.yml
+++ b/.github/workflows/site-ci-config.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11 ]
+        java: [ 17 ]
 
     steps:
       - uses: actions/checkout@v4