SONAR-3945 fix dependency on sonar-gwt-api 3.3.1

diff --git a/plugins/sonar-core-gwt/pom.xml b/plugins/sonar-core-gwt/pom.xml
index f308077ebbbec1fb364757af3eaa6fb93b6ca70f..6be5d4b518602ab7873401adb9904936db60985e 100644 (file)
--- a/plugins/sonar-core-gwt/pom.xml
+++ b/plugins/sonar-core-gwt/pom.xml
@@ -20,6 +20,13 @@
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-gwt-api</artifactId>
+      <version>3.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.sonar</groupId>
+      <artifactId>sonar-ws-client</artifactId>
+      <version>3.3.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/plugins/sonar-core-plugin/pom.xml b/plugins/sonar-core-plugin/pom.xml
index f3d57cfbb003d16b1ab156fbb2c68f3e11a20293..1354caef1978bcf1ced2b53e156dd88425cc8ee2 100644 (file)
--- a/plugins/sonar-core-plugin/pom.xml
+++ b/plugins/sonar-core-plugin/pom.xml
@@ -58,10 +58,17 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- only for animal-sniffer (see profile check-java-api -->
+    <!-- Required for animal-sniffer -->
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-gwt-api</artifactId>
+      <version>3.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.sonar</groupId>
+      <artifactId>sonar-ws-client</artifactId>
+      <version>3.3.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/plugins/sonar-design-plugin/pom.xml b/plugins/sonar-design-plugin/pom.xml
index bbdab14c1e5a469a9d906d6df01edbcb2e667556..eb98293e7a8deda2aab4b80120f761f3d4fa2374 100644 (file)
--- a/plugins/sonar-design-plugin/pom.xml
+++ b/plugins/sonar-design-plugin/pom.xml
@@ -31,6 +31,13 @@
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-gwt-api</artifactId>
+      <version>3.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.sonar</groupId>
+      <artifactId>sonar-ws-client</artifactId>
+      <version>3.3.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
index 0a31b81cb0411c4eb3b843b3099fcf3b23c586ed..510cbe9f06f73a1b1db0b92af405b5ec5327088e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,6 @@
     <module>sonar-deprecated</module>
     <module>sonar-duplications</module>
     <module>sonar-graph</module>
-    <module>sonar-gwt-api</module>
     <module>sonar-java-api</module>
     <module>sonar-markdown</module>
     <module>sonar-maven-plugin</module>
@@ -76,7 +75,7 @@
     <sonarJava.version>1.1-SNAPSHOT</sonarJava.version>
     <h2.version>1.3.167</h2.version>
     <jetty.version>6.1.25</jetty.version>
-    <sonar.skippedModules>sonar-gwt-api,sonar-core-gwt</sonar.skippedModules>
+    <sonar.skippedModules>sonar-core-gwt</sonar.skippedModules>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.min.version>2.2.1</maven.min.version>
     <jdk.min.version>1.5</jdk.min.version>
@@ -564,11 +563,6 @@
         <artifactId>sonar-graph</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.codehaus.sonar</groupId>
-        <artifactId>sonar-gwt-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.codehaus.sonar</groupId>
         <artifactId>sonar-java-api</artifactId>

diff --git a/sonar-gwt-api/pom.xml b/sonar-gwt-api/pom.xml
index 988c2b136bb6dd3ca29917250b5799ffe836ca4c..6ab6915c654110ce4d230e390d0c37f84d7a3a03 100644 (file)
--- a/sonar-gwt-api/pom.xml
+++ b/sonar-gwt-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.codehaus.sonar</groupId>
     <artifactId>sonar</artifactId>
-    <version>3.4-SNAPSHOT</version>
+    <version>3.4-M1</version>
   </parent>
   <artifactId>sonar-gwt-api</artifactId>
   <packaging>jar</packaging>