Merge branch 'develop' into fix/versioning

# Conflicts: # src/main/resources/iguana.owx
dice-group · Oct 14, 2024 · 4fc0aa5 · 4fc0aa5
2 parents b86d876 + d454c0c
commit 4fc0aa5
Show file tree

Hide file tree

Showing 83 changed files with 423 additions and 61,285 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -80,6 +80,10 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
           cache: 'maven'
+      - name: Install lftp
+        run: |
+          sudo apt-get update
+          sudo apt-get install lftp
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -132,13 +136,23 @@ jobs:
       - run: cp artifacts/iguana.owx ontology/${{ steps.find_ontology_version.outputs.ONTOLOGY_VERSION }}/iguana.owx
       - run: cp artifacts/iguana.owx ontology/iguana.owx
 
-      - name: Deploy Ontology
+      - name: Deploy Ontology to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./ontology/
           destination_dir: ./ontology/
 
+      - name: Deploy Ontology to FTP
+        run: |
+          lftp -u ${{ secrets.FTP_USERNAME }},${{ secrets.FTP_PASSWORD }} files.dice-research.org << EOF
+              set cmd:fail-exit yes
+              set ftp:ssl-protect-data true
+              cd /vocab
+              mirror -R ontology/. iguana/
+              bye
+              EOF
+
 
   deploy_gh_release:
     name: Publish GitHub Release

diff --git a/docs/configuration/overview.md b/docs/configuration/overview.md
@@ -179,7 +179,7 @@ For the csv storage, the above configuration might result with the following `ta
 
 | taskID                                                      | connection | version | dataset |
 |-------------------------------------------------------------|------------|---------|---------|
-| http://iguana-benchmark.eu/resource/1699354119-3273189568/0 | fuseki     | v2      | sp2b    | 
+|  https://vocab.dice-research.org/iguana/resource/1699354119-3273189568/0 | fuseki     | v2      | sp2b    | 
 
 The resulting triples for the rdf file storage might look like this:
 

diff --git a/docs/configuration/rdf_results.md b/docs/configuration/rdf_results.md
@@ -7,7 +7,7 @@ The first excerpt shows the results for the task `ires:1710247002-3043500295/0`
 `ires:1710247002-3043500295/0/0`:
 
 ```turtle
-<http://iguana-benchmark.eu/resource/1710247002-3043500295/0>
+< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0>
         a                     iont:Stresstest , iont:Task ;
         iprop:AvgQPS          84.121083502 ;
         iprop:NoQ             16 ;
@@ -18,9 +18,9 @@ The first excerpt shows the results for the task `ires:1710247002-3043500295/0`
         iprop:noOfWorkers     "1"^^<http://www.w3.org/2001/XMLSchema#int> ;
         iprop:query           (iri of every query that has been executed inside the task) ;
         iprop:startDate       "2024-03-12T12:36:42.636Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> ;
-        iprop:workerResult    <http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0> .
+        iprop:workerResult    < https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0> .
 
-<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0>
+< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0>
         a                  iont:Worker ;
         iprop:AvgQPS       84.121083502 ;
         iprop:NoQ          16 ;
@@ -73,7 +73,7 @@ It consists of a hash value of the query handler and the query id in this format
 In this example, results for the query `ires:1181728761:0` are shown:
 
 ```turtle
-<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/1181728761:0>
+< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/1181728761:0>
         a                       iont:ExecutedQuery ;
         iprop:QPS               18.975908187 ;
         iprop:failed            0 ;
@@ -85,11 +85,11 @@ In this example, results for the query `ires:1181728761:0` are shown:
         iprop:unknownException  0 ;
         iprop:wrongCodes        0 .
 
-<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0>
+< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0>
         a                       iont:ExecutedQuery ;
         iprop:QPS               18.975908187 ;
         iprop:failed            0 ;
-        iprop:queryExecution    <http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0/1> ;
+        iprop:queryExecution    < https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0/1> ;
         iprop:queryID           ires:1181728761:0 ;
         iprop:resultSize        212 ;
         iprop:succeeded         1 ;
@@ -99,7 +99,7 @@ In this example, results for the query `ires:1181728761:0` are shown:
         iprop:wrongCodes        0 .
 ```
 
-The IRI `<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0>` consists of the following
+The IRI `< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0>` consists of the following
 segments:
 - `ires:1710247002-3043500295` is the IRI of the benchmark suite.
 - `ires:1710247002-3043500295/0` is the IRI of the first task.
@@ -109,16 +109,16 @@ segments:
 The suite id is made up of the timestamp and the hash value of the suite configuration in this pattern:
 `ires:<timestamp>-<hash>`.
 
-The subject `<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0>` represents the results of the query
+The subject `< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0>` represents the results of the query
 `ires:1181728761:0` from first worker of the task `1710247002-3043500295/0`.
 
-The subject `<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/1181728761:0>` represents the results of the query
+The subject `< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/1181728761:0>` represents the results of the query
 `ires:1181728761:0` from every worker across the whole task `1710247002-3043500295/0`.
 
 Results of query metrics, like the `QPS` metric (also the `AES` metric),
 are therefore calculated for each query of each worker and for each query of the whole task.
 
-The `iprop:queryExecution` property of `<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0>` 
+The `iprop:queryExecution` property of `< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0>` 
 contains the IRIs of the executions of that query from that worker.
 These will be explained in the next section.
 
@@ -128,19 +128,19 @@ With the `EachQuery` metric Iguana stores the statistics of each execution of a
 The following excerpt shows the execution statistics of the query `ires:1181728761:0`:
 
 ```turtle
-<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0/1>
+< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0/1>
         iprop:code          "0"^^<http://www.w3.org/2001/XMLSchema#int> ;
         iprop:httpCode      "200" ;
         iprop:queryID       ires:1181728761:0 ;
-        iprop:responseBody  <http://iguana-benchmark.eu/resource/responseBody/-3025899826584824492> ;
+        iprop:responseBody  < https://vocab.dice-research.org/iguana/resource/responseBody/-3025899826584824492> ;
         iprop:resultSize    "212"^^<http://www.w3.org/2001/XMLSchema#long> ;
         iprop:run           1 ;
         iprop:startTime     "2024-03-12T12:36:42.647764Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> ;
         iprop:success       true ;
         iprop:time          "PT0.0526984S"^^<http://www.w3.org/2001/XMLSchema#dayTimeDuration> .
 ```
 
-The IRI `<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0/1>` consists of the worker
+The IRI `< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0/1>` consists of the worker
 query IRI as described above and the run number of the query execution.
 
 The properties of the `EachQuery` metric are described in the [metrics](./metrics.md) section.
diff --git a/pom.xml b/pom.xml
@@ -43,12 +43,10 @@
         <ontology.version>4.1.0</ontology.version>
 
         <java.version>17</java.version>
-        <jena.version>4.2.0</jena.version>
+        <jena.version>5.1.0</jena.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compile.target>17</maven.compile.target>
         <maven.compile.source>17</maven.compile.source>
-
-        <log4j.version>2.19.0</log4j.version>
     </properties>
 
     <distributionManagement>
@@ -78,38 +76,48 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.4.14</version>
+            <version>1.5.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.12.5</version>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.12.5</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.17.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.17.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.17.2</version>
         </dependency>
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
             <version>1.0.78</version>
         </dependency>
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.9.2</version>
+            <version>5.10.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
-            <version>5.7.1</version>
+            <version>5.9</version>
         </dependency>
         <dependency>
             <groupId>org.lz4</groupId>
@@ -119,7 +127,7 @@
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-common</artifactId>
-            <version>2.5.5</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>com.beust</groupId>
@@ -129,13 +137,13 @@
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8-standalone</artifactId>
-            <version>2.35.1</version>
+            <version>2.35.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.3</version>
+            <version>5.3.1</version>
         </dependency>
     </dependencies>
 
@@ -158,7 +166,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>17</source>
                     <target>17</target>
@@ -175,7 +183,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.3.1</version>
                 <configuration>
                     <argLine>-Xmx16384M</argLine>
                 </configuration>
@@ -185,7 +193,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.6.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <finalName>iguana</finalName>
@@ -211,17 +219,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.8.0</version>
                 <configuration>
                     <doclint>-html</doclint>
                     <reportOutputDirectory>javadoc/${revision}/</reportOutputDirectory>
                     <destDir></destDir>
                 </configuration>
             </plugin>
-
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>copy-resources</id>
@@ -256,7 +263,7 @@
                     <!-- needs to be correct version fitting to junit-jupiter -->
                     <groupId>org.junit.platform</groupId>
                     <artifactId>junit-platform-launcher</artifactId>
-                    <version>1.9.2</version>
+                    <version>1.10.3</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -265,7 +272,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.6.0</version>
+                        <version>3.4.1</version>
                         <executions>
                             <execution>
                                 <id>run-script</id>
@@ -300,7 +307,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.1.2</version>
+                        <version>3.2.5</version>
                     </plugin>
                     <plugin>
                         <groupId>org.graalvm.buildtools</groupId>