Upgrade to Java 17 and latest KOMMA/eniLINK snapshots

.github/workflows/deploy.yml

@@ -20,15 +20,15 @@ jobs:
     environment: sonatype
 
     steps:
-      # Checks-out the repository under $GITHUB_WORKSPACE
-      - uses: actions/checkout@v2
+      - name: Check out the repo
+        uses: actions/checkout@v4.1.1
 
       # Sets up JDK
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.4.0
+      - name: Set up JDK
+        uses: actions/setup-java@v4.0.0
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       # Runs the Maven build
       - name: Build and deploy with Maven

.github/workflows/docker.yml

@@ -19,14 +19,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
 
       # Sets up JDK
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.4.0
+      - name: Set up JDK
+        uses: actions/setup-java@v4.0.0
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       # Runs the Maven build
       - name: Build server with Maven

.github/workflows/verify.yml

@@ -17,15 +17,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      # Checks-out the repository under $GITHUB_WORKSPACE
-      - uses: actions/checkout@v2
+      - name: Check out the repo
+        uses: actions/checkout@v4.1.1
 
       # Sets up JDK
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3.4.0
+      - name: Set up JDK
+        uses: actions/setup-java@v4.0.0
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       # Runs the Maven build
       - name: Build and verify with Maven

bundles/io.github.linkedfactory.core/pom.xml

@@ -19,13 +19,13 @@
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>osgi.core</artifactId>
-			<version>6.0.0</version>
+			<version>7.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>osgi.cmpn</artifactId>
-			<version>6.0.0</version>
+			<version>7.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -151,7 +151,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>30.1.1-jre</version>
+			<version>32.1.3-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>net.enilink.komma</groupId>

bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/komma/ModelModule.java

@@ -6,8 +6,5 @@ public class ModelModule extends KommaModule {
     {
         addBehaviour(KvinMemoryModelSet.class);
         addBehaviour(KvinPersistentModelSet.class);
-        addBehaviour(RepositoryManagerModelSet.class);
-        addBehaviour(Rdf4jModelSet.class);
     }
-
 }

bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/KvinParquet.java

@@ -13,6 +13,7 @@
 import net.enilink.komma.core.URI;
 import net.enilink.komma.core.URIs;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.parquet.avro.AvroParquetReader;
 import org.apache.parquet.filter2.compat.FilterCompat;

bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/rdf4j/Rdf4jModelSetTest.java → bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/rdf4j/KvinModelSetTest.java

@@ -8,15 +8,15 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class Rdf4jModelSetTest {
+public class KvinModelSetTest {
 	@Test
 	public void testBasicConfig() {
 		// create configuration and a model set factory
 		KommaModule module = ModelPlugin.createModelSetModule(getClass().getClassLoader());
 		IModelSetFactory factory = Guice.createInjector(new ModelSetModule(module)).getInstance(IModelSetFactory.class);
 
 		IGraph config = new LinkedHashGraph();
-		ModelUtil.readData(getClass().getResourceAsStream("/rdf4j-modelset-config.ttl"), null,
+		ModelUtil.readData(getClass().getResourceAsStream("/kvin-modelset-config.ttl"), null,
 				"text/turtle", new IDataVisitor<Object>() {
 			@Override
 			public Object visitBegin() {

bundles/io.github.linkedfactory.core/src/test/resources/rdf4j-modelset-config.ttl → bundles/io.github.linkedfactory.core/src/test/resources/kvin-modelset-config.ttl

@@ -6,7 +6,7 @@
 @prefix sb: <http://www.openrdf.org/config/sail/base#>.
 @prefix models: <http://enilink.net/vocab/komma/models#> .
 
-<urn:enilink:data> a models:Rdf4jModelSet ;
+<urn:enilink:data> a models:RepositoryModelSet ;
 	models:repository <test:repo> .
 
 <test:repo> a rep:Repository ;

bundles/io.github.linkedfactory.service/pom.xml

@@ -32,13 +32,13 @@
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>osgi.core</artifactId>
-			<version>6.0.0</version>
+			<version>7.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>osgi.cmpn</artifactId>
-			<version>6.0.0</version>
+			<version>7.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk:11-jre-hotspot
+FROM eclipse-temurin:17-alpine
 EXPOSE 8080
 
 # Add linkedfactory-pod server