Merge master into snyk-upgrade-4362f14b6e5f2bdc0ebf3258176b7124

WDAqua · Oct 8, 2023 · 02ce8dd · 02ce8dd
2 parents c4c4ed7 + 8dd33b5
commit 02ce8dd
Show file tree

Hide file tree

Showing 22 changed files with 393 additions and 314 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

diff --git a/.github/workflows/docker-deployment.yml b/.github/workflows/docker-deployment.yml
@@ -11,15 +11,15 @@ jobs:
         STARDOG_PASSWORD: ${{ secrets.STARDOG_PASSWORD }}
     steps:
       - name: Docker Login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build the Docker images and Push to Dockerhub
         run: bash -c ./service_config/build_images.sh
       - name: Init update
-        uses: MindMaster98/docker-service-updater@v0.1.5
+        uses: WSE-research/docker-service-updater@v0.2.1
         with:
           api_key: ${{ secrets.API_KEY }}
           updater_host: ${{ secrets.UPDATER_HOST }}
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -15,10 +15,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
+        distribution: 'adopt'
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/qald-evaluator/pom.xml b/qald-evaluator/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.wdaqua.qanary</groupId>
     <artifactId>qald.evaluator</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.4</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>net.minidev</groupId>
             <artifactId>json-smart</artifactId>
-            <version>2.4.8</version>
+            <version>2.4.9</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20200518</version>
+            <version>20230227</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jena</groupId>

diff --git a/qanary-configuration-frontend/package-lock.json b/qanary-configuration-frontend/package-lock.json
diff --git a/qanary_commons/pom.xml b/qanary_commons/pom.xml
@@ -2,18 +2,20 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eu.wdaqua.qanary</groupId>
 	<artifactId>qa.commons</artifactId>
-	<version>3.7.1</version>
+	<version>3.8.5</version>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>2.6.7</version>
+		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
+
 	<properties>
 		<java.version>11</java.version>
-		<spring-boot-admin.version>2.6.7</spring-boot-admin.version>
+		<spring-boot-admin.version>2.7.10</spring-boot-admin.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<jena.version>4.4.0</jena.version>
+		<jena.version>4.9.0</jena.version>
 		<stardog.version>[8.0.0,9.0.0)</stardog.version>
 		<mockito.version>4.4.0</mockito.version><!-- last working version -->
 	</properties>
@@ -71,7 +73,7 @@
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20190722</version>
+			<version>20230227</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.vaadin.external.google</groupId>
@@ -242,13 +244,13 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10</version>
+            <version>2.10.1</version>
             <scope>compile</scope>
         </dependency>		
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
-			<version>4.0.0</version>
+			<version>4.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.xml.bind</groupId>
@@ -297,6 +299,19 @@
 					</execution>
 				</executions>
 			</plugin>
+
+			<!--	For Component Cache Tests	-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>