Try to fix build

ArDoCo · Apr 14, 2023 · 10144df · 10144df
1 parent 334b166
commit 10144df
Show file tree

Hide file tree

Showing 20 changed files with 43 additions and 4 deletions.
diff --git a/pipeline/src/main/java/edu/kit/kastel/mcse/ardoco/core/execution/ConfigurationHelper.java b/pipeline/src/main/java/edu/kit/kastel/mcse/ardoco/core/execution/ConfigurationHelper.java
@@ -33,7 +33,10 @@ private ConfigurationHelper() throws IllegalAccessException {
      */
     public static Map<String, String> loadAdditionalConfigs(File additionalConfigsFile) {
         Map<String, String> additionalConfigs = new HashMap<>();
-        if (additionalConfigsFile != null && additionalConfigsFile.exists()) {
+        if (additionalConfigsFile != null && (!additionalConfigsFile.exists() || !additionalConfigsFile.isFile())) {
+            throw new IllegalArgumentException("File " + additionalConfigsFile + " is not a valid configuration file!");
+        }
+        if (additionalConfigsFile != null) {
             try (var scanner = new Scanner(additionalConfigsFile, StandardCharsets.UTF_8)) {
                 while (scanner.hasNextLine()) {
                     var line = scanner.nextLine();

diff --git a/...es/configurations/bbb/filterlists_all.txt → ...es/configurations/bbb/filterlists_all.txt b/...es/configurations/bbb/filterlists_all.txt → ...es/configurations/bbb/filterlists_all.txt
diff --git a/...s/configurations/bbb/filterlists_none.txt → ...s/configurations/bbb/filterlists_none.txt b/...s/configurations/bbb/filterlists_none.txt → ...s/configurations/bbb/filterlists_none.txt
diff --git a/...igurations/bbb/filterlists_onlyCommon.txt → ...igurations/bbb/filterlists_onlyCommon.txt b/...igurations/bbb/filterlists_onlyCommon.txt → ...igurations/bbb/filterlists_onlyCommon.txt
diff --git a/...configurations/jabref/enhanced_jabref.txt → ...configurations/jabref/enhanced_jabref.txt b/...configurations/jabref/enhanced_jabref.txt → ...configurations/jabref/enhanced_jabref.txt
diff --git a/...configurations/jabref/filterlists_all.txt → ...configurations/jabref/filterlists_all.txt b/...configurations/jabref/filterlists_all.txt → ...configurations/jabref/filterlists_all.txt
diff --git a/...onfigurations/jabref/filterlists_none.txt → ...onfigurations/jabref/filterlists_none.txt b/...onfigurations/jabref/filterlists_none.txt → ...onfigurations/jabref/filterlists_none.txt
diff --git a/...rations/jabref/filterlists_onlyCommon.txt → ...rations/jabref/filterlists_onlyCommon.txt b/...rations/jabref/filterlists_onlyCommon.txt → ...rations/jabref/filterlists_onlyCommon.txt
diff --git a/...ces/configurations/ms/filterlists_all.txt → ...ces/configurations/ms/filterlists_all.txt b/...ces/configurations/ms/filterlists_all.txt → ...ces/configurations/ms/filterlists_all.txt
diff --git a/...es/configurations/ms/filterlists_none.txt → ...es/configurations/ms/filterlists_none.txt b/...es/configurations/ms/filterlists_none.txt → ...es/configurations/ms/filterlists_none.txt
diff --git a/...figurations/ms/filterlists_onlyCommon.txt → ...figurations/ms/filterlists_onlyCommon.txt b/...figurations/ms/filterlists_onlyCommon.txt → ...figurations/ms/filterlists_onlyCommon.txt
diff --git a/...ces/configurations/tm/filterlists_all.txt → ...ces/configurations/tm/filterlists_all.txt b/...ces/configurations/tm/filterlists_all.txt → ...ces/configurations/tm/filterlists_all.txt
diff --git a/...es/configurations/tm/filterlists_none.txt → ...es/configurations/tm/filterlists_none.txt b/...es/configurations/tm/filterlists_none.txt → ...es/configurations/tm/filterlists_none.txt
diff --git a/...figurations/tm/filterlists_onlyCommon.txt → ...figurations/tm/filterlists_onlyCommon.txt b/...figurations/tm/filterlists_onlyCommon.txt → ...figurations/tm/filterlists_onlyCommon.txt
diff --git a/...ces/configurations/ts/filterlists_all.txt → ...ces/configurations/ts/filterlists_all.txt b/...ces/configurations/ts/filterlists_all.txt → ...ces/configurations/ts/filterlists_all.txt
diff --git a/...es/configurations/ts/filterlists_none.txt → ...es/configurations/ts/filterlists_none.txt b/...es/configurations/ts/filterlists_none.txt → ...es/configurations/ts/filterlists_none.txt
diff --git a/...figurations/ts/filterlists_onlyCommon.txt → ...figurations/ts/filterlists_onlyCommon.txt b/...figurations/ts/filterlists_onlyCommon.txt → ...figurations/ts/filterlists_onlyCommon.txt
diff --git a/...rc/test/resources/simplelogger.properties → ...rc/main/resources/simplelogger.properties b/...rc/test/resources/simplelogger.properties → ...rc/main/resources/simplelogger.properties
diff --git a/tests/tests-default/pom.xml b/tests/tests-default/pom.xml
@@ -22,13 +22,45 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>io.github.ardoco.core</groupId>
-      <artifactId>common</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>text-extraction</artifactId>
     </dependency>
     <dependency>
-      <groupId>io.github.ardoco.core</groupId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>text-preprocessing</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>recommendation-generator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>pipeline</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>connection-generator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>model-provider</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.github.ardoco.core</groupId>
+      <artifactId>inconsistency-detection</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/tests/tests-inconsistency/pom.xml b/tests/tests-inconsistency/pom.xml
@@ -52,6 +52,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>model-provider</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.github.ardoco.core</groupId>
+      <artifactId>inconsistency-detection</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.github.ardoco.core</groupId>
       <artifactId>tests-base</artifactId>