aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2012-09-14 11:32:41 +0200
committerSimon Brandhof <simon.brandhof@gmail.com>2012-09-14 11:36:59 +0200
commit4976f97067d8fff02a3ecef3b0f2a251a82f549a (patch)
tree7df360908f7896032ce29c8c86dffccf1b714e31
parent5f847c13ba7f042419ee9cee1ac6d698c2696264 (diff)
downloadsonarqube-4976f97067d8fff02a3ecef3b0f2a251a82f549a.tar.gz
sonarqube-4976f97067d8fff02a3ecef3b0f2a251a82f549a.zip
Move declaration of sonar-java version to parent pom
-rw-r--r--pom.xml27
-rw-r--r--sonar-application/pom.xml2
2 files changed, 19 insertions, 10 deletions
diff --git a/pom.xml b/pom.xml
index 293fa45f2c1..7f78f4485e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.codehaus.sonar</groupId>
@@ -77,6 +78,7 @@
</prerequisites>
<properties>
+ <sonarJava.version>1.0-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>
@@ -95,7 +97,7 @@
<skipSanityChecks>false</skipSanityChecks>
<!-- default GWT configuration. It's overridden by the profile 'dev' to speed up compilation in dev environments-->
- <gwt.permutationSuffix />
+ <gwt.permutationSuffix/>
<gwt.extraJvmArgs>-Xmx512m -Xss1024k</gwt.extraJvmArgs>
<sonar.snapshotRepository.url>dav:https://dav.codehaus.org/snapshots.repository/sonar</sonar.snapshotRepository.url>
</properties>
@@ -607,7 +609,16 @@
<artifactId>sonar-ws-client</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.codehaus.sonar-plugins.java</groupId>
+ <artifactId>sonar-java-plugin</artifactId>
+ <version>${sonarJava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.sonar-plugins.java</groupId>
+ <artifactId>sonar-squid-java-plugin</artifactId>
+ <version>${sonarJava.version}</version>
+ </dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
@@ -1184,7 +1195,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -1197,7 +1208,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -1210,7 +1221,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -1224,7 +1235,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -1237,7 +1248,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index b7b000e9e8e..4f8085530e9 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -108,7 +108,6 @@
<dependency>
<groupId>org.codehaus.sonar-plugins.java</groupId>
<artifactId>sonar-squid-java-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -150,7 +149,6 @@
<dependency>
<groupId>org.codehaus.sonar-plugins.java</groupId>
<artifactId>sonar-java-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>