Merge pull request #164 from WDAqua/master

pulll from master
WDAqua · Jul 2, 2023 · 843cd8e · 843cd8e
2 parents ed76680 + bd65c60
commit 843cd8e
Show file tree

Hide file tree

Showing 45 changed files with 1,577 additions and 494 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/docker-deployment.yml b/.github/workflows/docker-deployment.yml
@@ -7,7 +7,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
+    env:
+        STARDOG_PASSWORD: ${{ secrets.STARDOG_PASSWORD }}
     steps:
       - name: Docker Login
         uses: docker/login-action@v2
@@ -18,7 +19,7 @@ jobs:
       - name: Build the Docker images and Push to Dockerhub
         run: bash -c ./service_config/build_images.sh
       - name: Init update
-        uses: MindMaster98/[email protected].4
+        uses: MindMaster98/[email protected].5
         with:
           api_key: ${{ secrets.API_KEY }}
-          updater_host: ${{ secrets.UPDATER_HOST }}
+          updater_host: ${{ secrets.UPDATER_HOST }}
diff --git a/.gitignore b/.gitignore
@@ -81,3 +81,6 @@ stored-question*
 
 **/error
 **/output
+
+**/.factorypath
+
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.1</version>
+    <version>1.0.4</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -65,12 +65,17 @@
         <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>
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -86,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/qald-evaluator/src/test/java/qald/evaluator/FileReaderTest.java b/qald-evaluator/src/test/java/qald/evaluator/FileReaderTest.java
@@ -1,20 +1,20 @@
 package qald.evaluator;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import eu.wdaqua.qanary.qald.evaluator.qaldreader.FileReader;
 
-public class FileReaderTest {
+class FileReaderTest {
 
-	@Ignore
+	@Disabled
 	@Test
-	public void test() throws UnsupportedEncodingException, IOException {
+	void test() throws UnsupportedEncodingException, IOException {
 
 		FileReader filereader = new FileReader();
 

diff --git a/qald-evaluator/src/test/java/qald/evaluator/QaldQuestionTest.java b/qald-evaluator/src/test/java/qald/evaluator/QaldQuestionTest.java
@@ -1,19 +1,19 @@
 package qald.evaluator;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import com.google.gson.JsonObject;
 
 import eu.wdaqua.qanary.qald.evaluator.qaldreader.QaldQuestion;
 
-public class QaldQuestionTest {
+class QaldQuestionTest {
 
-	@Ignore
+	@Disabled
 	@Test
-	public void test() {
+	void test() {
 
 		JsonObject rawQuestion = new JsonObject();
 		rawQuestion.addProperty("id", 42);