From 130a63dca948644f3915deca47dcdbb3423026f7 Mon Sep 17 00:00:00 2001
From: Paul Gallagher <paul.gallagher@telicent.io>
Date: Wed, 8 Jan 2025 15:49:24 +0000
Subject: [PATCH 1/2] [Minor] Updating dependencies, removing redundant
 exclusions and addressing warnings.

---
 pom.xml            | 129 +++++++++++++++++++++++++++++++++++++--------
 scg-server/pom.xml |   5 +-
 scg-system/pom.xml | 101 ++++++++++++++++++++++++++++++++---
 3 files changed, 205 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9dbec1d..b3adf13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,22 +88,24 @@
     <dependency.fuseki-server>${dependency.jena}</dependency.fuseki-server>
     <dependency.graphql>0.9.1</dependency.graphql>
     <dependency.jwt-servlet-auth>0.17.5</dependency.jwt-servlet-auth>
-    <dependency.smart-caches-core>0.25.1</dependency.smart-caches-core>
+    <dependency.smart-caches-core>0.25.2</dependency.smart-caches-core>
 
     <!-- External dependencies -->
+    <dependency.jackson>2.18.2</dependency.jackson>
+    <dependency.kafka>3.9.0</dependency.kafka>
     <dependency.kotlin>2.1.0</dependency.kotlin>
     <dependency.otel>1.33.0</dependency.otel> <!-- These two must be in-step. -->
     <dependency.otel-semconv>1.30.1-alpha</dependency.otel-semconv> <!-- These two must be in-step. -->
 
     <!-- Logging dependencies -->
     <dependency.log4j2>2.24.3</dependency.log4j2>
-    <dependency.logback>1.5.15</dependency.logback>
+    <dependency.logback>1.5.16</dependency.logback>
     <dependency.slf4j>2.0.13</dependency.slf4j>
 
     <!-- Test dependencies -->
     <dependency.junit5>5.11.4</dependency.junit5>
     <dependency.junit5-platform>1.11.4</dependency.junit5-platform>
-    <dependency.mockito>5.14.2</dependency.mockito>
+    <dependency.mockito>5.15.2</dependency.mockito>
     <dependency.testcontainers>1.20.4</dependency.testcontainers>
 
     <dependency.yaml-config>1.0.7</dependency.yaml-config>
@@ -129,13 +131,45 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-suite-engine</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
       <!-- Complete Fuseki Main server as a single jar -->
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-arq</artifactId>
+        <version>${dependency.jena}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-base</artifactId>
+        <version>${dependency.jena}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-cmds</artifactId>
+        <version>${dependency.jena}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-core</artifactId>
+        <version>${dependency.jena}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-dboe-base</artifactId>
+        <version>${dependency.jena}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-fuseki-core</artifactId>
+        <version>${dependency.jena}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.jena</groupId>
         <artifactId>jena-fuseki-server</artifactId>
@@ -147,6 +181,24 @@
         <artifactId>jena-fuseki-webapp</artifactId>
         <version>${dependency.jena}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-rdfpatch</artifactId>
+        <version>${dependency.jena}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-tdb1</artifactId>
+        <version>${dependency.jena}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.jena</groupId>
+        <artifactId>jena-tdb2</artifactId>
+        <version>${dependency.jena}</version>
+      </dependency>
+
       <!-- Fuseki-Kafka connector -->
       <dependency>
         <groupId>io.telicent.jena</groupId>
@@ -159,7 +211,11 @@
           </exclusion>
         </exclusions>
       </dependency>
-
+      <dependency>
+        <groupId>io.telicent.jena</groupId>
+        <artifactId>jena-kafka-connector</artifactId>
+        <version>${dependency.fuseki-kafka}</version>
+      </dependency>
       <!-- ABAC engine -->
       <dependency>
         <!-- Used in scg-system -->
@@ -173,6 +229,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>io.telicent.jena</groupId>
+        <artifactId>rdf-abac-core</artifactId>
+        <version>${dependency.rdf-abac}</version>
+      </dependency>
       <dependency>
         <groupId>io.telicent.jena</groupId>
         <artifactId>rdf-abac-fmod</artifactId>
@@ -184,18 +245,22 @@
         <groupId>io.telicent.public</groupId>
         <artifactId>jwt-servlet-auth-aws</artifactId>
         <version>${dependency.jwt-servlet-auth}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-          </exclusion>
-        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>io.telicent.public</groupId>
+        <artifactId>jwt-servlet-auth-core</artifactId>
+        <version>${dependency.jwt-servlet-auth}</version>
       </dependency>
       <dependency>
         <groupId>io.telicent.public</groupId>
         <artifactId>jwt-servlet-auth-servlet5</artifactId>
         <version>${dependency.jwt-servlet-auth}</version>
       </dependency>
+      <dependency>
+        <groupId>io.telicent.smart-caches</groupId>
+        <artifactId>configurator</artifactId>
+        <version>${dependency.smart-caches-core}</version>
+      </dependency>
       <dependency>
         <groupId>io.telicent.smart-caches</groupId>
         <artifactId>jwt-auth-common</artifactId>
@@ -203,6 +268,11 @@
       </dependency>
 
       <!-- GraphQL -->
+      <dependency>
+        <groupId>io.telicent.jena.graphql</groupId>
+        <artifactId>graphql-jena-core</artifactId>
+        <version>${dependency.graphql}</version>
+      </dependency>
       <dependency>
         <groupId>io.telicent.jena.graphql</groupId>
         <artifactId>graphql-fuseki-module</artifactId>
@@ -225,6 +295,17 @@
       </dependency>
 
       <!-- External Dependencies -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${dependency.jackson}</version>
+      </dependency>
+      <!-- Kafka for Event Sourcing -->
+      <dependency>
+        <groupId>org.apache.kafka</groupId>
+        <artifactId>kafka-clients</artifactId>
+        <version>${dependency.kafka}</version>
+      </dependency>
 
       <!-- Logging dependencies -->
       <dependency>
@@ -236,12 +317,6 @@
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api</artifactId>
         <version>${dependency.log4j2}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
@@ -335,6 +410,12 @@
         <version>${dependency.mockito}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>junit-jupiter</artifactId>
+        <version>${dependency.testcontainers}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.testcontainers</groupId>
         <artifactId>kafka</artifactId>
@@ -347,6 +428,12 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.testcontainers</groupId>
+        <artifactId>testcontainers</artifactId>
+        <version>${dependency.testcontainers}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>io.telicent.public</groupId>
         <artifactId>fuseki-yaml-config</artifactId>
@@ -465,7 +552,7 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${plugin.surefire}</version>
           <configuration>
-            <argLine>@{jacocoArgLine} -XX:+EnableDynamicAgentLoading</argLine>
+            <argLine>@{jacocoArgLine} -javaagent:${org.mockito:mockito-core:jar} -XX:+EnableDynamicAgentLoading -Xshare:off</argLine>
           </configuration>
         </plugin>
 
diff --git a/scg-server/pom.xml b/scg-server/pom.xml
index bd00388..de428ec 100644
--- a/scg-server/pom.xml
+++ b/scg-server/pom.xml
@@ -91,13 +91,14 @@
                 <exclude>META-INF/*.SF</exclude>
                 <exclude>META-INF/*.DSA</exclude>
                 <exclude>META-INF/*.RSA</exclude>
+                <exclude>META-INF/*.xml</exclude>
                 <exclude>META-INF/MANIFEST.MF</exclude>
-                <exclude>META-INF.versions.9.module-info</exclude>
-                <exclude>META-INF/versions/9/module-info</exclude>
+                <exclude>META-INF/versions/**</exclude>
                 <exclude>META-INF/DEPENDENCIES</exclude>
                 <exclude>META-INF/LICENSE-notice.md</exclude>
                 <exclude>META-INF/maven/com.google.guava/guava/pom.properties</exclude>
                 <exclude>META-INF/maven/com.google.guava/guava/pom.xml</exclude>
+                <exclude>META-INF/org/apache/logging/log4j/core/config/plugins/Log4j2Plugins.dat</exclude>
                 <exclude>META-INF/proguard/*.pro</exclude>
                 <exclude>logback.xml</exclude>
               </excludes>
diff --git a/scg-system/pom.xml b/scg-system/pom.xml
index f3b05a6..2f1b5d1 100644
--- a/scg-system/pom.xml
+++ b/scg-system/pom.xml
@@ -35,6 +35,38 @@
   <dependencies>
 
     <!-- Internal dependencies -->
+
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-arq</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-base</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-cmds</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-dboe-base</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-fuseki-core</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-main</artifactId>
@@ -45,7 +77,27 @@
       <artifactId>jena-fuseki-webapp</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-rdfpatch</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-tdb1</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.jena</groupId>
+      <artifactId>jena-tdb2</artifactId>
+    </dependency>
+
     <!-- ABAC engine -->
+    <dependency>
+      <groupId>io.telicent.jena</groupId>
+      <artifactId>rdf-abac-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.telicent.jena</groupId>
       <artifactId>rdf-abac-fuseki</artifactId>
@@ -56,38 +108,63 @@
       <groupId>io.telicent.jena</groupId>
       <artifactId>jena-fuseki-kafka-module</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.telicent.jena</groupId>
+      <artifactId>jena-kafka-connector</artifactId>
+    </dependency>
 
     <!-- Authentication -->
     <dependency>
-      <groupId>io.telicent.smart-caches</groupId>
-      <artifactId>jwt-auth-common</artifactId>
+      <groupId>io.telicent.public</groupId>
+      <artifactId>jwt-servlet-auth-aws</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.telicent.public</groupId>
-      <artifactId>jwt-servlet-auth-aws</artifactId>
+      <artifactId>jwt-servlet-auth-core</artifactId>
     </dependency>
     <dependency>
       <groupId>io.telicent.public</groupId>
       <artifactId>jwt-servlet-auth-servlet5</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>io.telicent.smart-caches</groupId>
+      <artifactId>configurator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.telicent.smart-caches</groupId>
+      <artifactId>jwt-auth-common</artifactId>
+    </dependency>
     <!-- GraphQL -->
+    <dependency>
+      <groupId>io.telicent.jena.graphql</groupId>
+      <artifactId>graphql-jena-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.telicent.jena.graphql</groupId>
       <artifactId>graphql-fuseki-module</artifactId>
     </dependency>
-
     <dependency>
       <groupId>io.telicent.jena.graphql</groupId>
       <artifactId>telicent-graph-schema</artifactId>
     </dependency>
 
     <!-- External dependencies -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <!-- Kafka for Event Sourcing -->
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-clients</artifactId>
+    </dependency>
 
     <!-- Logging Dependencies -->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <!-- OpenTelemetry dependencies -->
@@ -159,6 +236,11 @@
     </dependency>
 
     <!-- Kafka - testing -->
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>kafka</artifactId>
@@ -176,8 +258,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>${dependency.testcontainers}</version>
+      <artifactId>testcontainers</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -239,6 +320,12 @@
               <outputDirectory>${project.build.directory}/agents</outputDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>properties</id>
+            <goals>
+              <goal>properties</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
       <plugin>

From 0f58a6fce028b0a4ff801410b749cfb9ee2fa8cb Mon Sep 17 00:00:00 2001
From: Paul Gallagher <paul.gallagher@telicent.io>
Date: Mon, 6 Jan 2025 10:24:58 +0000
Subject: [PATCH 2/2] [Minor] Updating date in NOTICE

---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index d88b153..89d0bee 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
 Telicent Smart Cache Graph
 ==========================
 
-Copyright (c) 2024 Telicent Ltd.
+Copyright (C) 2022-2025 Telicent Ltd