diff options
Diffstat (limited to 'server/sonar-server')
9 files changed, 43 insertions, 44 deletions
diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml index ec53f2d96d1..32e13c87fc1 100644 --- a/server/sonar-server/pom.xml +++ b/server/sonar-server/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.codehaus.sonar</groupId> + <groupId>org.sonarsource.sonarqube</groupId> <artifactId>server</artifactId> <version>5.2-SNAPSHOT</version> <relativePath>..</relativePath> @@ -61,35 +61,34 @@ <artifactId>h2</artifactId> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar-channel</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.sonar</groupId> - <artifactId>sonar-colorizer</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-core</artifactId> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-db</artifactId> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-batch-protocol</artifactId> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-home</artifactId> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-markdown</artifactId> + <exclusions> + <exclusion> + <!-- already shaded with sonar-plugin-api --> + <groupId>org.codehaus.sonar</groupId> + <artifactId>sonar-channel</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-process</artifactId> <version>${project.version}</version> </dependency> @@ -98,7 +97,7 @@ <artifactId>sonar-update-center-common</artifactId> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-plugin-api</artifactId> <version>${project.version}</version> <exclusions> @@ -184,19 +183,19 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-views-bridge</artifactId> </dependency> <!-- unit tests --> <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-db</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-testing-harness</artifactId> <scope>test</scope> </dependency> @@ -221,7 +220,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.codehaus.sonar</groupId> + <groupId>${project.groupId}</groupId> <artifactId>sonar-search</artifactId> <version>${project.version}</version> <scope>test</scope> diff --git a/server/sonar-server/src/test/projects/pom.xml b/server/sonar-server/src/test/projects/pom.xml index f244768228e..2ae2bb8b9ec 100644 --- a/server/sonar-server/src/test/projects/pom.xml +++ b/server/sonar-server/src/test/projects/pom.xml @@ -2,7 +2,7 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.codehaus.sonar.tests</groupId> + <groupId>org.sonarsource.sonarqube.tests</groupId> <artifactId>parent</artifactId> <version>0.1-SNAPSHOT</version> <packaging>pom</packaging> diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml b/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml index 21f7ed5558d..982be1c0170 100644 --- a/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml +++ b/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml @@ -2,7 +2,7 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.codehaus.sonar.tests</groupId> + <groupId>org.sonarsource.sonarqube.tests</groupId> <artifactId>test-base-plugin</artifactId> <version>0.2-SNAPSHOT</version> <packaging>sonar-plugin</packaging> @@ -21,9 +21,9 @@ <sourceDirectory>src</sourceDirectory> <plugins> <plugin> - <groupId>org.codehaus.sonar</groupId> + <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId> <artifactId>sonar-packaging-maven-plugin</artifactId> - <version>1.13</version> + <version>1.15</version> <extensions>true</extensions> <configuration> <pluginKey>testbase</pluginKey> diff --git a/server/sonar-server/src/test/projects/test-base-plugin/pom.xml b/server/sonar-server/src/test/projects/test-base-plugin/pom.xml index 61b994c4754..c4e95936e74 100644 --- a/server/sonar-server/src/test/projects/test-base-plugin/pom.xml +++ b/server/sonar-server/src/test/projects/test-base-plugin/pom.xml @@ -2,7 +2,7 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.codehaus.sonar.tests</groupId> + <groupId>org.sonarsource.sonarqube.tests</groupId> <artifactId>test-base-plugin</artifactId> <version>0.1-SNAPSHOT</version> <packaging>sonar-plugin</packaging> @@ -21,9 +21,9 @@ <sourceDirectory>src</sourceDirectory> <plugins> <plugin> - <groupId>org.codehaus.sonar</groupId> + <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId> <artifactId>sonar-packaging-maven-plugin</artifactId> - <version>1.13</version> + <version>1.15</version> <extensions>true</extensions> <configuration> <pluginKey>testbase</pluginKey> diff --git a/server/sonar-server/src/test/projects/test-core-plugin/pom.xml b/server/sonar-server/src/test/projects/test-core-plugin/pom.xml index fc3f082f6ec..d3e86d6cf95 100644 --- a/server/sonar-server/src/test/projects/test-core-plugin/pom.xml +++ b/server/sonar-server/src/test/projects/test-core-plugin/pom.xml @@ -2,7 +2,7 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.codehaus.sonar.tests</groupId> + <groupId>org.sonarsource.sonarqube.tests</groupId> <artifactId>test-core-plugin</artifactId> <version>0.1-SNAPSHOT</version> <packaging>sonar-plugin</packaging> @@ -21,9 +21,9 @@ <sourceDirectory>src</sourceDirectory> <plugins> <plugin> - <groupId>org.codehaus.sonar</groupId> + <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId> <artifactId>sonar-packaging-maven-plugin</artifactId> - <version>1.13</version> + <version>1.15</version> <extensions>true</extensions> <configuration> <pluginKey>core</pluginKey> diff --git a/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml b/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml index 9b20de15a6a..e23667e6318 100644 --- a/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml +++ b/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml @@ -2,7 +2,7 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.codehaus.sonar.tests</groupId> + <groupId>org.sonarsource.sonarqube.tests</groupId> <artifactId>test-extend-plugin</artifactId> <version>0.1-SNAPSHOT</version> <packaging>sonar-plugin</packaging> @@ -21,9 +21,9 @@ <sourceDirectory>src</sourceDirectory> <plugins> <plugin> - <groupId>org.codehaus.sonar</groupId> + <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId> <artifactId>sonar-packaging-maven-plugin</artifactId> - <version>1.13</version> + <version>1.15</version> <extensions>true</extensions> <configuration> <pluginKey>testextend</pluginKey> diff --git a/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml b/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml index e7d242135db..2d49cca2cf2 100644 --- a/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml +++ b/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml @@ -2,7 +2,7 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.codehaus.sonar.tests</groupId> + <groupId>org.sonarsource.sonarqube.tests</groupId> <artifactId>test-libs-plugin</artifactId> <version>0.1-SNAPSHOT</version> <packaging>sonar-plugin</packaging> @@ -34,9 +34,9 @@ <sourceDirectory>src</sourceDirectory> <plugins> <plugin> - <groupId>org.codehaus.sonar</groupId> + <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId> <artifactId>sonar-packaging-maven-plugin</artifactId> - <version>1.13</version> + <version>1.15</version> <extensions>true</extensions> <configuration> <pluginKey>testlibs</pluginKey> diff --git a/server/sonar-server/src/test/projects/test-require-plugin/pom.xml b/server/sonar-server/src/test/projects/test-require-plugin/pom.xml index 2c45fb3afb0..62462ffbf34 100644 --- a/server/sonar-server/src/test/projects/test-require-plugin/pom.xml +++ b/server/sonar-server/src/test/projects/test-require-plugin/pom.xml @@ -2,7 +2,7 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.codehaus.sonar.tests</groupId> + <groupId>org.sonarsource.sonarqube.tests</groupId> <artifactId>test-require-plugin</artifactId> <version>0.1-SNAPSHOT</version> <packaging>sonar-plugin</packaging> @@ -17,7 +17,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.sonar.tests</groupId> + <groupId>org.sonarsource.sonarqube.tests</groupId> <artifactId>test-base-plugin</artifactId> <version>0.1-SNAPSHOT</version> <type>sonar-plugin</type> @@ -28,9 +28,9 @@ <sourceDirectory>src</sourceDirectory> <plugins> <plugin> - <groupId>org.codehaus.sonar</groupId> + <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId> <artifactId>sonar-packaging-maven-plugin</artifactId> - <version>1.13</version> + <version>1.15</version> <extensions>true</extensions> <configuration> <pluginKey>testrequire</pluginKey> diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml b/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml index 58aee047206..044cd94e8f0 100644 --- a/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml +++ b/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml @@ -2,7 +2,7 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.codehaus.sonar.tests</groupId> + <groupId>org.sonarsource.sonarqube.tests</groupId> <artifactId>test-requirenew-plugin</artifactId> <version>0.1-SNAPSHOT</version> <packaging>sonar-plugin</packaging> @@ -17,7 +17,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.sonar.tests</groupId> + <groupId>org.sonarsource.sonarqube.tests</groupId> <artifactId>test-base-plugin</artifactId> <version>0.1-SNAPSHOT</version> <type>sonar-plugin</type> @@ -28,9 +28,9 @@ <sourceDirectory>src</sourceDirectory> <plugins> <plugin> - <groupId>org.codehaus.sonar</groupId> + <groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId> <artifactId>sonar-packaging-maven-plugin</artifactId> - <version>1.13</version> + <version>1.15</version> <extensions>true</extensions> <configuration> <pluginKey>testrequire</pluginKey> |