Shade sonar-ws

jenkinsci · Jan 16, 2022 · c4ff5c4 · c4ff5c4
1 parent babe20a
commit c4ff5c4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
     <git-code-format-maven-plugin.version>2.7</git-code-format-maven-plugin.version>
     <assertj-core.version>3.21.0</assertj-core.version>
     <logback-classic.version>1.2.3</logback-classic.version>
-    <sonar-ws.version>7.7</sonar-ws.version>
+    <sonar-ws-shaded.version>7.7.0</sonar-ws-shaded.version>
   </properties>
 
   <name>Sonar Gerrit Plugin</name>
@@ -130,9 +130,9 @@
       <version>${gerrit-rest-java-client.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.sonarsource.sonarqube</groupId>
-      <artifactId>sonar-ws</artifactId>
-      <version>${sonar-ws.version}</version>
+      <groupId>me.redaalaoui.sonar_ws</groupId>
+      <artifactId>sonar-ws-shaded</artifactId>
+      <version>${sonar-ws-shaded.version}</version>
     </dependency>
 
     <dependency>

diff --git a/...rg/jenkinsci/plugins/sonargerrit/sonar/pull_request_analysis/PullRequestAnalysisTask.java b/...rg/jenkinsci/plugins/sonargerrit/sonar/pull_request_analysis/PullRequestAnalysisTask.java
@@ -13,20 +13,20 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import me.redaalaoui.org.sonarqube.ws.Ce;
+import me.redaalaoui.org.sonarqube.ws.Issues;
+import me.redaalaoui.org.sonarqube.ws.ProjectPullRequests;
+import me.redaalaoui.org.sonarqube.ws.client.HttpConnector;
+import me.redaalaoui.org.sonarqube.ws.client.WsClient;
+import me.redaalaoui.org.sonarqube.ws.client.WsClientFactories;
+import me.redaalaoui.org.sonarqube.ws.client.ce.CeService;
+import me.redaalaoui.org.sonarqube.ws.client.ce.TaskRequest;
+import me.redaalaoui.org.sonarqube.ws.client.issues.SearchRequest;
+import me.redaalaoui.org.sonarqube.ws.client.projectpullrequests.ListRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.sonargerrit.TaskListenerLogger;
 import org.jenkinsci.plugins.sonargerrit.sonar.Components;
 import org.jenkinsci.plugins.sonargerrit.sonar.Issue;
-import org.sonarqube.ws.Ce;
-import org.sonarqube.ws.Issues;
-import org.sonarqube.ws.ProjectPullRequests;
-import org.sonarqube.ws.client.HttpConnector;
-import org.sonarqube.ws.client.WsClient;
-import org.sonarqube.ws.client.WsClientFactories;
-import org.sonarqube.ws.client.ce.CeService;
-import org.sonarqube.ws.client.ce.TaskRequest;
-import org.sonarqube.ws.client.issues.SearchRequest;
-import org.sonarqube.ws.client.projectpullrequests.ListRequest;
 
 /** @author Réda Housni Alaoui */
 class PullRequestAnalysisTask {

diff --git a/...a/org/jenkinsci/plugins/sonargerrit/sonar/pull_request_analysis/PullRequestComponent.java b/...a/org/jenkinsci/plugins/sonargerrit/sonar/pull_request_analysis/PullRequestComponent.java
@@ -1,8 +1,8 @@
 package org.jenkinsci.plugins.sonargerrit.sonar.pull_request_analysis;
 
 import javax.annotation.Nullable;
+import me.redaalaoui.org.sonarqube.ws.Issues;
 import org.jenkinsci.plugins.sonargerrit.sonar.Component;
-import org.sonarqube.ws.Issues;
 
 /** @author Réda Housni Alaoui */
 class PullRequestComponent implements Component {

diff --git a/.../java/org/jenkinsci/plugins/sonargerrit/sonar/pull_request_analysis/PullRequestIssue.java b/.../java/org/jenkinsci/plugins/sonargerrit/sonar/pull_request_analysis/PullRequestIssue.java
@@ -5,13 +5,13 @@
 import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.Optional;
+import me.redaalaoui.org.sonarqube.ws.Issues;
+import me.redaalaoui.org.sonarqube.ws.ProjectPullRequests;
 import org.jenkinsci.plugins.sonargerrit.sonar.Components;
 import org.jenkinsci.plugins.sonargerrit.sonar.Issue;
 import org.jenkinsci.plugins.sonargerrit.sonar.Rule;
 import org.jenkinsci.plugins.sonargerrit.sonar.Severity;
 import org.jenkinsci.plugins.sonargerrit.util.UrlBuilder;
-import org.sonarqube.ws.Issues;
-import org.sonarqube.ws.ProjectPullRequests;
 
 /** @author Réda Housni Alaoui */
 class PullRequestIssue implements Issue {

diff --git a/...a/org/jenkinsci/plugins/sonargerrit/sonar/pull_request_analysis/PullRequestIssueTest.java b/...a/org/jenkinsci/plugins/sonargerrit/sonar/pull_request_analysis/PullRequestIssueTest.java
@@ -6,12 +6,12 @@
 import static org.mockito.Mockito.when;
 
 import com.google.common.base.Optional;
+import me.redaalaoui.org.sonarqube.ws.Issues;
+import me.redaalaoui.org.sonarqube.ws.ProjectPullRequests;
 import org.jenkinsci.plugins.sonargerrit.sonar.Components;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.sonarqube.ws.Issues;
-import org.sonarqube.ws.ProjectPullRequests;
 
 /** @author Réda Housni Alaoui */
 class PullRequestIssueTest {