refactor: no duplication of config information

eclipse · Apr 12, 2019 · 2203e66 · 2203e66
1 parent c37ddce
commit 2203e66
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.travis/travis-maven-repair.sh b/.travis/travis-maven-repair.sh
@@ -5,6 +5,8 @@ set -e
 
 cd ./maven-repair
 
-mvn test
+NPEFIX_VERSION=`python3 -c 'import xml.etree.ElementTree; print(xml.etree.ElementTree.parse("pom.xml").findall("//mvn:dependency[mvn:artifactId=\"npefix\"]/mvn:version",{"mvn":"http://maven.apache.org/POM/4.0.0"})[0].text)'`
+
+mvn test -DNPEFIX_VERSION=$NPEFIX_VERSION
 
 cd ..
diff --git a/maven-repair/src/main/java/com/github/tdurieux/repair/maven/plugin/NPEFixMojo.java b/maven-repair/src/main/java/com/github/tdurieux/repair/maven/plugin/NPEFixMojo.java
@@ -271,7 +271,7 @@ private String classpath(List<URL> dependencies) {
             URL s = dependencies.get(i);
             sb.append(s.getPath()).append(File.pathSeparatorChar);
         }
-        final Artifact artifact =artifactFactory.createArtifact("fr.inria.gforge.spirals","npefix",  "0.7", null, "jar");
+        final Artifact artifact =artifactFactory.createArtifact("fr.inria.gforge.spirals","npefix",  System.getProperty("NPEFIX_VERSION"), null, "jar");
         File file = new File(localRepository.getBasedir() + "/" + localRepository.pathOf(artifact));
 
         sb.append(file.getAbsoluteFile());

diff --git a/maven-repair/src/main/java/com/github/tdurieux/repair/maven/plugin/NPEFixSafeMojo.java b/maven-repair/src/main/java/com/github/tdurieux/repair/maven/plugin/NPEFixSafeMojo.java
@@ -249,7 +249,7 @@ private String classpath(List<URL> dependencies) {
             URL s = dependencies.get(i);
             sb.append(s.getPath()).append(File.pathSeparatorChar);
         }
-        final Artifact artifact =artifactFactory.createArtifact("fr.inria.gforge.spirals","npefix", "0.7", null, "jar");
+        final Artifact artifact =artifactFactory.createArtifact("fr.inria.gforge.spirals","npefix", System.getProperty("NPEFIX_VERSION"), null, "jar");
         File file = new File(localRepository.getBasedir() + "/" + localRepository.pathOf(artifact));
 
         sb.append(file.getAbsoluteFile());