Merge pull request #134 from VariantSync/jpp-parsing

feat: generic parsing interface and parsing of JavaPP annotations

Author: pmbittner

README.md

@@ -50,11 +50,11 @@ To add DiffDetective as a dependency to your own project, add the following snip
 <dependency>
     <groupId>org.variantsync</groupId>
     <artifactId>DiffDetective</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
 </dependency>
 ```
 
-If you prefer to just use a jar file, you can find a jar file with all dependencies at `DiffDetective/target/diffdetective-2.1.0-jar-with-dependencies.jar` (again, the version number might be different).
+If you prefer to just use a jar file, you can find a jar file with all dependencies at `DiffDetective/target/diffdetective-2.2.0-jar-with-dependencies.jar` (again, the version number might be different).
 You can (re-)produce this jar file by either running `mvn package` or `mvn install` within you local clone of DiffDetective.
 
 > Disclaimer: Setup tested with maven version 3.6.3.

default.nix

@@ -12,7 +12,7 @@
 }:
 pkgs.stdenv.mkDerivation rec {
   pname = "DiffDetective";
-  version = "2.1.0";
+  version = "2.2.0";
   src = with pkgs.lib.fileset;
     toSource {
       root = ./.;

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.variantsync</groupId>
     <artifactId>diffdetective</artifactId>
-    <version>2.1.0</version>
+    <version>2.2.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -99,16 +99,16 @@
             <groupId>org.sat4j</groupId>
             <artifactId>core</artifactId>
             <version>2.3.5</version>
-<!--            <scope>system</scope>-->
-<!--            <systemPath>${project.basedir}/lib/org.sat4j.core.jar</systemPath>-->
+            <!--            <scope>system</scope>-->
+            <!--            <systemPath>${project.basedir}/lib/org.sat4j.core.jar</systemPath>-->
         </dependency>
 
         <dependency>
             <groupId>de.ovgu</groupId>
             <artifactId>featureide.lib.fm</artifactId>
             <version>3.8.1</version>
-<!--            <scope>system</scope>-->
-<!--            <systemPath>${project.basedir}/lib/de.ovgu.featureide.lib.fm-v3.8.1.jar</systemPath>-->
+            <!--            <scope>system</scope>-->
+            <!--            <systemPath>${project.basedir}/lib/de.ovgu.featureide.lib.fm-v3.8.1.jar</systemPath>-->
         </dependency>
 
         <dependency>

replication/esecfse22/Dockerfile

@@ -32,7 +32,7 @@ WORKDIR /home/sherlock
 # Copy the compiled JAR file from the first stage into the second stage
 # Syntax: COPY --from=STAGE_ID SOURCE_PATH TARGET_PATH
 WORKDIR /home/sherlock/holmes
-COPY --from=0 /home/user/target/diffdetective-2.1.0-jar-with-dependencies.jar ./DiffDetective.jar
+COPY --from=0 /home/user/target/diffdetective-2.2.0-jar-with-dependencies.jar ./DiffDetective.jar
 WORKDIR /home/sherlock
 RUN mkdir results
 

replication/splc23-views/Dockerfile

@@ -38,7 +38,7 @@ WORKDIR /home/sherlock
 # Copy the compiled JAR file from the first stage into the second stage
 # Syntax: COPY --from=STAGE_ID SOURCE_PATH TARGET_PATH
 WORKDIR /home/sherlock/holmes
-COPY --from=0 /home/user/target/diffdetective-2.1.0-jar-with-dependencies.jar ./DiffDetective.jar
+COPY --from=0 /home/user/target/diffdetective-2.2.0-jar-with-dependencies.jar ./DiffDetective.jar
 WORKDIR /home/sherlock
 
 # Copy the setup

scripts/genUltimateResults.sh

@@ -1,4 +1,4 @@
 resultsdir=$1
 
-java -cp "target/diffdetective-2.1.0-jar-with-dependencies.jar" org.variantsync.diffdetective.tablegen.MiningResultAccumulator $resultsdir $resultsdir
+java -cp "target/diffdetective-2.2.0-jar-with-dependencies.jar" org.variantsync.diffdetective.tablegen.MiningResultAccumulator $resultsdir $resultsdir
 echo "genUltimateResults.sh DONE"

scripts/runValidation.sh

@@ -1,2 +1,2 @@
-java -cp "target/diffdetective-2.1.0-jar-with-dependencies.jar" org.variantsync.diffdetective.validation.EditClassValidation
+java -cp "target/diffdetective-2.2.0-jar-with-dependencies.jar" org.variantsync.diffdetective.validation.EditClassValidation
 echo "runValidation.sh DONE"

scripts/runViewFeasibilityStudy.sh

@@ -1,2 +1,2 @@
-java -cp "target/diffdetective-2.1.0-jar-with-dependencies.jar" org.variantsync.diffdetective.experiments.views.Main "docs/datasets/views.md"
+java -cp "target/diffdetective-2.2.0-jar-with-dependencies.jar" org.variantsync.diffdetective.experiments.views.Main "docs/datasets/views.md"
 echo "runValidation.sh DONE"