Merge branch 'main' into next-release

# Conflicts:
#	pom.xml

Author: AlexanderSchultheiss

Dockerfile

@@ -43,7 +43,7 @@ RUN apt-get install -y --no-install-recommends bc
 WORKDIR /home/user
 # Copy JAR from previous stage
 COPY --from=0 /home/user/target /home/user/target
-RUN cp target/Extraction-*-jar-with* .
+RUN cp target/Extraction-jar-with* .
 
 # Copy required scripts and properties
 COPY docker-resources/extract.sh /home/user/

README.md

@@ -326,17 +326,17 @@ Navigate back to working directory
 ### Ground Truth Extraction
 You can run the ground truth extraction for a range of commits by specifying commit ids:
 ```
-java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_linux.properties *START_COMMIT_ID* *END_COMMIT_ID*   
+java -jar Extraction-jar-with-dependencies.jar extraction_linux.properties *START_COMMIT_ID* *END_COMMIT_ID*   
 ```
 or by specifying revision tags:
 ```
-java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_linux.properties *START_REVISION_TAG* *END_REVISION_TAG*   
+java -jar Extraction-jar-with-dependencies.jar extraction_linux.properties *START_REVISION_TAG* *END_REVISION_TAG*   
 ```
 For example, to extract the ground truth for all commits between Linux v4.5 and Linux v4.6, the following is possible:
 ```
-java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_linux.properties b562e44f507e863c6792946e4e1b1449fbbac85d 2dcd0af568b0cf583645c8a317dd12e344b1c72a
+java -jar Extraction-jar-with-dependencies.jar extraction_linux.properties b562e44f507e863c6792946e4e1b1449fbbac85d 2dcd0af568b0cf583645c8a317dd12e344b1c72a
 
-java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_linux.properties v4.5 v5.6
+java -jar Extraction-jar-with-dependencies.jar extraction_linux.properties v4.5 v5.6
 ```
 
 By default, the files with the extracted ground truth are stored under `WORKDIR/evolution-analysis/output/`

docker-resources/extract.sh

@@ -13,26 +13,26 @@ then
     echo "Executing variability extraction of BusyBox."
     if [ $# == 1 ]
     then
-        java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_busybox.properties "$1"
+        java -jar Extraction-jar-with-dependencies.jar extraction_busybox.properties "$1"
     elif [ $# == 2 ]
     then
-        java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_busybox.properties "$1" "$2"
+        java -jar Extraction-jar-with-dependencies.jar extraction_busybox.properties "$1" "$2"
     elif [ $# == 3 ]
     then
-        java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_busybox.properties "$1" "$2" "$3"
+        java -jar Extraction-jar-with-dependencies.jar extraction_busybox.properties "$1" "$2" "$3"
     fi
 elif [ "$1" == 'linux' ]
 then
     echo "Executing variability extraction of Linux."
     if [ $# == 1 ]
     then
-        java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_linux.properties "$1"
+        java -jar Extraction-jar-with-dependencies.jar extraction_linux.properties "$1"
     elif [ $# == 2 ]
     then
-        java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_linux.properties "$1" "$2"
+        java -jar Extraction-jar-with-dependencies.jar extraction_linux.properties "$1" "$2"
     elif [ $# == 3 ]
     then
-        java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_linux.properties "$1" "$2" "$3"
+        java -jar Extraction-jar-with-dependencies.jar extraction_linux.properties "$1" "$2" "$3"
     fi
 elif [ "$1" == '--help' ]
 then
@@ -54,12 +54,12 @@ else
     echo "Executing variability extraction of $1."
     if [ $# == 1 ]
     then
-      java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_generic.properties "$1"
+      java -jar Extraction-jar-with-dependencies.jar extraction_generic.properties "$1"
     elif [ $# == 2 ]
     then
-      java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_generic.properties "$1" "$2"
+      java -jar Extraction-jar-with-dependencies.jar extraction_generic.properties "$1" "$2"
     elif [ $# == 3 ]
     then
-      java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_generic.properties "$1" "$2" "$3"
+      java -jar Extraction-jar-with-dependencies.jar extraction_generic.properties "$1" "$2" "$3"
     fi
 fi

pom.xml

@@ -78,6 +78,7 @@
                 <version>2.22.2</version>
             </plugin>
         </plugins>
+        <finalName>${project.artifactId}</finalName>
     </build>
 
     <dependencies>

src/main/java/org/variantsync/vevos/extraction/Extraction.java

@@ -1,5 +1,6 @@
 package org.variantsync.vevos.extraction;
 
+import org.variantsync.vevos.extraction.kh.FullExtraction;
 import org.variantsync.vevos.extraction.util.ShellExecutor;
 import org.variantsync.vevos.extraction.util.GitUtil;
 import net.ssehub.kernel_haven.SetUpException;
@@ -106,7 +107,7 @@ public static void main(String... args) throws IOException, GitAPIException {
         // Create a task for each commit subset and submit it to the thread pool
         int count = 0;
         LOGGER.logStatus("Scheduling tasks...");
-        boolean fullExtraction = config.getValue(ANALYSIS_CLASS).endsWith("FullAnalysis");
+        boolean fullExtraction = config.getValue(ANALYSIS_CLASS).endsWith(FullExtraction.class.getName());
         for (List<RevCommit> commitSubset : commitSubsets) {
             count += commitSubset.size();
             threadPool.submit(new AnalysisTask(commitSubset, workingDirectory, propertiesFile, splDir.getName(), config.getValue(EXTRACTION_TIMEOUT), fullExtraction));

src/main/resources/busybox-debug.sh

@@ -5,11 +5,11 @@
 # | -- Extraction
 # | -- busybox
 # | -- busybox-debug.sh
-rm Extraction-1.0.0-jar-with-dependencies.jar
+rm Extraction-jar-with-dependencies.jar
 rm -rf extraction-results
 cd Extraction || exit
 mvn package
 clear
 cd ..
-mv Extraction/target/Extraction-1.0.0-jar-with-dependencies.jar .
-java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_busybox.properties b35eef5383a4e7a6fb60fcf3833654a0bb2245e0 7de0ab21d939a5a304157f75918d0318a95261a3
+mv Extraction/target/Extraction-jar-with-dependencies.jar .
+java -jar Extraction-jar-with-dependencies.jar extraction_busybox.properties b35eef5383a4e7a6fb60fcf3833654a0bb2245e0 7de0ab21d939a5a304157f75918d0318a95261a3

src/main/resources/busybox-run.sh

@@ -8,4 +8,4 @@
 echo "Removing previous results"
 rm -rf extraction-results
 echo "Executing ground truth extraction for BusyBox."
-java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_busybox.properties
+java -jar Extraction-jar-with-dependencies.jar extraction_busybox.properties

src/main/resources/linux-debug.sh

@@ -10,12 +10,12 @@ echo "Removing old folders"
 rm -rf extraction-results
 
 echo "Packaging jar"
-rm -rf Extraction-1.0.0-jar-with-dependencies.jar
+rm -rf Extraction-jar-with-dependencies.jar
 cd Extraction || exit
 mvn package
-cp target/Extraction-1.0.0-jar-with-dependencies.jar ..
+cp target/Extraction-jar-with-dependencies.jar ..
 cd ..
 clear
 
 echo "Executing ground truth extraction."
-java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_linux.properties db196935d9562abec4510f48d887bc1f1e054fcf
+java -jar Extraction-jar-with-dependencies.jar extraction_linux.properties db196935d9562abec4510f48d887bc1f1e054fcf

src/main/resources/linux-run.sh

@@ -8,4 +8,4 @@
 echo "Removing previous results"
 rm -rf extraction-results
 echo "Executing ground truth extraction for Linux."
-java -jar Extraction-1.0.0-jar-with-dependencies.jar extraction_linux.properties v4.1 v4.2
+java -jar Extraction-jar-with-dependencies.jar extraction_linux.properties v4.1 v4.2