Update to latest sansa (based on jakarta)

SmartDataAnalytics · Oct 10, 2024 · b6595af · b6595af
1 parent 68b544f
commit b6595af
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -51,7 +51,7 @@
 		<slf4j.version>2.0.9</slf4j.version>
 		<log4j.version>2.21.0</log4j.version>
 
-		<jetty.version>12.0.11</jetty.version>
+		<jetty.version>12.0.14</jetty.version>
 		<!-- <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version> -->
 		<jersey.version>3.1.3</jersey.version>
 
@@ -216,11 +216,11 @@
 				<exclusions>
 					<exclusion>
 						<groupId>org.apache.spark</groupId>
-						<artifactId>spark-sql_2.12</artifactId>
+						<artifactId>spark-sql_2.13</artifactId>
 					</exclusion>
 					<exclusion>
 						<groupId>org.apache.spark</groupId>
-						<artifactId>spark-core_2.12</artifactId>
+						<artifactId>spark-core_2.13</artifactId>
 					</exclusion>
 				</exclusions>
 			</dependency>
@@ -279,14 +279,14 @@
 			</dependency>
 			<dependency>
 				<groupId>net.sansa-stack</groupId>
-				<artifactId>sansa-bom_2.12</artifactId>
+				<artifactId>sansa-bom_2.13</artifactId>
 				<version>${sansa.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
 			<dependency>
 				<groupId>net.sansa-stack</groupId>
-				<artifactId>sansa-cmds-picocli_2.12</artifactId>
+				<artifactId>sansa-cmds-picocli_2.13</artifactId>
 				<version>${sansa.version}</version>
 				<exclusions>
 					<exclusion>

diff --git a/rdf-processing-toolkit-cli/pom.xml b/rdf-processing-toolkit-cli/pom.xml
@@ -26,7 +26,7 @@
 		</dependency>
 		<dependency>
 			<groupId>net.sansa-stack</groupId>
-			<artifactId>sansa-cmds-picocli_2.12</artifactId>
+			<artifactId>sansa-cmds-picocli_2.13</artifactId>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.hadoop</groupId>
@@ -35,10 +35,12 @@
 
 				<!-- Spark excluded here for the shaded sansa-spark-jakarta
 				artifact -->
+				<!--
 				<exclusion>
 					<groupId>org.apache.spark</groupId>
 					<artifactId>spark-sql_2.12</artifactId>
 				</exclusion>
+				-->
 				<!--
 				<exclusion>
 					<groupId>org.glassfish.jersey.core</groupId>
@@ -49,20 +51,22 @@
 					<artifactId>jersey-container-servlet</artifactId>
 				</exclusion>
 				-->
+				<!--
 				<exclusion>
 					<groupId>org.apache.spark</groupId>
 					<artifactId>spark-core_2.12</artifactId>
 				</exclusion>
+				-->
 			</exclusions>
 		</dependency>
-		<!-- -->
+		<!--
 		<dependency>
 			<groupId>net.sansa-stack</groupId>
 			<artifactId>sansa-spark-jakarta_2.12</artifactId>
 			<version>${sansa.version}</version>
 			<classifier>jakarta</classifier>
 		</dependency>
-		<!-- -->
+		-->
 
 
 		<!--		<dependency>-->

diff --git a/...toolkit-cli/src/main/java/org/aksw/sparql_integrate/cli/main/SparqlIntegrateCmdImpls.java b/...toolkit-cli/src/main/java/org/aksw/sparql_integrate/cli/main/SparqlIntegrateCmdImpls.java
@@ -70,7 +70,7 @@
 import org.aksw.jenax.dataaccess.sparql.polyfill.datasource.RdfDataSourceWithLocalLateral;
 import org.aksw.jenax.graphql.rdf.api.RdfGraphQlExecFactory;
 import org.aksw.jenax.graphql.sparql.GraphQlExecFactoryOverSparql;
-import org.aksw.jenax.graphql.sparql.v2.api.high.GraphQlExecFactory;
+import org.aksw.jenax.graphql.sparql.v2.exec.api.high.GraphQlExecFactory;
 import org.aksw.jenax.model.udf.util.UserDefinedFunctions;
 import org.aksw.jenax.sparql.query.rx.RDFDataMgrEx;
 import org.aksw.jenax.stmt.core.SparqlStmt;