From 5b57bb4e680efc7b792dfbd6ffe24038c8871cd5 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 24 Jul 2014 22:26:03 +0200
Subject: [PATCH] SONAR-4898 fix sonar-application-test

---
 server/sonar-search/pom.xml                   |  2 +-
 sonar-application-test/pom.xml                | 31 ++++++-------------
 .../src/test/java/ForkTest.java               | 19 ++++++++++--
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/server/sonar-search/pom.xml b/server/sonar-search/pom.xml
index 60eaffbdebd..4d471e4251f 100644
--- a/server/sonar-search/pom.xml
+++ b/server/sonar-search/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-process</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.elasticsearch</groupId>
diff --git a/sonar-application-test/pom.xml b/sonar-application-test/pom.xml
index 8ca5538c8ee..56adeed447a 100644
--- a/sonar-application-test/pom.xml
+++ b/sonar-application-test/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.sonarsource.it.sonar</groupId>
-    <artifactId>it-sonar</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <groupId>org.codehaus.sonar</groupId>
+    <artifactId>sonar</artifactId>
+    <version>4.5-SNAPSHOT</version>
   </parent>
 
-  <artifactId>tests</artifactId>
-  <name>Sonar :: Integration Tests :: Tests</name>
+  <artifactId>sonar-application-tests</artifactId>
+  <name>Sonar :: Application :: Tests</name>
 
   <properties>
     <sonar.buildVersion>4.5-SNAPSHOT</sonar.buildVersion>
@@ -24,36 +24,23 @@
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-ws-client</artifactId>
       <version>${sonar.buildVersion}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.sonarsource.orchestrator</groupId>
       <artifactId>sonar-orchestrator</artifactId>
       <version>2.15-SNAPSHOT</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.10</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.easytesting</groupId>
       <artifactId>fest-assert</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.skyscreamer</groupId>
-      <artifactId>jsonassert</artifactId>
-      <version>1.2.0</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/sonar-application-test/src/test/java/ForkTest.java b/sonar-application-test/src/test/java/ForkTest.java
index 3352644c42c..7482a745240 100644
--- a/sonar-application-test/src/test/java/ForkTest.java
+++ b/sonar-application-test/src/test/java/ForkTest.java
@@ -1,7 +1,21 @@
 /*
- * Copyright (C) 2009-2014 SonarSource SA
- * All rights reserved
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
  * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.OrchestratorBuilder;
@@ -35,6 +49,7 @@ public class ForkTest {
   @Test
   public void start_and_stop() {
     OrchestratorBuilder builder = Orchestrator.builderEnv();
+    builder.setSonarVersion("4.5-SNAPSHOT");
     builder.addPlugin(MavenLocation.create("com.sonarsource.xoo", "sonar-xoo-plugin", "1.0-SNAPSHOT"));
     orchestrator = builder.build();
     orchestrator.start();
-- 
2.39.5