Skip to content

Commit a68e0a3

Browse files
guwirthguwirth
committed
Merge pull request #841 from guwirth/sonar-api-5.4
sonar-api-5.6-RC2
2 parents d00ee56 + 6266315 commit a68e0a3

File tree

8 files changed

+139
-131
lines changed

8 files changed

+139
-131
lines changed

‎cxx-checks/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<groupId>org.codehaus.sonar-plugins.cxx</groupId>
6+
<groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
77
<artifactId>cxx</artifactId>
88
<version>0.9.6-SNAPSHOT</version>
99
</parent>

‎cxx-lint/pom.xml‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
3-
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>org.codehaus.sonar-plugins.cxx</groupId>
6-
<artifactId>cxx</artifactId>
7-
<version>0.9.6-SNAPSHOT</version>
8-
</parent>
9-
<artifactId>cxx-lint</artifactId>
10-
<name>Cxx :: Lint</name>
11-
<packaging>jar</packaging>
12-
<dependencies>
13-
<dependency>
14-
<groupId>${project.groupId}</groupId>
15-
<artifactId>cxx-checks</artifactId>
16-
<version>${project.version}</version>
17-
</dependency>
18-
<dependency>
19-
<groupId>com.google.code.gson</groupId>
20-
<artifactId>gson</artifactId>
21-
<version>2.4</version>
22-
</dependency>
23-
<dependency>
24-
<groupId>org.codehaus.sonar</groupId>
25-
<artifactId>sonar-check-api</artifactId>
26-
<version>4.5.4</version>
27-
<type>jar</type>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.codehaus.sonar</groupId>
31-
<artifactId>sonar-plugin-api</artifactId>
32-
<version>4.5.4</version>
33-
<type>jar</type>
34-
</dependency>
35-
<dependency>
36-
<groupId>commons-cli</groupId>
37-
<artifactId>commons-cli</artifactId>
38-
<version>1.3.1</version>
39-
<type>jar</type>
40-
</dependency>
41-
<dependency>
42-
<groupId>junit</groupId>
43-
<artifactId>junit</artifactId>
44-
<version>4.12</version>
45-
<scope>test</scope>
46-
</dependency>
47-
<dependency>
48-
<groupId>org.hamcrest</groupId>
49-
<artifactId>hamcrest-core</artifactId>
50-
<version>1.3</version>
51-
<scope>test</scope>
52-
</dependency>
53-
</dependencies>
54-
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
7+
<artifactId>cxx</artifactId>
8+
<version>0.9.6-SNAPSHOT</version>
9+
</parent>
10+
11+
<artifactId>cxx-lint</artifactId>
12+
<name>Cxx :: Lint</name>
13+
14+
<packaging>jar</packaging>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>${project.groupId}</groupId>
19+
<artifactId>cxx-checks</artifactId>
20+
<version>${project.version}</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>com.google.code.gson</groupId>
24+
<artifactId>gson</artifactId>
25+
<version>2.4</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.sonarsource.sonarqube</groupId>
29+
<artifactId>sonar-check-api</artifactId>
30+
<version>5.4</version>
31+
<type>jar</type>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.sonarsource.sonarqube</groupId>
35+
<artifactId>sonar-plugin-api</artifactId>
36+
<type>jar</type>
37+
</dependency>
38+
<dependency>
39+
<groupId>commons-cli</groupId>
40+
<artifactId>commons-cli</artifactId>
41+
<version>1.3.1</version>
42+
<type>jar</type>
43+
</dependency>
44+
<dependency>
45+
<groupId>junit</groupId>
46+
<artifactId>junit</artifactId>
47+
<scope>test</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.hamcrest</groupId>
51+
<artifactId>hamcrest-core</artifactId>
52+
<version>1.3</version>
53+
<scope>test</scope>
54+
</dependency>
55+
</dependencies>
56+
5557
<build>
5658
<plugins>
57-
<plugin>
58-
<artifactId>maven-assembly-plugin</artifactId>
59-
<configuration>
60-
<archive>
61-
<manifest>
59+
<plugin>
60+
<artifactId>maven-assembly-plugin</artifactId>
61+
<configuration>
62+
<archive>
63+
<manifest>
6264
<addClasspath>true</addClasspath>
63-
<mainClass>org.codehaus.sonarplugins.cxx.cxxlint.CxxLint</mainClass>
65+
<mainClass>org.sonarsource.sonarqubeplugins.cxx.cxxlint.CxxLint</mainClass>
6466
<classpathPrefix>lib/</classpathPrefix>
65-
</manifest>
66-
</archive>
67-
<descriptorRefs>
68-
<descriptorRef>jar-with-dependencies</descriptorRef>
69-
70-
</descriptorRefs>
71-
<finalName>cxx-lint-${project.version}</finalName>
72-
<appendAssemblyId>false</appendAssemblyId>
73-
</configuration>
74-
<executions>
75-
<execution>
76-
<id>make-assembly</id> <!-- this is used for inheritance merges -->
77-
<phase>package</phase> <!-- bind to the packaging phase -->
78-
<goals>
79-
<goal>single</goal>
80-
</goals>
81-
</execution>
82-
</executions>
83-
</plugin>
84-
85-
86-
67+
</manifest>
68+
</archive>
69+
<descriptorRefs>
70+
<descriptorRef>jar-with-dependencies</descriptorRef>
71+
</descriptorRefs>
72+
<finalName>cxx-lint-${project.version}</finalName>
73+
<appendAssemblyId>false</appendAssemblyId>
74+
</configuration>
75+
<executions>
76+
<execution>
77+
<id>make-assembly</id>
78+
<!-- this is used for inheritance merges -->
79+
<phase>package</phase>
80+
<!-- bind to the packaging phase -->
81+
<goals>
82+
<goal>single</goal>
83+
</goals>
84+
</execution>
85+
</executions>
86+
</plugin>
8787
</plugins>
8888
</build>
89-
90-
</project>
89+
90+
</project>

‎cxx-squid/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
6-
<groupId>org.codehaus.sonar-plugins.cxx</groupId>
6+
<groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
77
<artifactId>cxx</artifactId>
88
<version>0.9.6-SNAPSHOT</version>
99
</parent>

‎pom.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<version>32</version>
99
</parent>
1010

11-
<groupId>org.codehaus.sonar-plugins.cxx</groupId>
11+
<groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
1212
<artifactId>cxx</artifactId>
1313
<version>0.9.6-SNAPSHOT</version>
1414
<packaging>pom</packaging>
@@ -104,7 +104,7 @@
104104
<name>Chris Bagwell</name>
105105
<email>[email protected]</email>
106106
</developer>
107-
<developer>
107+
<developer>
108108
<id>mjdetullio</id>
109109
<name>Matthew DeTullio</name>
110110
<email></email>
@@ -129,7 +129,7 @@
129129
<modules>
130130
<module>cxx-squid</module>
131131
<module>cxx-checks</module>
132-
<module>cxx-lint</module>
132+
<module>cxx-lint</module>
133133
<module>sonar-cxx-plugin</module>
134134
<module>sslr-cxx-toolkit</module>
135135
</modules>
@@ -154,7 +154,7 @@
154154
<license.owner>SonarOpenCommunity</license.owner>
155155
<license.mailto>http://github.com/SonarOpenCommunity/sonar-cxx</license.mailto>
156156
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
157-
<sonar.version>5.1</sonar.version>
157+
<sonar.version>5.6-RC2</sonar.version>
158158
<sslr.version>1.21</sslr.version>
159159
<sonar.pluginClass>org.sonar.plugins.cxx.CxxPlugin</sonar.pluginClass>
160160
<sonar.artifact.path>target/${project.artifactId}-${project.version}.jar</sonar.artifact.path>
@@ -167,21 +167,21 @@
167167
<dependencyManagement>
168168
<dependencies>
169169
<dependency>
170-
<groupId>org.codehaus.sonar</groupId>
170+
<groupId>org.sonarsource.sonarqube</groupId>
171171
<artifactId>sonar-plugin-api</artifactId>
172172
<version>${sonar.version}</version>
173173
</dependency>
174174
<dependency>
175-
<groupId>org.codehaus.sonar</groupId>
175+
<groupId>org.sonarsource.sonarqube</groupId>
176176
<artifactId>sonar-deprecated</artifactId>
177177
<version>${sonar.version}</version>
178-
</dependency>
178+
</dependency>
179179
<dependency>
180-
<groupId>org.codehaus.sonar</groupId>
180+
<groupId>org.sonarsource.sonarqube</groupId>
181181
<artifactId>sonar-testing-harness</artifactId>
182182
<version>${sonar.version}</version>
183183
</dependency>
184-
184+
185185
<dependency>
186186
<groupId>org.sonarsource.sslr</groupId>
187187
<artifactId>sslr-core</artifactId>
@@ -204,7 +204,7 @@
204204
</exclusions>
205205
</dependency>
206206

207-
<dependency>
207+
<dependency>
208208
<groupId>junit</groupId>
209209
<artifactId>junit</artifactId>
210210
<version>4.12</version>
@@ -214,12 +214,12 @@
214214
<artifactId>fest-assert</artifactId>
215215
<version>1.4</version>
216216
</dependency>
217-
<dependency>
217+
<dependency>
218218
<groupId>org.mockito</groupId>
219219
<artifactId>mockito-all</artifactId>
220220
<version>1.10.16</version>
221221
</dependency>
222-
<dependency>
222+
<dependency>
223223
<groupId>ch.qos.logback</groupId>
224224
<artifactId>logback-classic</artifactId>
225225
<version>1.0.13</version>
@@ -234,7 +234,7 @@
234234
<artifactId>slf4j-api</artifactId>
235235
<version>1.6.2</version>
236236
</dependency>
237-
237+
238238
<dependency>
239239
<groupId>org.apache.ant</groupId>
240240
<artifactId>ant</artifactId>
@@ -246,9 +246,9 @@
246246
<version>1.0</version>
247247
</dependency>
248248
<dependency>
249-
<groupId>org.codehaus.sonar.dotnet.tests</groupId>
250-
<artifactId>sonar-dotnet-tests-library</artifactId>
251-
<version>1.2</version>
249+
<groupId>org.sonarsource.dotnet</groupId>
250+
<artifactId>sonar-dotnet-tests-library</artifactId>
251+
<version>1.3.2</version>
252252
</dependency>
253253
<dependency>
254254
<groupId>org.hamcrest</groupId>

0 commit comments

Comments
 (0)