From fe8f614af2db48504107b9c0fc63fd0e4a26763a Mon Sep 17 00:00:00 2001
From: Michael Gumowski <michael.gumowski@sonarsource.com>
Date: Thu, 27 Aug 2015 15:39:38 +0200
Subject: [PATCH] SONARFBUGS-37 Remove devVersion in ITs

---
 .gitignore                                           |  3 +++
 .../com/sonar/it/java/suite/FindbugsTestSuite.java   |  2 +-
 .../java/org/sonar/java/it/FindbugsRulingTest.java   |  2 +-
 pom.xml                                              |  1 +
 travis.sh                                            | 12 ++++++------
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index e247ec09..a87358ce 100644
--- 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/java/suite/FindbugsTestSuite.java b/its/plugin/src/test/java/com/sonar/it/java/suite/FindbugsTestSuite.java
index db29ddb6..3dbc0f56 100644
--- a/its/plugin/src/test/java/com/sonar/it/java/suite/FindbugsTestSuite.java
+++ b/its/plugin/src/test/java/com/sonar/it/java/suite/FindbugsTestSuite.java
@@ -38,7 +38,7 @@ public class FindbugsTestSuite {
 
   static {
     OrchestratorBuilder orchestratorBuilder = Orchestrator.builderEnv()
-      .addPlugin("findbugs")
+      .addPlugin(FileLocation.of("../../target/sonar-findbugs-plugin.jar"))
       .addPlugin("java")
       .setMainPluginKey("findbugs")
       .restoreProfileAtStartup(FileLocation.ofClasspath("/com/sonar/it/java/FindbugsTest/findbugs-backup.xml"))
diff --git a/its/ruling/src/test/java/org/sonar/java/it/FindbugsRulingTest.java b/its/ruling/src/test/java/org/sonar/java/it/FindbugsRulingTest.java
index 98683a41..3b31fef2 100644
--- a/its/ruling/src/test/java/org/sonar/java/it/FindbugsRulingTest.java
+++ b/its/ruling/src/test/java/org/sonar/java/it/FindbugsRulingTest.java
@@ -23,7 +23,7 @@ public class FindbugsRulingTest {
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
     .addPlugin("java")
-    .addPlugin("findbugs")
+    .addPlugin(FileLocation.of("../../target/sonar-findbugs-plugin.jar"))
     .setMainPluginKey("findbugs")
     .addPlugin(MavenLocation.create("org.sonarsource.sonar-lits-plugin", "sonar-lits-plugin", "0.5-SNAPSHOT"))
     .restoreProfileAtStartup(FileLocation.of("src/test/resources/profile-findbugs.xml"))
diff --git a/pom.xml b/pom.xml
index efbc8f53..9df511e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,6 +220,7 @@
   </dependencies>
 
   <build>
+    <finalName>${project.artifactId}</finalName>
     <resources>
       <resource>
         <directory>src/main/resources</directory>
diff --git a/travis.sh b/travis.sh
index c12b5db3..95954347 100755
--- a/travis.sh
+++ b/travis.sh
@@ -17,34 +17,34 @@ 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 -DfindbugsVersion="DEV" -DjavaVersion="LATEST_RELEASE" -Dsonar.runtimeVersion="DEV" -Dmaven.test.redirectTestOutputToFile=false install
+  mvn -DjavaVersion="LATEST_RELEASE" -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 -DfindbugsVersion="DEV" -DjavaVersion="LATEST_RELEASE" -Dsonar.runtimeVersion="LTS_OR_OLDEST_COMPATIBLE" -Dmaven.test.redirectTestOutputToFile=false install
+  mvn -DjavaVersion="LATEST_RELEASE" -Dsonar.runtimeVersion="LTS" -Dmaven.test.redirectTestOutputToFile=false install
   ;;
 
 RULING)
   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/sonar-lits"
 
   export SONAR_IT_SOURCES=$(pwd)/its/sources
 
   cd its/ruling
-  mvn clean install -Dmaven.test.redirectTestOutputToFile=false -DjavaVersion="LATEST_RELEASE" -DfindbugsVersion="DEV" -Dsonar.runtimeVersion=5.1.1
+  mvn clean install -Dmaven.test.redirectTestOutputToFile=false -DjavaVersion="LATEST_RELEASE" -Dsonar.runtimeVersion=5.1.1
   ;;
 
 esac