aboutsummaryrefslogtreecommitdiffstats
path: root/subprojects
diff options
context:
space:
mode:
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/sonar-update-center/sonar-packaging-maven-plugin/pom.xml3
-rw-r--r--subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/basic/pom.xml2
-rw-r--r--subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/doNotAddMavenDescriptor/pom.xml2
-rw-r--r--subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/doNotPackageDepsProvidedBySonar/pom.xml2
-rw-r--r--subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/packageDependencies/pom.xml2
-rw-r--r--subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/pluginClassNotDefined/pom.xml2
-rw-r--r--subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/pluginClassNotFound/pom.xml2
-rw-r--r--subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/sonarPluginApiNotFound/pom.xml2
8 files changed, 10 insertions, 7 deletions
diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/pom.xml b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/pom.xml
index 05a30c9925d..f7657fd427a 100644
--- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/pom.xml
+++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/pom.xml
@@ -112,6 +112,9 @@
<goal>install</goal>
</goals>
<settingsFile>src/it/settings.xml</settingsFile>
+ <filterProperties>
+ <sonar.version>2.2</sonar.version>
+ </filterProperties>
<!--<debug>true</debug>-->
</configuration>
<executions>
diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/basic/pom.xml b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/basic/pom.xml
index 5d84396b8d8..6de43833c2a 100644
--- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/basic/pom.xml
+++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/basic/pom.xml
@@ -17,7 +17,7 @@
</organization>
<properties>
- <sonar.version>2.1</sonar.version>
+ <sonar.version>@sonar.version@</sonar.version>
<!-- sonar.pluginKey = project.artifactId by default -->
<sonar.pluginKey>test</sonar.pluginKey>
diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/doNotAddMavenDescriptor/pom.xml b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/doNotAddMavenDescriptor/pom.xml
index b81734eab6c..85b4cc9e2a0 100644
--- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/doNotAddMavenDescriptor/pom.xml
+++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/doNotAddMavenDescriptor/pom.xml
@@ -11,7 +11,7 @@
<name>Do Not Add Maven Description</name>
<properties>
- <sonar.version>2.1</sonar.version>
+ <sonar.version>@sonar.version@</sonar.version>
<sonar.pluginKey>test</sonar.pluginKey>
<sonar.pluginClass>org.sonar.plugins.sample.SamplePlugin</sonar.pluginClass>
</properties>
diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/doNotPackageDepsProvidedBySonar/pom.xml b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/doNotPackageDepsProvidedBySonar/pom.xml
index f794a50f99e..d5bc5d26660 100644
--- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/doNotPackageDepsProvidedBySonar/pom.xml
+++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/doNotPackageDepsProvidedBySonar/pom.xml
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-plugin-api</artifactId>
- <version>2.1</version>
+ <version>@sonar.version@</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/packageDependencies/pom.xml b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/packageDependencies/pom.xml
index 2c7c1af0bd7..58577712ce8 100644
--- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/packageDependencies/pom.xml
+++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/packageDependencies/pom.xml
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-plugin-api</artifactId>
- <version>1.12</version>
+ <version>@sonar.version@</version>
</dependency>
<!-- Should be included into jar -->
diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/pluginClassNotDefined/pom.xml b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/pluginClassNotDefined/pom.xml
index 58915369b4b..c2cdd2de188 100644
--- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/pluginClassNotDefined/pom.xml
+++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/pluginClassNotDefined/pom.xml
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-plugin-api</artifactId>
- <version>1.12</version>
+ <version>@sonar.version@</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/pluginClassNotFound/pom.xml b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/pluginClassNotFound/pom.xml
index 31d3b0efa2c..7f8bcbdc85a 100644
--- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/pluginClassNotFound/pom.xml
+++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/pluginClassNotFound/pom.xml
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-plugin-api</artifactId>
- <version>1.12</version>
+ <version>@sonar.version@</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/sonarPluginApiNotFound/pom.xml b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/sonarPluginApiNotFound/pom.xml
index 9b4704a142a..344847b58bf 100644
--- a/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/sonarPluginApiNotFound/pom.xml
+++ b/subprojects/sonar-update-center/sonar-packaging-maven-plugin/src/it/sonarPluginApiNotFound/pom.xml
@@ -15,7 +15,7 @@
<dependency>
<groupId>org.codehaus.sonar</groupId>
<artifactId>sonar-plugin-api</artifactId>
- <version>1.12</version>
+ <version>@sonar.version@</version>
</dependency>
-->
</dependencies>