Skip to content

Commit cf319c6

Browse files
author
Gilles Grousset
committed
Moved common Surefire classes to commons module
1 parent 6ad5491 commit cf319c6

File tree

14 files changed

+152
-425
lines changed

14 files changed

+152
-425
lines changed

‎commons/pom.xml‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
commons - Enables analysis of Swift and Objective-C projects into SonarQube.
5+
Copyright © 2015 Backelite (${email})
6+
7+
This program is free software: you can redistribute it and/or modify
8+
it under the terms of the GNU Lesser General Public License as published by
9+
the Free Software Foundation, either version 3 of the License, or
10+
(at your option) any later version.
11+
12+
This program is distributed in the hope that it will be useful,
13+
but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
GNU Lesser General Public License for more details.
16+
17+
You should have received a copy of the GNU Lesser General Public License
18+
along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
20+
-->
21+
<project xmlns="http://maven.apache.org/POM/4.0.0"
22+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24+
<parent>
25+
<artifactId>backelite-swift</artifactId>
26+
<groupId>com.backelite.sonarqube</groupId>
27+
<version>0.3.8</version>
28+
</parent>
29+
<modelVersion>4.0.0</modelVersion>
30+
31+
<groupId>com.backelite.sonarqube</groupId>
32+
<artifactId>commons</artifactId>
33+
34+
<dependencies>
35+
36+
<dependency>
37+
<groupId>org.sonarsource.sslr</groupId>
38+
<artifactId>sslr-core</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.sonarsource.sslr-squid-bridge</groupId>
42+
<artifactId>sslr-squid-bridge</artifactId>
43+
</dependency>
44+
<dependency>
45+
<groupId>commons-lang</groupId>
46+
<artifactId>commons-lang</artifactId>
47+
</dependency>
48+
<dependency>
49+
<groupId>commons-io</groupId>
50+
<artifactId>commons-io</artifactId>
51+
</dependency>
52+
<dependency>
53+
<groupId>ch.qos.logback</groupId>
54+
<artifactId>logback-classic</artifactId>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.google.guava</groupId>
58+
<artifactId>guava</artifactId>
59+
</dependency>
60+
<dependency>
61+
<groupId>com.google.code.gson</groupId>
62+
<artifactId>gson</artifactId>
63+
</dependency>
64+
<dependency>
65+
<groupId>ant</groupId>
66+
<artifactId>ant</artifactId>
67+
</dependency>
68+
69+
<dependency>
70+
<groupId>com.googlecode.json-simple</groupId>
71+
<artifactId>json-simple</artifactId>
72+
</dependency>
73+
74+
<!-- Test dependencies -->
75+
<dependency>
76+
<groupId>junit</groupId>
77+
<artifactId>junit</artifactId>
78+
<scope>compile</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.mockito</groupId>
82+
<artifactId>mockito-all</artifactId>
83+
<scope>compile</scope>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.assertj</groupId>
87+
<artifactId>assertj-core</artifactId>
88+
</dependency>
89+
<dependency>
90+
<groupId>org.sonarsource.sonarqube</groupId>
91+
<artifactId>sonar-testing-harness</artifactId>
92+
</dependency>
93+
<dependency>
94+
<groupId>org.sonarsource.sslr</groupId>
95+
<artifactId>sslr-testing-harness</artifactId>
96+
<scope>compile</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>org.sonarsource.sonarlint.core</groupId>
100+
<artifactId>sonarlint-core</artifactId>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.sonarsource.orchestrator</groupId>
104+
<artifactId>sonar-orchestrator</artifactId>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.sonarsource.sonarqube</groupId>
108+
<artifactId>sonar-plugin-api</artifactId>
109+
</dependency>
110+
<dependency>
111+
<groupId>org.slf4j</groupId>
112+
<artifactId>slf4j-api</artifactId>
113+
</dependency>
114+
115+
</dependencies>
116+
117+
118+
</project>

‎objclang/src/main/java/com/backelite/sonarqube/objectivec/surefire/data/SurefireStaxHandler.java‎ renamed to ‎commons/src/main/java/com/backelite/sonarqube/commons/surefire/SurefireStaxHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Swift SonarQube Plugin - Objective-C module - Enables analysis of Swift and Objective-C projects into SonarQube.
2+
* commons - Enables analysis of Swift and Objective-C projects into SonarQube.
33
* Copyright © 2015 Backelite (${email})
44
*
55
* This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU Lesser General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.backelite.sonarqube.objectivec.surefire.data;
18+
package com.backelite.sonarqube.commons.surefire;
1919

2020
import org.apache.commons.lang.StringUtils;
2121
import org.codehaus.staxmate.in.ElementFilter;

‎swiftlang/src/main/java/com/backelite/sonarqube/swift/surefire/data/UnitTestClassReport.java‎ renamed to ‎commons/src/main/java/com/backelite/sonarqube/commons/surefire/UnitTestClassReport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Swift SonarQube Plugin - Swift module - Enables analysis of Swift and Objective-C projects into SonarQube.
2+
* commons - Enables analysis of Swift and Objective-C projects into SonarQube.
33
* Copyright © 2015 Backelite (${email})
44
*
55
* This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU Lesser General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.backelite.sonarqube.swift.surefire.data;
18+
package com.backelite.sonarqube.commons.surefire;
1919

2020
import com.google.common.collect.Lists;
2121

‎swiftlang/src/main/java/com/backelite/sonarqube/swift/surefire/data/UnitTestIndex.java‎ renamed to ‎commons/src/main/java/com/backelite/sonarqube/commons/surefire/UnitTestIndex.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Swift SonarQube Plugin - Swift module - Enables analysis of Swift and Objective-C projects into SonarQube.
2+
* commons - Enables analysis of Swift and Objective-C projects into SonarQube.
33
* Copyright © 2015 Backelite (${email})
44
*
55
* This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU Lesser General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.backelite.sonarqube.swift.surefire.data;
18+
package com.backelite.sonarqube.commons.surefire;
1919

2020
import com.google.common.collect.Maps;
2121
import com.google.common.collect.Sets;

‎swiftlang/src/main/java/com/backelite/sonarqube/swift/surefire/data/UnitTestResult.java‎ renamed to ‎commons/src/main/java/com/backelite/sonarqube/commons/surefire/UnitTestResult.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Swift SonarQube Plugin - Swift module - Enables analysis of Swift and Objective-C projects into SonarQube.
2+
* commons - Enables analysis of Swift and Objective-C projects into SonarQube.
33
* Copyright © 2015 Backelite (${email})
44
*
55
* This program is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
1515
* You should have received a copy of the GNU Lesser General Public License
1616
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
18-
package com.backelite.sonarqube.swift.surefire.data;
18+
package com.backelite.sonarqube.commons.surefire;
1919

2020
public final class UnitTestResult {
2121
public static final String STATUS_OK = "ok";

‎objclang/pom.xml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434

3535
<dependencies>
3636

37+
<dependency>
38+
<groupId>com.backelite.sonarqube</groupId>
39+
<artifactId>commons</artifactId>
40+
<version>0.3.8</version>
41+
</dependency>
42+
3743
<dependency>
3844
<groupId>org.sonarsource.sslr</groupId>
3945
<artifactId>sslr-core</artifactId>
@@ -66,13 +72,10 @@
6672
<groupId>ant</groupId>
6773
<artifactId>ant</artifactId>
6874
</dependency>
69-
7075
<dependency>
7176
<groupId>com.googlecode.json-simple</groupId>
7277
<artifactId>json-simple</artifactId>
7378
</dependency>
74-
75-
<!-- Test dependencies -->
7679
<dependency>
7780
<groupId>junit</groupId>
7881
<artifactId>junit</artifactId>
@@ -112,6 +115,11 @@
112115
<groupId>org.slf4j</groupId>
113116
<artifactId>slf4j-api</artifactId>
114117
</dependency>
118+
<dependency>
119+
<groupId>com.backelite.sonarqube</groupId>
120+
<artifactId>commons</artifactId>
121+
<version>0.3.8</version>
122+
</dependency>
115123

116124
</dependencies>
117125

‎objclang/src/main/java/com/backelite/sonarqube/objectivec/surefire/SurefireParser.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
*/
1818
package com.backelite.sonarqube.objectivec.surefire;
1919

20+
import com.backelite.sonarqube.commons.surefire.SurefireStaxHandler;
21+
import com.backelite.sonarqube.commons.surefire.UnitTestClassReport;
22+
import com.backelite.sonarqube.commons.surefire.UnitTestIndex;
23+
import com.backelite.sonarqube.commons.surefire.UnitTestResult;
2024
import com.google.common.collect.ImmutableList;
2125
import org.slf4j.Logger;
2226
import org.slf4j.LoggerFactory;
@@ -32,11 +36,6 @@
3236
import org.sonar.api.test.TestCase;
3337
import org.sonar.api.utils.ParsingUtils;
3438
import org.sonar.api.utils.StaxParser;
35-
import com.backelite.sonarqube.objectivec.surefire.data.SurefireStaxHandler;
36-
import com.backelite.sonarqube.objectivec.surefire.data.UnitTestClassReport;
37-
import com.backelite.sonarqube.objectivec.surefire.data.UnitTestIndex;
38-
import com.backelite.sonarqube.objectivec.surefire.data.UnitTestResult;
39-
4039
import javax.annotation.Nullable;
4140
import javax.xml.stream.XMLStreamException;
4241
import java.io.File;

‎objclang/src/main/java/com/backelite/sonarqube/objectivec/surefire/data/UnitTestClassReport.java‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)