From 04549dacb1838af78d6cb9a167e90332b680bad4 Mon Sep 17 00:00:00 2001
From: Kal Ahmed <kal.ahmed@epimorphics.com>
Date: Thu, 18 Dec 2025 09:49:18 +0000
Subject: [PATCH 1/3] Update changelog

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5f68d6d..f0e4afb 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,11 @@ This sapi library has (mostly) been superseded by sapi-nt.
 
 There are two versions of it which remain in use in legacy services - sapi 2.x and sapi 3.x.
 
-### sapi 2.x
+### sapi 2.x/4.x
 
 This version is used in fsa-cat-api and standard-reports-manager.
 
-This is managed on the `main` branch (this branch).
+This is managed on the `main` branch (this branch). The 2.x release is also maintained on the `maintenance/2.x` branch.
 
 ### sapi 3.x
 
@@ -36,6 +36,8 @@ mvn clean deploy
 
 ## Changelog
 
+`4.0.0`  - major new release of sapi from the 2.x line. Addresses multiple CVEs and moves to Java 21 and Jena 5
+`2.3.15` - minor update of dependencies to address CVEs
 `2.3.14` - allow use of CONSTRUCT in item queries
 `2.3.13` - improve return status codes, only retry on 50X errors
 `2.3.12` - find missing logging for query retry

From d19d84ea2833ad0955cec5d050a20dffc660f539 Mon Sep 17 00:00:00 2001
From: Kal Ahmed <kal.ahmed@epimorphics.com>
Date: Thu, 18 Dec 2025 09:56:19 +0000
Subject: [PATCH 2/3] [maven-release-plugin] prepare release sapi-4.0.0

---
 pom.xml              | 4 ++--
 sapi-app/pom.xml     | 4 ++--
 sapi-doctool/pom.xml | 4 ++--
 sapi-lib/pom.xml     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index cba5861..c7349c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
   <groupId>com.epimorphics</groupId>
   <artifactId>sapi</artifactId>
   <packaging>pom</packaging>
-  <version>4.0.0-SNAPSHOT</version>
+  <version>4.0.0</version>
   <name>sapi</name>
   <description>Simple API</description>
   
   <scm>
     <developerConnection>scm:git:git@github.com:epimorphics/sapi.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>sapi-4.0.0</tag>
   </scm>
 
   <properties>
diff --git a/sapi-app/pom.xml b/sapi-app/pom.xml
index cf24450..adc5234 100644
--- a/sapi-app/pom.xml
+++ b/sapi-app/pom.xml
@@ -8,14 +8,14 @@
   <parent>
     <groupId>com.epimorphics</groupId>
     <artifactId>sapi</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
   </parent>
 
   <dependencies>
     <dependency>
     	<groupId>com.epimorphics</groupId>
       <artifactId>sapi-lib</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
diff --git a/sapi-doctool/pom.xml b/sapi-doctool/pom.xml
index 31693af..997504c 100644
--- a/sapi-doctool/pom.xml
+++ b/sapi-doctool/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.epimorphics</groupId>
     <artifactId>sapi</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
   </parent>
 
   <dependencies>
@@ -16,7 +16,7 @@
     <dependency>
     	<groupId>com.epimorphics</groupId>
       <artifactId>sapi-lib</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
+      <version>4.0.0</version>
     </dependency>
 
     <dependency>
diff --git a/sapi-lib/pom.xml b/sapi-lib/pom.xml
index 971885b..cef8fd4 100644
--- a/sapi-lib/pom.xml
+++ b/sapi-lib/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.epimorphics</groupId>
     <artifactId>sapi</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.0</version>
   </parent>
 
   <dependencies>

From 478f22c37158eeb5b7e71674b14f03615c667f24 Mon Sep 17 00:00:00 2001
From: Kal Ahmed <kal.ahmed@epimorphics.com>
Date: Thu, 18 Dec 2025 09:56:22 +0000
Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml              | 4 ++--
 sapi-app/pom.xml     | 4 ++--
 sapi-doctool/pom.xml | 4 ++--
 sapi-lib/pom.xml     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index c7349c6..27f48d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
   <groupId>com.epimorphics</groupId>
   <artifactId>sapi</artifactId>
   <packaging>pom</packaging>
-  <version>4.0.0</version>
+  <version>4.0.1-SNAPSHOT</version>
   <name>sapi</name>
   <description>Simple API</description>
   
   <scm>
     <developerConnection>scm:git:git@github.com:epimorphics/sapi.git</developerConnection>
-    <tag>sapi-4.0.0</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <properties>
diff --git a/sapi-app/pom.xml b/sapi-app/pom.xml
index adc5234..08b9784 100644
--- a/sapi-app/pom.xml
+++ b/sapi-app/pom.xml
@@ -8,14 +8,14 @@
   <parent>
     <groupId>com.epimorphics</groupId>
     <artifactId>sapi</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
     <dependency>
     	<groupId>com.epimorphics</groupId>
       <artifactId>sapi-lib</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/sapi-doctool/pom.xml b/sapi-doctool/pom.xml
index 997504c..bb688a3 100644
--- a/sapi-doctool/pom.xml
+++ b/sapi-doctool/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.epimorphics</groupId>
     <artifactId>sapi</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>
@@ -16,7 +16,7 @@
     <dependency>
     	<groupId>com.epimorphics</groupId>
       <artifactId>sapi-lib</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/sapi-lib/pom.xml b/sapi-lib/pom.xml
index cef8fd4..8d27fbb 100644
--- a/sapi-lib/pom.xml
+++ b/sapi-lib/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.epimorphics</groupId>
     <artifactId>sapi</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1-SNAPSHOT</version>
   </parent>
 
   <dependencies>