ITs: Do not rely on UC for Erlang DEV

SonarQubeCommunity · Aug 14, 2015 · 7152a56 · 7152a56
1 parent 865ad36
commit 7152a56
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
 # Maven
 target/
 
+# SonarQube
+.sonar/
+
 # IntelliJ IDEA
 *.iws
 *.iml

diff --git a/its/plugin/src/test/java/com/sonar/it/erlang/ErlangTestSuite.java b/its/plugin/src/test/java/com/sonar/it/erlang/ErlangTestSuite.java
@@ -43,8 +43,7 @@ public class ErlangTestSuite {
   private static Orchestrator initOrchestrator() {
     OrchestratorBuilder builder = Orchestrator.builderEnv();
     builder
-      .addPlugin(PLUGIN_KEY)
-      .setMainPluginKey(PLUGIN_KEY)
+      .addPlugin(FileLocation.of("../../sonar-erlang-plugin/target/sonar-erlang-plugin.jar"))
       .restoreProfileAtStartup(FileLocation.ofClasspath("/com/sonar/it/erlang/issue-profile.xml"))
       .restoreProfileAtStartup(FileLocation.ofClasspath("/com/sonar/it/erlang/empty-profile.xml"));
 

diff --git a/sonar-erlang-plugin/pom.xml b/sonar-erlang-plugin/pom.xml
@@ -72,6 +72,7 @@
   </dependencies>
 
   <build>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/travis.sh b/travis.sh
@@ -17,21 +17,21 @@ CI)
 IT-DEV)
   installTravisTools
 
-  mvn install -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true
+  mvn package -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true
 
   build_snapshot "SonarSource/sonarqube"
 
   cd its/plugin
-  mvn -DerlangVersion="DEV" -Dsonar.runtimeVersion="DEV" -Dmaven.test.redirectTestOutputToFile=false install
+  mvn -Dsonar.runtimeVersion="DEV" -Dmaven.test.redirectTestOutputToFile=false install
   ;;
 
 IT-LTS)
   installTravisTools
 
-  mvn install -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true
+  mvn package -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true
 
   cd its/plugin
-  mvn -DerlangVersion="DEV" -Dsonar.runtimeVersion="LTS_OR_OLDEST_COMPATIBLE" -Dmaven.test.redirectTestOutputToFile=false install
+  mvn -Dsonar.runtimeVersion="LTS" -Dmaven.test.redirectTestOutputToFile=false install
   ;;
 
 esac