update dependency to npefix

eclipse · Apr 11, 2019 · c37ddce · c37ddce
1 parent 57d630c
commit c37ddce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.travis/travis-deploy.sh b/.travis/travis-deploy.sh
@@ -7,6 +7,10 @@ if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then
 
     # pushing snapshot to https://oss.sonatype.org/content/repositories/snapshots/fr/inria/repairnator/
     mvn deploy -DskipTests
+
+    exit
+
+    # deploy to Dockerhub
     echo "$DOCKER_PASSWORD" | docker login -u repairnator --password-stdin
     if [ "$TRAVIS_TAG" = "$TRAVIS_BRANCH" ]; then
         TAG=$TRAVIS_TAG

diff --git a/maven-repair/pom.xml b/maven-repair/pom.xml
@@ -99,7 +99,7 @@
             <version>0.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>fr.inria.spirals</groupId>
+            <groupId>fr.inria.gforge.spirals</groupId>
             <artifactId>npefix</artifactId>
             <version>0.7</version>
             <exclusions>

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
@@ -58,7 +58,6 @@
         requiresDependencyResolution = ResolutionScope.TEST)
 public class NPEFixMojo extends AbstractRepairMojo {
 
-    private static String HARDCODED_NPEFIX_VERSION = "0.7";
     /**
      * Location of the file.
      */
@@ -272,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.spirals","npefix", HARDCODED_NPEFIX_VERSION, null, "jar");
+        final Artifact artifact =artifactFactory.createArtifact("fr.inria.gforge.spirals","npefix",  "0.7", 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
@@ -59,10 +59,6 @@
         requiresDependencyResolution = ResolutionScope.TEST)
 public class NPEFixSafeMojo extends AbstractRepairMojo {
 
-    // taking the NpeFix version from Thomas' own Maven Repo
-    // https://github.com/tdurieux/maven-repository/tree/master/releases/fr/inria/spirals/npefix (release)
-    // https://github.com/tdurieux/maven-repository/tree/master/snapshots/fr/inria/spirals/npefix (snapshot)
-    private static String HARDCODED_NPEFIX_VERSION = "0.8-SNAPSHOT";
     /**
      * Location of the file.
      */
@@ -253,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.spirals","npefix", HARDCODED_NPEFIX_VERSION, null, "jar");
+        final Artifact artifact =artifactFactory.createArtifact("fr.inria.gforge.spirals","npefix", "0.7", null, "jar");
         File file = new File(localRepository.getBasedir() + "/" + localRepository.pathOf(artifact));
 
         sb.append(file.getAbsoluteFile());