Dependency updates inc Jena 6.0.0

Author: afs

pom.xml

@@ -70,7 +70,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>21</java.version>
 
-    <ver.jena>5.6.0</ver.jena>
+    <ver.jena>6.0.0</ver.jena>
     <ver.jetty>12.1.6</ver.jetty>
 
     <!-- Ensure we get a version compatible with Jena. -->
@@ -193,8 +193,8 @@
        </dependency>
 
        <dependency>
-         <groupId>org.eclipse.jetty.ee10</groupId>
-         <artifactId>jetty-ee10-bom</artifactId>
+         <groupId>org.eclipse.jetty.ee11</groupId>
+         <artifactId>jetty-ee11-bom</artifactId>
          <version>${ver.jetty}</version>
          <scope>import</scope>
          <type>pom</type>
@@ -323,7 +323,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.14.1</version>
+          <version>3.15.0</version>
           <configuration>
             <release>${java.version}</release>
             <compilerArgument>-proc:none</compilerArgument>
@@ -339,7 +339,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.5.4</version> 
+          <version>3.5.5</version> 
           <configuration>
             <useSystemClassLoader>false</useSystemClassLoader>
             <includes>
@@ -376,7 +376,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.9.0</version>
+          <version>3.10.0</version>
           <configuration>
             <overWriteReleases>false</overWriteReleases>
             <overWriteIfNewer>true</overWriteIfNewer>

rdf-delta-cmds/src/main/java/org/seaborne/delta/cmds/CmdPatch.java

@@ -22,11 +22,11 @@
 
 import org.apache.jena.atlas.io.IO;
 import org.apache.jena.atlas.logging.LogCtl ;
-import org.apache.jena.cmd.CmdGeneral;
+import org.apache.jena.cmd.CmdMain;
 import org.apache.jena.sys.JenaSystem;
 
 /** Abstract base class to work on patch files given on the command line */
-public abstract class CmdPatch extends CmdGeneral
+public abstract class CmdPatch extends CmdMain
 {
     static {
         LogCtl.setLogging();

rdf-delta-cmds/src/main/java/org/seaborne/delta/cmds/DeltaCmd.java

@@ -24,15 +24,15 @@
 import org.apache.jena.atlas.web.HttpException ;
 import org.apache.jena.cmd.ArgDecl;
 import org.apache.jena.cmd.CmdException;
-import org.apache.jena.cmd.CmdGeneral;
+import org.apache.jena.cmd.CmdMain;
 import org.seaborne.delta.DataSourceDescription ;
 import org.seaborne.delta.DeltaOps ;
 import org.seaborne.delta.Id ;
 import org.seaborne.delta.PatchLogInfo;
 import org.seaborne.delta.client.DeltaLinkHTTP ;
 import org.seaborne.delta.link.DeltaLink ;
 
-abstract public class DeltaCmd extends CmdGeneral {
+abstract public class DeltaCmd extends CmdMain {
 
     // Environment variable, for commands, for the remote server to work with.
     public static final String ENV_SERVER_URL = "DELTA_SERVER_URL";

rdf-delta-cmds/src/main/java/org/seaborne/delta/cmds/patch2rdf.java

@@ -18,22 +18,22 @@
 package org.seaborne.delta.cmds;
 
 import arq.cmdline.ModDatasetAssembler;
+import org.apache.jena.atlas.logging.LogCtl;
 import org.apache.jena.cmd.ArgDecl;
 import org.apache.jena.cmd.CmdException;
-import org.apache.jena.cmd.CmdGeneral;
-import org.apache.jena.atlas.logging.LogCtl;
+import org.apache.jena.cmd.CmdMain;
+import org.apache.jena.rdfpatch.RDFPatch;
+import org.apache.jena.rdfpatch.RDFPatchOps;
 import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFDataMgr;
 import org.apache.jena.sparql.core.DatasetGraph;
 import org.apache.jena.sparql.core.DatasetGraphFactory;
 import org.apache.jena.sys.JenaSystem;
 import org.apache.jena.system.Txn;
 import org.seaborne.delta.Id;
-import org.apache.jena.rdfpatch.RDFPatch;
-import org.apache.jena.rdfpatch.RDFPatchOps;
 
 /** Apply patches to a base RDF file (or empty dataset). */
-public class patch2rdf extends CmdGeneral
+public class patch2rdf extends CmdMain
 {
     static {
         LogCtl.setLogging();

rdf-delta-cmds/src/main/java/org/seaborne/delta/cmds/patch2update.java

@@ -19,21 +19,21 @@
 
 import java.io.InputStream ;
 
-import org.apache.jena.cmd.CmdException;
-import org.apache.jena.cmd.CmdGeneral ;
 import org.apache.jena.atlas.io.AWriter;
 import org.apache.jena.atlas.io.IO;
 import org.apache.jena.atlas.logging.LogCtl ;
-import org.apache.jena.sparql.core.DatasetGraph;
-import org.apache.jena.sys.JenaSystem;
-import org.seaborne.delta.Id;
+import org.apache.jena.cmd.CmdException;
+import org.apache.jena.cmd.CmdMain;
 import org.apache.jena.rdfpatch.RDFChanges;
 import org.apache.jena.rdfpatch.RDFPatch;
 import org.apache.jena.rdfpatch.RDFPatchOps;
 import org.apache.jena.rdfpatch.changes.RDFChangesWriteUpdate;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sys.JenaSystem;
+import org.seaborne.delta.Id;
 
 /** Generate a SPARQL Update from a patches. */
-public class patch2update extends CmdGeneral
+public class patch2update extends CmdMain
 {
     static {
         LogCtl.setLogging();

rdf-delta-cmds/src/main/java/org/seaborne/delta/cmds/rdf2patch.java

@@ -21,14 +21,14 @@
 
 import org.apache.jena.atlas.logging.LogCtl ;
 import org.apache.jena.cmd.CmdException;
-import org.apache.jena.cmd.CmdGeneral ;
+import org.apache.jena.cmd.CmdMain;
+import org.apache.jena.rdfpatch.RDFPatchOps;
 import org.apache.jena.riot.RDFParser;
 import org.apache.jena.riot.system.StreamRDF ;
 import org.apache.jena.sys.JenaSystem;
-import org.apache.jena.rdfpatch.RDFPatchOps;
 
 /** Write an RDF file as a patch file of "adds" (prefixes and triples/quads). */
-public class rdf2patch extends CmdGeneral
+public class rdf2patch extends CmdMain
 {
     static {
         LogCtl.setLogging();

rdf-delta-fuseki-server/src/main/java/org/seaborne/delta/fuseki/cmd/DeltaBackupServer.java

@@ -23,20 +23,19 @@
 import java.util.List;
 
 import jakarta.servlet.http.HttpServlet;
-
 import org.apache.jena.atlas.json.JSON;
 import org.apache.jena.atlas.json.JsonArray;
 import org.apache.jena.atlas.json.JsonObject;
 import org.apache.jena.atlas.json.JsonValue;
 import org.apache.jena.cmd.ArgDecl;
 import org.apache.jena.cmd.CmdException;
-import org.apache.jena.cmd.CmdGeneral;
+import org.apache.jena.cmd.CmdMain;
 import org.apache.jena.fuseki.main.JettyServer;
+import org.apache.jena.rdfpatch.filelog.FilePolicy;
 import org.seaborne.delta.Delta;
 import org.seaborne.delta.fuseki.PatchWriteServlet;
 import org.seaborne.delta.lib.JSONX;
 import org.seaborne.delta.lib.LogX;
-import org.apache.jena.rdfpatch.filelog.FilePolicy;
 import  org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,7 +73,7 @@ static class BackupConfig {
         List<BackupArea> logs =  new ArrayList<>();
     }
 
-    static class Inner extends CmdGeneral {
+    static class Inner extends CmdMain {
         private final ArgDecl argPort     = new ArgDecl(true, "port");
         private final ArgDecl argConf     = new ArgDecl(true, "config", "cfg");
         private final ArgDecl argDir      = new ArgDecl(true, "dir");

rdf-delta-server-http/src/main/java/org/seaborne/delta/server/http/PatchLogServer.java

@@ -29,9 +29,9 @@
 import org.apache.jena.fuseki.main.sys.FusekiErrorHandler;
 import org.apache.jena.fuseki.servlets.ServletOps;
 import org.apache.jena.riot.Lang;
-import org.eclipse.jetty.ee10.servlet.FilterHolder;
-import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
-import org.eclipse.jetty.ee10.servlet.ServletHolder;
+import org.eclipse.jetty.ee11.servlet.FilterHolder;
+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee11.servlet.ServletHolder;
 import org.eclipse.jetty.http.MimeTypes;
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;