Repository: apache/jena
Pull request #1848 (2023-04-17 20:42:51)

fix and test for JENA-2352
Jira issue resolved #  JENA-2352

Pull request Description:
Simple change to resolve NPE.


----

 - [x] Tests are included.
 - [ ] Documentation change and updates are provided for the [Apache Jena website](https://github.com/apache/jena-site/)
 - [ ] Commits have been squashed to remove intermediate development commit messages.
 - [ ] Key commit messages start with the issue number (GH-xxxx or JENA-xxxx)

By submitting this pull request, I acknowledge that I am making a contribution to the Apache Software Foundation under the terms and conditions of the [Contributor's Agreement](https://www.apache.org/licenses/contributor-agreements.html).

----

See the [Apache Jena "Contributing" guide](https://github.com/apache/jena/blob/main/CONTRIBUTING.md).


kinow: > Key commit messages start with the issue number (GH-xxxx or JENA-xxxx)

Missing just this, I think :point_up: 

Patch:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b23d87e65f..8b5b317a9f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,10 +24,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '11'
     - name: Build with Maven
-      run: mvn -B --file pom.xml -Dmaven.javadoc.skip=true install
+      run: mvn -B --file pom.xml -Dmaven.javadoc.skip=true verify
diff --git a/.github/workflows/maven_macos.yml b/.github/workflows/maven_macos.yml
index 413369c4ff..bfa276c483 100644
--- a/.github/workflows/maven_macos.yml
+++ b/.github/workflows/maven_macos.yml
@@ -26,4 +26,4 @@ jobs:
         java-version: '17'
 
     - name: Build with Maven
-      run: mvn -B --file pom.xml -Dmaven.javadoc.skip=true install
+      run: mvn -B --file pom.xml -Dmaven.javadoc.skip=true verify
diff --git a/.github/workflows/maven_windows.yml b/.github/workflows/maven_windows.yml
index 8a115b3bd3..5dfd69fa72 100644
--- a/.github/workflows/maven_windows.yml
+++ b/.github/workflows/maven_windows.yml
@@ -32,5 +32,5 @@ jobs:
 
     - name: Build with Maven for windows-latest
       # If Windows and java 11, then MJAVADOC-586 / JDK issue.
-      run: bash -c "mvn -B --file pom.xml -Dmaven.javadoc.skip=true install"
+      run: bash -c "mvn -B --file pom.xml -Dmaven.javadoc.skip=true verify"
       working-directory: c:\jena
diff --git a/apache-jena-libs/pom.xml b/apache-jena-libs/pom.xml
index d39fe8e828..79a899d99d 100644
--- a/apache-jena-libs/pom.xml
+++ b/apache-jena-libs/pom.xml
@@ -23,12 +23,12 @@
   <artifactId>apache-jena-libs</artifactId>
   <packaging>pom</packaging>
   <name>Apache Jena - Libraries POM</name>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
 
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -47,37 +47,37 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfpatch</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shacl</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shex</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb2</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfconnection</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/apache-jena/pom.xml b/apache-jena/pom.xml
index 8b56d387a8..14792b0d75 100644
--- a/apache-jena/pom.xml
+++ b/apache-jena/pom.xml
@@ -35,7 +35,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -58,13 +58,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
@@ -72,13 +72,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
@@ -86,13 +86,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfconnection</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfconnection</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
@@ -100,13 +100,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shacl</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shacl</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
@@ -114,13 +114,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shex</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shex</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
@@ -128,7 +128,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-cmds</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Require a logging implementation for command line tools --> 
@@ -141,7 +141,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-cmds</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>sources</classifier>
       <optional>true</optional>
     </dependency>
diff --git a/jena-arq/pom.xml b/jena-arq/pom.xml
index ff5a4c96de..3d6a7f3362 100644
--- a/jena-arq/pom.xml
+++ b/jena-arq/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -40,14 +40,14 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
       <classifier>tests</classifier>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -55,7 +55,7 @@
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-base</artifactId>
       <classifier>tests</classifier>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/jena-base/pom.xml b/jena-base/pom.xml
index 1e3ff770a8..4773e7eaf6 100644
--- a/jena-base/pom.xml
+++ b/jena-base/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>jena-base</artifactId>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shaded-guava</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
     
     <!-- For compiling the log4j2 helper code. -->
diff --git a/jena-cmds/pom.xml b/jena-cmds/pom.xml
index 6f11402223..df38b76440 100644
--- a/jena-cmds/pom.xml
+++ b/jena-cmds/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfpatch</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Copied from apache-jena-libs
@@ -76,59 +76,59 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shacl</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shex</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb2</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfconnection</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Pull test code into scope -->
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-base</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <optional>true</optional>
     </dependency>     
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shacl</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <optional>true</optional>
     </dependency>
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index ac04c8aae5..8308f58be3 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -41,13 +41,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-base</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-base</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-iri</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/jena-db/jena-dboe-base/pom.xml b/jena-db/jena-dboe-base/pom.xml
index 14f7c7baa8..8c0a88333a 100644
--- a/jena-db/jena-dboe-base/pom.xml
+++ b/jena-db/jena-dboe-base/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-db</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
@@ -40,13 +40,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/jena-db/jena-dboe-index/pom.xml b/jena-db/jena-dboe-index/pom.xml
index b160662cbc..3ea720beb1 100644
--- a/jena-db/jena-dboe-index/pom.xml
+++ b/jena-db/jena-dboe-index/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-db</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-base</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/jena-db/jena-dboe-storage/pom.xml b/jena-db/jena-dboe-storage/pom.xml
index 081cc3a44d..a12ced4827 100644
--- a/jena-db/jena-dboe-storage/pom.xml
+++ b/jena-db/jena-dboe-storage/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-db</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-trans-data</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
     
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/jena-db/jena-dboe-trans-data/pom.xml b/jena-db/jena-dboe-trans-data/pom.xml
index b024e1eab1..4e2b452576 100644
--- a/jena-db/jena-dboe-trans-data/pom.xml
+++ b/jena-db/jena-dboe-trans-data/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-db</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
@@ -39,26 +39,26 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-transaction</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-index</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-index-test</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-base</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/jena-db/jena-dboe-transaction/pom.xml b/jena-db/jena-dboe-transaction/pom.xml
index f5d55affc7..9c64cca932 100644
--- a/jena-db/jena-dboe-transaction/pom.xml
+++ b/jena-db/jena-dboe-transaction/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-db</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-base</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
   </dependencies>
diff --git a/jena-db/pom.xml b/jena-db/pom.xml
index 02c97f078f..310b620b9b 100644
--- a/jena-db/pom.xml
+++ b/jena-db/pom.xml
@@ -22,14 +22,14 @@
   
   <artifactId>jena-db</artifactId>
   <packaging>pom</packaging>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <name>Apache Jena - DBOE Database Operation Environment</name>
   <url>https://jena.apache.org/</url>
 
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/jena-examples/pom.xml b/jena-examples/pom.xml
index 3037e721e4..0aef5aedc7 100644
--- a/jena-examples/pom.xml
+++ b/jena-examples/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/jena-extras/jena-commonsrdf/pom.xml b/jena-extras/jena-commonsrdf/pom.xml
index d2ed7fcdac..d2f0b1a978 100644
--- a/jena-extras/jena-commonsrdf/pom.xml
+++ b/jena-extras/jena-commonsrdf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/jena-extras/jena-querybuilder/pom.xml b/jena-extras/jena-querybuilder/pom.xml
index ceeea49ec5..ae7b2f9fc0 100644
--- a/jena-extras/jena-querybuilder/pom.xml
+++ b/jena-extras/jena-querybuilder/pom.xml
@@ -26,7 +26,7 @@
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-extras</artifactId>
     <relativePath>..</relativePath>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>apache-jena-libs</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <type>pom</type>
     </dependency>
 
diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java
index 362cd70e79..b77418d141 100644
--- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java
+++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/UpdateBuilder.java
@@ -104,6 +104,8 @@ public class UpdateBuilder {
     public UpdateBuilder(PrefixMapping pMap) {
         this.prefixHandler = new PrefixHandler(pMap);
         this.whereProcessor = new WhereQuadHolder(prefixHandler);
+        this.values = new HashMap<Var, Node>();
+        this.with = null;
     }
 
     /**
diff --git a/jena-extras/jena-serviceenhancer/pom.xml b/jena-extras/jena-serviceenhancer/pom.xml
index 615d8c7631..f67e54eca0 100644
--- a/jena-extras/jena-serviceenhancer/pom.xml
+++ b/jena-extras/jena-serviceenhancer/pom.xml
@@ -26,7 +26,7 @@
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-extras</artifactId>
     <relativePath>..</relativePath>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -103,7 +103,7 @@
         <dependency>
           <groupId>org.apache.jena</groupId>
           <artifactId>jena-arq</artifactId>
-          <version>4.8.0-SNAPSHOT</version>
+          <version>4.9.0-SNAPSHOT</version>
           <scope>provided</scope>
         </dependency>
       </dependencies>
diff --git a/jena-extras/pom.xml b/jena-extras/pom.xml
index 138e2b9685..a906dcb7af 100644
--- a/jena-extras/pom.xml
+++ b/jena-extras/pom.xml
@@ -19,14 +19,14 @@
 <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>
   <artifactId>jena-extras</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache Jena - Extras</name>
 
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/jena-fuseki2/apache-jena-fuseki/pom.xml b/jena-fuseki2/apache-jena-fuseki/pom.xml
index 2097c699c6..8f7de8e3ec 100644
--- a/jena-fuseki2/apache-jena-fuseki/pom.xml
+++ b/jena-fuseki2/apache-jena-fuseki/pom.xml
@@ -21,13 +21,13 @@
 
   <name>Apache Jena - Fuseki Binary Distribution</name>
   <artifactId>apache-jena-fuseki</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-fuseki</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
   
diff --git a/jena-fuseki2/jena-fuseki-access/pom.xml b/jena-fuseki2/jena-fuseki-access/pom.xml
index c23f881f55..f8cb68f6ca 100644
--- a/jena-fuseki2/jena-fuseki-access/pom.xml
+++ b/jena-fuseki2/jena-fuseki-access/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-fuseki</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent> 
 
   <packaging>jar</packaging>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/jena-fuseki2/jena-fuseki-core/pom.xml b/jena-fuseki2/jena-fuseki-core/pom.xml
index 4f1f887ae5..9cd6e99738 100644
--- a/jena-fuseki2/jena-fuseki-core/pom.xml
+++ b/jena-fuseki2/jena-fuseki-core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-fuseki</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
@@ -39,37 +39,37 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfpatch</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shacl</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shex</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb2</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfconnection</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/jena-fuseki2/jena-fuseki-docker/pom.xml b/jena-fuseki2/jena-fuseki-docker/pom.xml
index d2e0c817f0..7daaeb271b 100644
--- a/jena-fuseki2/jena-fuseki-docker/pom.xml
+++ b/jena-fuseki2/jena-fuseki-docker/pom.xml
@@ -21,13 +21,13 @@
 
   <name>Apache Jena - Fuseki Docker Tools</name>
   <artifactId>jena-fuseki-docker</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-fuseki</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
   
diff --git a/jena-fuseki2/jena-fuseki-fulljar/pom.xml b/jena-fuseki2/jena-fuseki-fulljar/pom.xml
index 3f781312aa..3b9c179029 100644
--- a/jena-fuseki2/jena-fuseki-fulljar/pom.xml
+++ b/jena-fuseki2/jena-fuseki-fulljar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-fuseki</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent> 
 
diff --git a/jena-fuseki2/jena-fuseki-geosparql/pom.xml b/jena-fuseki2/jena-fuseki-geosparql/pom.xml
index a675385d7f..c3603d9afd 100644
--- a/jena-fuseki2/jena-fuseki-geosparql/pom.xml
+++ b/jena-fuseki2/jena-fuseki-geosparql/pom.xml
@@ -23,7 +23,7 @@
     <parent>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <relativePath>../</relativePath>
     </parent>
     
@@ -38,13 +38,13 @@
       <dependency>
         <groupId>org.apache.jena</groupId>
         <artifactId>jena-geosparql</artifactId>
-        <version>4.8.0-SNAPSHOT</version>
+        <version>4.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>org.apache.jena</groupId>
         <artifactId>jena-fuseki-main</artifactId>
-        <version>4.8.0-SNAPSHOT</version>
+        <version>4.9.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
diff --git a/jena-fuseki2/jena-fuseki-main/pom.xml b/jena-fuseki2/jena-fuseki-main/pom.xml
index 892be10291..ab3458678f 100644
--- a/jena-fuseki2/jena-fuseki-main/pom.xml
+++ b/jena-fuseki2/jena-fuseki-main/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-fuseki</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent> 
 
   <packaging>jar</packaging>
@@ -39,13 +39,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -53,13 +53,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-access</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-cmds</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- For parsing Jetty configuration files -->
diff --git a/jena-fuseki2/jena-fuseki-server/pom.xml b/jena-fuseki2/jena-fuseki-server/pom.xml
index 8b18663f99..49d1a0e0d0 100644
--- a/jena-fuseki2/jena-fuseki-server/pom.xml
+++ b/jena-fuseki2/jena-fuseki-server/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-fuseki</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent> 
 
@@ -47,13 +47,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-text</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-access</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/jena-fuseki2/jena-fuseki-ui/pom.xml b/jena-fuseki2/jena-fuseki-ui/pom.xml
index 7ab2dad893..c5d4093413 100644
--- a/jena-fuseki2/jena-fuseki-ui/pom.xml
+++ b/jena-fuseki2/jena-fuseki-ui/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.jena</groupId>
         <artifactId>jena-fuseki</artifactId>
-        <version>4.8.0-SNAPSHOT</version>
+        <version>4.9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/jena-fuseki2/jena-fuseki-war/pom.xml b/jena-fuseki2/jena-fuseki-war/pom.xml
index 8c45acc76b..1872b1add7 100644
--- a/jena-fuseki2/jena-fuseki-war/pom.xml
+++ b/jena-fuseki2/jena-fuseki-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-fuseki</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
diff --git a/jena-fuseki2/jena-fuseki-webapp/pom.xml b/jena-fuseki2/jena-fuseki-webapp/pom.xml
index 46c5f8cd95..76377d6ccb 100644
--- a/jena-fuseki2/jena-fuseki-webapp/pom.xml
+++ b/jena-fuseki2/jena-fuseki-webapp/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-fuseki</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
@@ -38,13 +38,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -52,13 +52,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-cmds</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
    
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-text</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
     
     <dependency>
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-base</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/jena-fuseki2/pom.xml b/jena-fuseki2/pom.xml
index 8f26624769..e28d45ca5c 100644
--- a/jena-fuseki2/pom.xml
+++ b/jena-fuseki2/pom.xml
@@ -21,13 +21,13 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
   <name>Apache Jena - Fuseki - A SPARQL 1.1 Server</name>
   <artifactId>jena-fuseki</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
 
   <description>Fuseki is a SPARQL 1.1 Server which provides the SPARQL query, 
   SPARQL update and SPARQL graph store protocols.
diff --git a/jena-geosparql/pom.xml b/jena-geosparql/pom.xml
index 66c4a435f5..10e4b45cf0 100644
--- a/jena-geosparql/pom.xml
+++ b/jena-geosparql/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/InitGeoSPARQL.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/InitGeoSPARQL.java
index a0ca84639c..7e4f7a5abd 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/InitGeoSPARQL.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/InitGeoSPARQL.java
@@ -35,10 +35,6 @@ public class InitGeoSPARQL implements JenaSubsystemLifecycle {
 
     @Override
     public void start() {
-        init();
-    }
-
-    public static void init() {
         if ( initialized )
             return ;
         synchronized (initLock) {
diff --git a/jena-iri/pom.xml b/jena-iri/pom.xml
index 97200b7b59..a0026f053a 100644
--- a/jena-iri/pom.xml
+++ b/jena-iri/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
   
diff --git a/jena-jdbc/jena-jdbc-core/pom.xml b/jena-jdbc/jena-jdbc-core/pom.xml
index e6f20eb4e5..695d2768b2 100644
--- a/jena-jdbc/jena-jdbc-core/pom.xml
+++ b/jena-jdbc/jena-jdbc-core/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.jena</groupId>
 		<artifactId>jena-jdbc</artifactId>
-		<version>4.8.0-SNAPSHOT</version>
+		<version>4.9.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>jena-jdbc-core</artifactId>
 	<name>Apache Jena - JDBC Core API</name>
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>org.apache.jena</groupId>
 			<artifactId>jena-arq</artifactId>
-			<version>4.8.0-SNAPSHOT</version>
+			<version>4.9.0-SNAPSHOT</version>
 		</dependency>
     
 		<dependency>
diff --git a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
index 5bfee37430..8f4120501e 100644
--- a/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-bundle/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-jdbc</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>jena-jdbc-driver-bundle</artifactId>
   <name>Apache Jena - JDBC Driver Bundle</name>
@@ -45,17 +45,17 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-driver-mem</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-driver-remote</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-driver-tdb</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Test Dependencies -->
@@ -67,35 +67,35 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-driver-mem</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-driver-remote</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-driver-tdb</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-main</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/jena-jdbc/jena-jdbc-driver-mem/pom.xml b/jena-jdbc/jena-jdbc-driver-mem/pom.xml
index daf57a61fc..26cfdfb768 100644
--- a/jena-jdbc/jena-jdbc-driver-mem/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-mem/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-jdbc</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>jena-jdbc-driver-mem</artifactId>
   <name>Apache Jena - JDBC In-Memory Driver</name>
@@ -36,14 +36,14 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/jena-jdbc/jena-jdbc-driver-remote/pom.xml b/jena-jdbc/jena-jdbc-driver-remote/pom.xml
index b9b32f3180..1a3c656d1c 100644
--- a/jena-jdbc/jena-jdbc-driver-remote/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-remote/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-jdbc</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>jena-jdbc-driver-remote</artifactId>
   <name>Apache Jena - JDBC Remote Endpoint Driver</name>
@@ -36,27 +36,27 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-main</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-main</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/jena-jdbc/jena-jdbc-driver-tdb/pom.xml b/jena-jdbc/jena-jdbc-driver-tdb/pom.xml
index af983e39d1..0013295fd0 100644
--- a/jena-jdbc/jena-jdbc-driver-tdb/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-tdb/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-jdbc</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
   <artifactId>jena-jdbc-driver-tdb</artifactId>
   <name>Apache Jena - JDBC TDB Driver</name>
@@ -36,12 +36,12 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Test Dependencies -->
@@ -53,14 +53,14 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-jdbc-driver-mem</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/jena-jdbc/pom.xml b/jena-jdbc/pom.xml
index 6aed1a73d3..20046a552f 100644
--- a/jena-jdbc/pom.xml
+++ b/jena-jdbc/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/jena-permissions/pom.xml b/jena-permissions/pom.xml
index a8e6f20507..c2ae94ad00 100644
--- a/jena-permissions/pom.xml
+++ b/jena-permissions/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   
diff --git a/jena-rdfconnection/pom.xml b/jena-rdfconnection/pom.xml
index a07fc25b3e..d42a8f4699 100644
--- a/jena-rdfconnection/pom.xml
+++ b/jena-rdfconnection/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -48,13 +48,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-base</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -71,7 +71,7 @@
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
       <classifier>tests</classifier>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>    
 
diff --git a/jena-rdfpatch/pom.xml b/jena-rdfpatch/pom.xml
index 87bf2467d5..53c44a0361 100644
--- a/jena-rdfpatch/pom.xml
+++ b/jena-rdfpatch/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/jena-shacl/pom.xml b/jena-shacl/pom.xml
index ac5e670d38..3513599829 100644
--- a/jena-shacl/pom.xml
+++ b/jena-shacl/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
@@ -40,14 +40,14 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
       <classifier>tests</classifier>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/jena-shaded-guava/pom.xml b/jena-shaded-guava/pom.xml
index 869677c250..463e62cd9a 100644
--- a/jena-shaded-guava/pom.xml
+++ b/jena-shaded-guava/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>jena-shaded-guava</artifactId>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <name>Apache Jena - Shadowed external libraries</name>
 
   <description>
diff --git a/jena-shex/pom.xml b/jena-shex/pom.xml
index b85aace515..8939f8f5ca 100644
--- a/jena-shex/pom.xml
+++ b/jena-shex/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <description>ShEx</description>
@@ -41,13 +41,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/jena-tdb1/pom.xml b/jena-tdb1/pom.xml
index a0dbb83681..7837991523 100644
--- a/jena-tdb1/pom.xml
+++ b/jena-tdb1/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
@@ -41,14 +41,14 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
       <classifier>tests</classifier>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -56,7 +56,7 @@
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
       <classifier>tests</classifier>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
@@ -64,7 +64,7 @@
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-base</artifactId>
       <classifier>tests</classifier>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb/sys/ProcessUtils.java b/jena-tdb1/src/main/java/org/apache/jena/tdb/sys/ProcessUtils.java
index 9c1db4386b..64a8fe7ae8 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb/sys/ProcessUtils.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb/sys/ProcessUtils.java
@@ -25,6 +25,8 @@ import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.jena.base.Sys;
+
 public class ProcessUtils {
 
     private static int myPid = -1;
@@ -32,11 +34,11 @@ public class ProcessUtils {
     /**
      * Tries to get the PID of the current process caching it for future calls
      * since it won't change throughout the life of the process
-     * 
+     *
      * @param fallback
      *            Fallback PID to return if unable to determine the PID i.e. an
      *            error code to return
-     * 
+     *
      * @return PID of current process or provided {@code fallback} if unable to
      *         determine PID
      */
@@ -74,7 +76,7 @@ public class ProcessUtils {
 
     /**
      * Determines whether a given PID is alive
-     * 
+     *
      * @param pid
      *            PID
      * @return True if the given PID is alive or unknown, false if it is dead
@@ -110,7 +112,7 @@ public class ProcessUtils {
      * negative (i.e. invalid) PIDs as alive because of the format in which the
      * command line process monitor application for the system returns errors
      * for invalid PIDs
-     * 
+     *
      * @return True if a negative PID is treated as alive on this platform or we
      *         cannot determine liveness for PIDs on this platform, false
      *         otherwise
@@ -121,7 +123,7 @@ public class ProcessUtils {
 
     /**
      * Gets process information based on the given PID string
-     * 
+     *
      * @param pidStr
      *            PID string
      * @return Output of running the OSes appropriate command line task info
@@ -132,7 +134,7 @@ public class ProcessUtils {
      */
     private static List<String> getProcessInfo(String pidStr) throws IOException {
         Process p;
-        if (SystemTDB.isWindows) {
+        if (Sys.isWindows) {
             // Use the Windows tasklist utility
             ProcessBuilder builder = new ProcessBuilder("tasklist", "/FI", "PID eq " + pidStr);
             builder.redirectErrorStream(true);
diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb/sys/SystemTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb/sys/SystemTDB.java
index d8d9b99d1f..a9ff17f50a 100644
--- a/jena-tdb1/src/main/java/org/apache/jena/tdb/sys/SystemTDB.java
+++ b/jena-tdb1/src/main/java/org/apache/jena/tdb/sys/SystemTDB.java
@@ -26,6 +26,7 @@ import java.util.Properties ;
 import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.lib.PropertyUtils ;
 import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.base.Sys;
 import org.apache.jena.query.ARQ ;
 import org.apache.jena.sparql.engine.optimizer.reorder.ReorderLib ;
 import org.apache.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
@@ -315,18 +316,9 @@ public class SystemTDB
 
     // --------
 
-    public static final boolean isWindows = determineIfWindows() ;	// Memory mapped files behave differently.
-
-    //Or look in File.listRoots.
-    //Alternative method:
-    //  http://stackoverflow.com/questions/1293533/name-of-the-operating-system-in-java-not-os-name
-
-    private static boolean determineIfWindows() {
-    	String s = System.getProperty("os.name") ;
-    	if ( s == null )
-    		return false ;
-    	return s.startsWith("Windows ") ;
-	}
+    /** @deprecated Use {@link Sys#isWindows} */
+    @Deprecated
+    public static final boolean isWindows = Sys.isWindows;
 
     private static boolean determineIf64Bit()
     {
diff --git a/jena-tdb2/pom.xml b/jena-tdb2/pom.xml
index 8c551816b6..287298e0b5 100644
--- a/jena-tdb2/pom.xml
+++ b/jena-tdb2/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
@@ -42,13 +42,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-storage</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/jena-text/pom.xml b/jena-text/pom.xml
index 0b67bf60b8..be79425a72 100644
--- a/jena-text/pom.xml
+++ b/jena-text/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -38,32 +38,32 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-tdb2</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-cmds</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
     
     <!-- Testing support -->
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-base</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index da815dfe18..92ba6e23d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <artifactId>jena</artifactId>
   <packaging>pom</packaging>
   <url>https://jena.apache.org/</url>
-  <version>4.8.0-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
 
   <parent>
     <groupId>org.apache</groupId>
@@ -54,7 +54,7 @@
      <!-- Build -->
     <java.version>11</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.build.outputTimestamp>2023-04-17T20:13:59Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-04-16T14:41:52Z</project.build.outputTimestamp>
 
     <!-- Testing -->
     <ver.junit>4.13.2</ver.junit>  


Test patch:
diff --git a/jena-db/jena-dboe-index-test/pom.xml b/jena-db/jena-dboe-index-test/pom.xml
index cdd52e3a16..c2a6146e8d 100644
--- a/jena-db/jena-dboe-index-test/pom.xml
+++ b/jena-db/jena-dboe-index-test/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena-db</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent> 
 
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-index</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
index 9bf57ac84e..7672b9fbed 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/UpdateBuilderTest.java
@@ -57,6 +57,16 @@ public class UpdateBuilderTest {
     private Node p = NodeFactory.createURI("http://example.com/predicate");
     private Node o = NodeFactory.createURI("http://example.com/object");
 
+    @Test
+    public void testConstructorWithPrefixMappingAndWhereClause() {
+        Model model = ModelFactory.createDefaultModel();
+        model.setNsPrefix("ex", "http://example.com/");
+        UpdateBuilder builder = new UpdateBuilder(model);
+        builder.addInsert(s, "ex:predicate", "?o");
+        builder.addWhere( s, "ex:predicat2", "?o" );
+        builder.build();
+    }
+    
     @Test
     public void testInsert_SPO() {
         UpdateBuilder builder = new UpdateBuilder();
diff --git a/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java b/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
index 0ba0392284..e35a934c12 100644
--- a/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
+++ b/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/MainTest.java
@@ -65,9 +65,7 @@ public class MainTest {
 
     @AfterClass
     public static void tearDownClass() {
-        try {
-            SERVER.shutdown();
-        } catch (Throwable th) {}
+        SERVER.shutdown();
     }
 
     @Before
diff --git a/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/TDB2Test.java b/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/TDB2Test.java
index d2d7a4b04c..edb7c0838d 100644
--- a/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/TDB2Test.java
+++ b/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/TDB2Test.java
@@ -69,9 +69,7 @@ public class TDB2Test {
 
     @AfterClass
     public static void tearDownClass() {
-        try {
-            SERVER.shutdown();
-        } catch (Throwable th) {}
+        SERVER.shutdown();
     }
 
     @Before
diff --git a/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/TDBTest.java b/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/TDBTest.java
index 51c9b76716..fa13e9a92b 100644
--- a/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/TDBTest.java
+++ b/jena-fuseki2/jena-fuseki-geosparql/src/test/java/org/apache/jena/fuseki/geosparql/TDBTest.java
@@ -69,9 +69,7 @@ public class TDBTest {
 
     @AfterClass
     public static void tearDownClass() {
-        try {
-            SERVER.shutdown();
-        } catch (Throwable th) {}
+        SERVER.shutdown();
     }
 
     @Before
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdminAPI.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdminAPI.java
index 8b5a634561..8431da85b9 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdminAPI.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TestAdminAPI.java
@@ -34,6 +34,7 @@ import org.apache.jena.query.QueryExecution;
 import org.apache.jena.rdfconnection.RDFConnection;
 import org.apache.jena.sparql.exec.http.Params;
 import org.apache.jena.web.HttpSC;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /** More tests of the admin functionality
@@ -45,9 +46,10 @@ public class TestAdminAPI extends AbstractFusekiWebappTest {
         testAddDelete("db_mem", "mem", false);
     }
 
+    @Ignore  // Not stable on github actions.
     @Test public void add_delete_api_2() throws Exception {
         // Deleted mmap files on Windows does not go away until the JVM exits.
-        if ( org.apache.jena.tdb.sys.SystemTDB.isWindows )
+        if ( Sys.isWindows )
             return;
         testAddDelete("db_tdb", "tdb", true);
     }
diff --git a/jena-integration-tests/pom.xml b/jena-integration-tests/pom.xml
index d1738b5201..c5e86124f0 100644
--- a/jena-integration-tests/pom.xml
+++ b/jena-integration-tests/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.apache.jena</groupId>
     <artifactId>jena</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>apache-jena-libs</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <type>pom</type>
     </dependency>
 
@@ -50,13 +50,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfconnection</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-rdfconnection</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-cmds</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-cmds</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -79,19 +79,19 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-geosparql</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-main</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-core</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-main</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>  
@@ -107,14 +107,14 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-text</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <!-- The test artifacts to go with apache-jena-libs -->
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-base</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -122,13 +122,13 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-index-test</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-dboe-trans-data</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
@@ -137,14 +137,14 @@
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
       <classifier>tests</classifier>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>    
 
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>4.8.0-SNAPSHOT</version>
+      <version>4.9.0-SNAPSHOT</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/jena-tdb1/src/test/java/org/apache/jena/tdb/ConfigTest.java b/jena-tdb1/src/test/java/org/apache/jena/tdb/ConfigTest.java
index 929aff736f..5a54d4b660 100644
--- a/jena-tdb1/src/test/java/org/apache/jena/tdb/ConfigTest.java
+++ b/jena-tdb1/src/test/java/org/apache/jena/tdb/ConfigTest.java
@@ -19,7 +19,7 @@
 package org.apache.jena.tdb;
 
 import org.apache.jena.atlas.lib.FileOps ;
-import org.apache.jena.tdb.sys.SystemTDB ;
+import org.apache.jena.base.Sys;
 
 public class ConfigTest
 {
@@ -27,7 +27,7 @@ public class ConfigTest
     // Place under target
     private static final String testingDir = "target/tdb-testing" ;
     private static final String testingDirDB = "target/tdb-testing/DB" ;
-    static boolean nonDeleteableMMapFiles = SystemTDB.isWindows ;
+    static boolean nonDeleteableMMapFiles = Sys.isWindows ;
 
     static boolean initialized = false ;