Skip to content

Commit fbfc176

Browse files
committed
Compatibility with Sonar 8
1 parent 56cc682 commit fbfc176

File tree

6 files changed

+15
-7
lines changed

6 files changed

+15
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 1.1.0
4+
5+
* Added compatibility with Sonarqube > 8.0
6+
37
## 1.0.6
48

59
* Added new Issue fields to be exported to Quboo: `type` and `tags`. They will be used to assign new badges.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FROM sonarqube:7.9-community
1+
FROM sonarqube:8.2-community
22
ADD ./target/quboo-sonar-plugin*.jar /opt/sonarqube/extensions/plugins/quboo-sonar-plugin.jar

Dockerfile-79

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
FROM sonarqube:7.9-community
2+
ADD ./target/quboo-sonar-plugin*.jar /opt/sonarqube/extensions/plugins/quboo-sonar-plugin.jar

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535

3636
<properties>
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38-
<sonar.apiVersion>6.7.1</sonar.apiVersion>
38+
<sonar.apiVersion>7.4</sonar.apiVersion>
3939
<jdk.min.version>1.8</jdk.min.version>
4040
<sonar.sources>src/main/java</sonar.sources>
41-
<jackson.version>2.10.0</jackson.version>
41+
<jackson.version>2.10.3</jackson.version>
4242
<sonar.exclusions>**/pojos/*.java</sonar.exclusions>
4343
</properties>
4444

redeploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env bash
22
mvn package
3-
cp -v ./target/*.jar /usr/local/Cellar/sonarqube/7.7/libexec/extensions/plugins
3+
cp -v ./target/*.jar /usr/local/Cellar/sonarqube/8.2.0.32929/libexec/extensions/plugins
44
sonar restart

src/main/java/io/tpd/quboo/sonarplugin/hooks/QubooConnector.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.tpd.quboo.sonarplugin.settings.QubooProperties;
1212
import okhttp3.*;
1313
import org.sonar.api.ce.posttask.PostProjectAnalysisTask;
14-
import org.sonar.api.internal.google.common.annotations.VisibleForTesting;
1514
import org.sonar.api.platform.Server;
1615
import org.sonar.api.utils.log.Logger;
1716
import org.sonar.api.utils.log.Loggers;
@@ -37,11 +36,14 @@ public QubooConnector(final Server server) {
3736
this.mapper = new ObjectMapper();
3837
}
3938

40-
@VisibleForTesting
4139
void setHttp(final OkHttpClient http) {
4240
this.http = http;
4341
}
4442

43+
public String getDescription() {
44+
return "Send statistics to Quboo after an analysis";
45+
}
46+
4547
@Override
4648
public void finished(ProjectAnalysis analysis) {
4749
final String qubooKey = analysis.getScannerContext().getProperties().get(QubooProperties.ACCESS_KEY);
@@ -148,7 +150,7 @@ private Request.Builder addAuthorizationIfNeeded(final Request.Builder requestBu
148150
if (!isEmpty(token)) {
149151
final String headerValue = "Basic " + Base64.getEncoder().encodeToString((token + ":").getBytes());
150152
requestBuilder.header("Authorization", headerValue);
151-
log.info("Adding Authorization header to request with token ****{}", token.substring(3*token.length()/4));
153+
log.info("Adding Authorization header to request with token ****{}", token.substring(3 * token.length() / 4));
152154
}
153155
return requestBuilder;
154156
}

0 commit comments

Comments
 (0)