Upgrade to jena 5

SmartDataAnalytics · Nov 28, 2023 · a0edddb · a0edddb
1 parent 2742089
commit a0edddb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/bsbm-cli/pom.xml b/bsbm-cli/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.aksw.bsbm</groupId>
         <artifactId>bsbm-parent</artifactId>
-        <version>3.1.9-SNAPSHOT</version>
+        <version>3.1.10-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/bsbm-core/pom.xml b/bsbm-core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.aksw.bsbm</groupId>
         <artifactId>bsbm-parent</artifactId>
-        <version>3.1.9-SNAPSHOT</version>
+        <version>3.1.10-SNAPSHOT</version>
     </parent>
 
 	<dependencies>

diff --git a/bsbm-core/src/main/java/benchmark/testdriver/SPARQLConnection2.java b/bsbm-core/src/main/java/benchmark/testdriver/SPARQLConnection2.java
@@ -8,6 +8,7 @@
 import org.apache.jena.graph.Triple;
 import org.apache.jena.query.QueryCancelledException;
 import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryType;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.query.ResultSetFormatter;
 import org.apache.jena.rdfconnection.SparqlQueryConnection;
@@ -38,28 +39,28 @@ public static long consume(QueryExecution qe) {
     }
 
     public static long consume(QueryExecution qe, org.apache.jena.query.Query query) {
-        int queryType = query.getQueryType();
+        QueryType queryType = query.queryType();
 
         long result = consume(qe, queryType);
         return result;
     }
 
-    public static long consume(QueryExecution qe, int queryType) {
+    public static long consume(QueryExecution qe, QueryType queryType) {
         long result;
         switch (queryType) {
-        case org.apache.jena.query.Query.QueryTypeAsk:
+        case ASK:
             qe.execAsk();
             result = 1;
             break;
-        case org.apache.jena.query.Query.QueryTypeConstruct:
+        case CONSTRUCT:
             Iterator<Triple> itC = qe.execConstructTriples();
             result = Iterators.size(itC);
             break;
-        case org.apache.jena.query.Query.QueryTypeDescribe:
+        case DESCRIBE:
             Iterator<Triple> itD = qe.execDescribeTriples();
             result = Iterators.size(itD);
             break;
-        case org.apache.jena.query.Query.QueryTypeSelect:
+        case SELECT:
             ResultSet rs = qe.execSelect();
             result = ResultSetFormatter.consume(rs);
             break;

diff --git a/bsbm-jenax/pom.xml b/bsbm-jenax/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.aksw.bsbm</groupId>
 		<artifactId>bsbm-parent</artifactId>
-		<version>3.1.9-SNAPSHOT</version>
+		<version>3.1.10-SNAPSHOT</version>
 	</parent>
 
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>org.aksw.bsbm</groupId>
 	<artifactId>bsbm-parent</artifactId>
-	<version>3.1.9-SNAPSHOT</version>
+	<version>3.1.10-SNAPSHOT</version>
 
 	<packaging>pom</packaging>
 
@@ -48,11 +48,11 @@
 	</developers>
 
 	<properties>
-		<jena.version>4.9.0</jena.version>
-		<jenax.version>4.9.0-1</jenax.version>
+		<jena.version>5.0.0-SNAPSHOT</jena.version>
+		<jenax.version>5.0.0-1-SNAPSHOT</jenax.version>
 
 		<!-- Project Settings -->
-		<maven.compiler.release>11</maven.compiler.release>
+		<maven.compiler.release>17</maven.compiler.release>
 <!-- 		<maven.compiler.source>1.8</maven.compiler.source> -->
 <!-- 		<maven.compiler.target>1.8</maven.compiler.target> -->
 		<java.version.javadoc>http://java.sun.com/javase/6/docs/api/</java.version.javadoc>