Merge pull request #22 from javamachr/update-dependencies

Update dependencies

Author: javamachr

.github/workflows/ci.yaml

@@ -18,9 +18,10 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 8
+          distribution: "temurin"
 
       - name: mvn clean verify
         run: mvn ${MAVEN_CLI_OPTS} clean verify

.github/workflows/release.yaml

@@ -1,6 +1,8 @@
 ---
 on:
-  push
+  push:
+    tags:
+      - '*'
 
 env:
   # https://github.com/actions/virtual-environments/issues/1499
@@ -18,8 +20,8 @@ jobs:
       - name: Setup java
         uses: actions/setup-java@v2
         with:
-          java-version: 11
-          distribution: "adopt"
+          java-version: 8
+          distribution: "temurin"
 
       - name: mvn clean verify package
         run: mvn ${MAVEN_CLI_OPTS} clean verify package -Dsources.skip

pom.xml

@@ -6,24 +6,24 @@
   <parent>
     <groupId>org.sonarsource.parent</groupId>
     <artifactId>parent</artifactId>
-    <version>40</version>
+    <version>60.0.52</version>
   </parent>
   <groupId>com.talanlabs</groupId>
   <artifactId>sonar-gitlab-plugin</artifactId>
   <version>5.1.2</version>
   <name>SonarQube :: GitLab Plugin</name>
   <description>GitLab Plugin for Reporting</description>
   <packaging>sonar-plugin</packaging>
-  <url>https://github.com/gabrie-allaigre/sonar-gitlab-plugin</url>
+  <url>https://github.com/javamachr/sonar-gitlab-plugin</url>
   <properties>
     <java-gitlab-api.version>1.5.0</java-gitlab-api.version>
-    <freemarker.version>2.3.30</freemarker.version>
-    <commons-lang3.version>3.11</commons-lang3.version>
+    <freemarker.version>2.3.31</freemarker.version>
+    <commons-text.version>1.9</commons-text.version>
 
     <license.mailto>gabriel.allaigre@gmail.com</license.mailto>
     <license.owner>Talanlabs</license.owner>
 
-    <sonar.version>8.6.1.40680</sonar.version>
+    <sonar.version>9.3.0.51899</sonar.version>
     <sonar.pluginName>GitLab</sonar.pluginName>
     <sonar.pluginClass>com.talanlabs.sonar.plugins.gitlab.GitLabPlugin</sonar.pluginClass>
 
@@ -32,9 +32,8 @@
     <!-- Release: enable publication to Bintray -->
     <artifactsToPublish>${project.groupId}:${project.artifactId}:jar</artifactsToPublish>
 
-    <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
-    <jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec
-    </jacoco.ut.execution.data.file>
+    <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
+    <jacoco.ut.execution.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.ut.execution.data.file>
 
     <sonar.jacoco.reportPaths>${jacoco.ut.execution.data.file}</sonar.jacoco.reportPaths>
     <sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
@@ -88,16 +87,16 @@
     </contributor>
   </contributors>
   <scm>
-    <url>https://github.com/gabrie-allaigre/sonar-gitlab-plugin</url>
-    <connection>scm:git:https://github.com/gabrie-allaigre/sonar-gitlab-plugin.git</connection>
+    <url>https://github.com/javamachr/sonar-gitlab-plugin</url>
+    <connection>scm:git:https://github.com/javamachr/sonar-gitlab-plugin.git</connection>
   </scm>
   <ciManagement>
     <system>gitlab-ci</system>
     <url>https://gitlab.talanlabs.com/gabriel-allaigre/sonar-gitlab-plugin/builds</url>
   </ciManagement>
   <issueManagement>
     <system>github</system>
-    <url>https://github.com/gabrie-allaigre/sonar-gitlab-plugin/issues</url>
+    <url>https://github.com/javamachr/sonar-gitlab-plugin/issues</url>
   </issueManagement>
   <repositories>
     <repository>
@@ -172,37 +171,31 @@
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>${commons-lang3.version}</version>
+      <artifactId>commons-text</artifactId>
+      <version>${commons-text.version}</version>
     </dependency>
     <dependency>
-       <groupId>com.google.guava</groupId>
-       <artifactId>guava</artifactId>
-       <version>30.1-jre</version>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>31.0.1-jre</version>
     </dependency>
     <!-- unit tests -->
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-batch</artifactId>
-      <version>5.1</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.19.0</version>
+      <version>3.22.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.7.7</version>
+      <version>4.3.1</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -212,9 +205,9 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>com.squareup.okhttp</groupId>
+      <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>2.7.5</version>
+      <version>4.9.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/com/talanlabs/sonar/plugins/gitlab/AbstractCommentBuilder.java

@@ -1,6 +1,6 @@
 /*
  * SonarQube :: GitLab Plugin
- * Copyright (C) 2016-2017 Talanlabs
+ * Copyright (C) 2016-2022 Talanlabs
  * gabriel.allaigre@gmail.com
  *
  * This program is free software; you can redistribute it and/or
@@ -19,18 +19,13 @@
  */
 package com.talanlabs.sonar.plugins.gitlab;
 
-import com.talanlabs.sonar.plugins.gitlab.freemarker.EmojiSeverityTemplateMethodModelEx;
-import com.talanlabs.sonar.plugins.gitlab.freemarker.ImageSeverityTemplateMethodModelEx;
-import com.talanlabs.sonar.plugins.gitlab.freemarker.IssueCountTemplateMethodModelEx;
-import com.talanlabs.sonar.plugins.gitlab.freemarker.IssuesTemplateMethodModelEx;
-import com.talanlabs.sonar.plugins.gitlab.freemarker.PrintTemplateMethodModelEx;
-import com.talanlabs.sonar.plugins.gitlab.freemarker.RuleLinkTemplateMethodModelEx;
+import com.talanlabs.sonar.plugins.gitlab.freemarker.*;
 import com.talanlabs.sonar.plugins.gitlab.models.ReportIssue;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 import freemarker.template.TemplateExceptionHandler;
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.sonar.api.batch.rule.Severity;
 import org.sonar.api.utils.MessageException;
 import org.sonar.api.utils.log.Logger;
@@ -75,7 +70,7 @@ public String buildForMarkdown() {
     }
 
     private String buildFreemarkerComment() {
-        Configuration cfg = new Configuration(Configuration.getVersion());
+        Configuration cfg = new Configuration(Configuration.VERSION_2_3_31);
         cfg.setDefaultEncoding("UTF-8");
         cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
         cfg.setLogTemplateExceptions(false);

src/main/java/com/talanlabs/sonar/plugins/gitlab/BuildInitState.java

@@ -1,6 +1,6 @@
 /*
  * SonarQube :: GitLab Plugin
- * Copyright (C) 2016-2017 Talanlabs
+ * Copyright (C) 2016-2022 Talanlabs
  * gabriel.allaigre@gmail.com
  *
  * This program is free software; you can redistribute it and/or

src/main/java/com/talanlabs/sonar/plugins/gitlab/CommitFacade.java

@@ -1,6 +1,6 @@
 /*
  * SonarQube :: GitLab Plugin
- * Copyright (C) 2016-2017 Talanlabs
+ * Copyright (C) 2016-2022 Talanlabs
  * gabriel.allaigre@gmail.com
  *
  * This program is free software; you can redistribute it and/or
@@ -27,15 +27,15 @@
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
 
 /**
  * Facade for all WS interaction with GitLab.
@@ -181,7 +181,7 @@ public void writeJsonFile(String json) {
             try {
                 Files.write(Paths.get(file.getAbsolutePath()), json.getBytes(), StandardOpenOption.CREATE);
             } catch (IOException e) {
-                throw MessageException.of("Failed to write file " + file.toString(), e);
+                throw MessageException.of("Failed to write file " + file, e);
             }
         }
     }

src/main/java/com/talanlabs/sonar/plugins/gitlab/CommitPublishPostJob.java

@@ -1,6 +1,6 @@
 /*
  * SonarQube :: GitLab Plugin
- * Copyright (C) 2016-2017 Talanlabs
+ * Copyright (C) 2016-2022 Talanlabs
  * gabriel.allaigre@gmail.com
  *
  * This program is free software; you can redistribute it and/or
@@ -22,6 +22,7 @@
 import com.talanlabs.sonar.plugins.gitlab.models.Issue;
 import com.talanlabs.sonar.plugins.gitlab.models.QualityGate;
 import com.talanlabs.sonar.plugins.gitlab.models.StatusNotificationsMode;
+import org.jetbrains.annotations.NotNull;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.postjob.PostJob;
 import org.sonar.api.batch.postjob.PostJobContext;
@@ -67,7 +68,7 @@ public void describe(PostJobDescriptor descriptor) {
     }
 
     @Override
-    public void execute(PostJobContext context) {
+    public void execute(@NotNull PostJobContext context) {
         LOG.info("Will execute CommitPublishPostJob of GitlabPlugin.");
         try {
             if (!gitLabPluginConfiguration.isEnabled()) {
@@ -166,4 +167,4 @@ private void notificationCommitStatus(String status, String message) {
             LOG.info(message);
         }
     }
-}
+}

src/main/java/com/talanlabs/sonar/plugins/gitlab/GitLabApiV4Wrapper.java

@@ -1,6 +1,6 @@
 /*
  * SonarQube :: GitLab Plugin
- * Copyright (C) 2016-2017 Talanlabs
+ * Copyright (C) 2016-2022 Talanlabs
  * gabriel.allaigre@gmail.com
  *
  * This program is free software; you can redistribute it and/or
@@ -22,28 +22,24 @@
 import com.talanlabs.gitlab.api.Paged;
 import com.talanlabs.gitlab.api.v4.GitLabAPI;
 import com.talanlabs.gitlab.api.v4.GitlabMergeRequestDiff;
-import com.talanlabs.gitlab.api.v4.models.GitlabMergeRequest;
 import com.talanlabs.gitlab.api.v4.models.GitlabPosition;
 import com.talanlabs.gitlab.api.v4.models.commits.GitLabCommit;
 import com.talanlabs.gitlab.api.v4.models.commits.GitLabCommitComments;
 import com.talanlabs.gitlab.api.v4.models.commits.GitLabCommitDiff;
 import com.talanlabs.gitlab.api.v4.models.discussion.GitlabDiscussion;
-import com.talanlabs.gitlab.api.v4.models.discussion.GitlabDiscussionStatus;
 import com.talanlabs.gitlab.api.v4.models.projects.GitLabProject;
 import com.talanlabs.gitlab.api.v4.models.users.GitLabUser;
 import com.talanlabs.sonar.plugins.gitlab.api.GitLabAPIMergeRequestDiscussionExt;
-
-import org.apache.commons.lang3.StringUtils;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.*;
 import java.util.stream.Collectors;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
 
 public class GitLabApiV4Wrapper implements IGitLabApiWrapper {
 
@@ -55,7 +51,7 @@ public class GitLabApiV4Wrapper implements IGitLabApiWrapper {
     private GitLabAPI gitLabAPIV4;
     private GitLabProject gitLabProject;
     private GitLabAPIMergeRequestDiscussionExt gitLabAPIExt;
-    
+
     private Map<String, List<GitLabCommitComments>> commitCommentPerRevision;
     private Map<String, Map<String, Set<Line>>> patchPositionByFile;
 
@@ -82,7 +78,7 @@ public void init() {
     void setGitLabAPI(GitLabAPI gitLabAPI) {
         this.gitLabAPIV4 = gitLabAPI;
     }
-    
+
     void setGitLabAPIExt(GitLabAPIMergeRequestDiscussionExt gitLabAPIExt) {
         this.gitLabAPIExt = gitLabAPIExt;
     }
@@ -305,9 +301,9 @@ private void createReviewDiscussion(String fullPath, Integer lineNumber, String
         checkArgument(mergeRequestDiffs.getResults() != null && !mergeRequestDiffs.getResults().isEmpty(), "There are no merge request diffs.");
 
         GitlabMergeRequestDiff mergeRequestDiff = mergeRequestDiffs.getResults().get(0);
-       
+
         gitLabAPIExt = gitLabAPIExt == null ? new GitLabAPIMergeRequestDiscussionExt(gitLabAPIV4): gitLabAPIExt;
-        
+
         if(gitLabAPIExt.hasDiscussion(projectId, mergeRequestIid, fullPath, lineNumber, body, mergeRequestDiff.getBaseCommitSha(), mergeRequestDiff.getHeadCommitSha())) {
         	LOG.debug("discussion already exist");
         	return;

src/main/java/com/talanlabs/sonar/plugins/gitlab/GitLabPlugin.java

@@ -1,6 +1,6 @@
 /*
  * SonarQube :: GitLab Plugin
- * Copyright (C) 2016-2017 Talanlabs
+ * Copyright (C) 2016-2022 Talanlabs
  * gabriel.allaigre@gmail.com
  *
  * This program is free software; you can redistribute it and/or

src/main/java/com/talanlabs/sonar/plugins/gitlab/GitLabPluginConfiguration.java

@@ -1,6 +1,6 @@
 /*
  * SonarQube :: GitLab Plugin
- * Copyright (C) 2016-2017 Talanlabs
+ * Copyright (C) 2016-2022 Talanlabs
  * gabriel.allaigre@gmail.com
  *
  * This program is free software; you can redistribute it and/or
@@ -23,17 +23,17 @@
 import com.talanlabs.sonar.plugins.gitlab.models.QualityGateFailMode;
 import com.talanlabs.sonar.plugins.gitlab.models.StatusNotificationsMode;
 import org.sonar.api.CoreProperties;
-import org.sonar.api.scanner.ScannerSide;
 import org.sonar.api.batch.rule.Severity;
 import org.sonar.api.config.Configuration;
+import org.sonar.api.scanner.ScannerSide;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 
-import javax.annotation.CheckForNull;
 import java.net.*;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.CheckForNull;
 
 @ScannerSide
 public class GitLabPluginConfiguration {