Merge pull request #1497 from thehyve/major-upgrades

Update Jena and Milton
thehyve · Mar 7, 2024 · f136ddb · f136ddb
2 parents 8dac59c + b76256b
commit f136ddb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/projects/mercury/src/routes/WorkspaceRoutes.js b/projects/mercury/src/routes/WorkspaceRoutes.js
@@ -16,7 +16,7 @@ import UserContext from "../users/UserContext";
 import UserRolesPage from "../users/UserRolesPage";
 import MetadataView from '../metadata/views/MetadataView';
 import BreadcrumbsContext from '../common/contexts/BreadcrumbsContext';
-import {ExternalStoragePage} from "../external-storage/ExternalStoragePage";
+import ExternalStoragePage from "../external-storage/ExternalStoragePage";
 import ExternalMetadataSourcesView from "../metadata/external-sources/ExternalMetadataSourceView";
 import {METADATA_VIEW_MENU_LABEL} from "../constants";
 

diff --git a/projects/saturn/build.gradle b/projects/saturn/build.gradle
@@ -1,9 +1,9 @@
 buildscript {
     ext {
-        jena_version = '4.3.2'
-        milton_version = '3.0.1.269'
+        jena_version = '4.10.0'
+        milton_version = '3.1.1.488' // Milton >= 4 is migrated to Jakarta EE 9, which is not compatible with Jena < 5 (no stable release of Jena 5 yet). To be updated when Jena 5 is released.
         mockitoVersion = '5.11.0'
-        jacksonVersion = '2.14.2' // check what version is used by Jena
+        jacksonVersion = '2.15.3' // check what version is used by Jena
         postgresqlVersion = '42.7.2'
     }
 }
@@ -51,7 +51,8 @@ dependencies {
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}"
     implementation "com.sparkjava:spark-core:2.9.4"
     implementation 'com.pivovarit:throwing-function:1.5.1'
-    implementation 'com.google.guava:guava:27.1-jre'
+    implementation 'com.google.guava:guava:33.0.0-jre'
+//    implementation 'jakarta.servlet:jakarta.servlet-api:6.0.0' // To be updated when Jena 5 is released.
     implementation('com.io-informatics.oss:jackson-jsonld:0.1.1') {
         exclude group: 'com.github.jsonld-java'
     }
@@ -63,9 +64,10 @@ dependencies {
 
     implementation 'org.keycloak:keycloak-jetty94-adapter:23.0.7'
     implementation 'org.keycloak:keycloak-admin-client:23.0.7'
+    implementation 'org.keycloak:keycloak-policy-enforcer:23.0.7'
 
     implementation "org.postgresql:postgresql:${postgresqlVersion}"
-    implementation "com.zaxxer:HikariCP:3.4.5"
+    implementation "com.zaxxer:HikariCP:5.1.0"
 
     runtimeOnly 'org.apache.logging.log4j:log4j-api:2.23.0'
     runtimeOnly 'org.apache.logging.log4j:log4j-core:2.23.0'

diff --git a/projects/saturn/src/main/java/io/fairspace/saturn/rdf/SaturnDatasetFactory.java b/projects/saturn/src/main/java/io/fairspace/saturn/rdf/SaturnDatasetFactory.java
@@ -30,7 +30,7 @@ public static Dataset connect(Config.Jena config, ViewStoreClientFactory viewSto
         var restoreNeeded = isRestoreNeeded(config.datasetPath);
 
         // Create a TDB2 dataset graph
-        var dsg = connectCreate(Location.create(config.datasetPath.getAbsolutePath()), config.storeParams)
+        var dsg = connectCreate(Location.create(config.datasetPath.getAbsolutePath()), config.storeParams, null)
                 .getDatasetGraph();
 
         var txnLog = new LocalTransactionLog(config.transactionLogPath, new SparqlTransactionCodec());