aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2012-11-12 10:15:08 +0100
committerSimon Brandhof <simon.brandhof@gmail.com>2012-11-12 10:15:08 +0100
commit65a36f7842e6e4248c874b0b2e5f2bdae5ef865f (patch)
treef5e787c25d0106b26f66a77543c3419409971938
parentfec91dbfd31b9535146cef1e1d47bb4601e43cf5 (diff)
downloadsonarqube-65a36f7842e6e4248c874b0b2e5f2bdae5ef865f.tar.gz
sonarqube-65a36f7842e6e4248c874b0b2e5f2bdae5ef865f.zip
SONAR-3945 fix dependency on sonar-gwt-api 3.3.1
-rw-r--r--plugins/sonar-core-gwt/pom.xml7
-rw-r--r--plugins/sonar-core-plugin/pom.xml9
-rw-r--r--plugins/sonar-design-plugin/pom.xml7
-rw-r--r--pom.xml8
-rw-r--r--sonar-gwt-api/pom.xml2
5 files changed, 24 insertions, 9 deletions
diff --git a/plugins/sonar-core-gwt/pom.xml b/plugins/sonar-core-gwt/pom.xml
index f308077ebbb..6be5d4b5186 100644
--- 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 f3d57cfbb00..1354caef197 100644
--- 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 bbdab14c1e5..eb98293e7a8 100644
--- 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 0a31b81cb04..510cbe9f06f 100644
--- 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>
@@ -566,11 +565,6 @@
</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>
<version>${project.version}</version>
</dependency>
diff --git a/sonar-gwt-api/pom.xml b/sonar-gwt-api/pom.xml
index 988c2b136bb..6ab6915c654 100644
--- 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>