SONAR-12383 Selenide update to 5.2.3 and Guava update to 28.1-jre

diff --git a/build.gradle b/build.gradle
index b0c29473c92f7898bc0423fd55e65311f6b51601..7044700dd73d202d04b15c8928052100f3d4415a 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -173,14 +173,14 @@ subprojects {
       dependency 'com.eclipsesource.minimal-json:minimal-json:0.9.5'
       dependency 'com.github.kevinsawicki:http-request:5.4.1'
       dependency 'com.github.scribejava:scribejava-core:6.8.1'
-      dependency 'com.github.scribejava:scribejava-apis:6.8.1'      
+      dependency 'com.github.scribejava:scribejava-apis:6.8.1'
       dependency 'com.googlecode.java-diff-utils:diffutils:1.2'
       dependency('com.googlecode.json-simple:json-simple:1.1.1') {
         exclude 'junit:junit'
       }
       dependency 'com.google.code.findbugs:jsr305:3.0.2'
       dependency 'com.google.code.gson:gson:2.8.5'
-      dependency 'com.google.guava:guava:18.0'
+      dependency 'com.google.guava:guava:28.1-jre'
       dependency "com.google.protobuf:protobuf-java:${protobufVersion}"
       dependency 'com.h2database:h2:1.3.176'
       dependencySet(group: 'com.hazelcast', version: '3.12.1') {
@@ -283,7 +283,7 @@ subprojects {
       dependency 'org.sonarsource.update-center:sonar-update-center-common:1.23.0.723'
       dependency 'org.subethamail:subethasmtp:3.1.7'
       dependency 'org.yaml:snakeyaml:1.17'
-      dependency 'xml-apis:xml-apis:1.4.01'  
+      dependency 'xml-apis:xml-apis:1.4.01'
 
       // please keep this list alphabetically ordered
     }

diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java
index 7aa0f353bc24611dc2b3d61c62f5285ccd462c9e..12bf8075bd1ea1b1d9f55c035c4556b623e654bc 100644 (file)
--- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java
+++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java
@@ -39,7 +39,6 @@ import org.sonar.server.qualityprofile.QualityProfile;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.assertj.guava.api.Assertions.assertThat;
 import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES;
 import static org.sonar.api.measures.CoreMetrics.QUALITY_PROFILES_KEY;
 import static org.sonar.ce.task.projectanalysis.component.Component.Type.DIRECTORY;

diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java
index f75d8aebe9ef39368f846eb98d6c859a026fda6c..5325dd426c5e1a470d9e8a4f73b71a5f403034b6 100644 (file)
--- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImpl.java
@@ -23,6 +23,7 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableScheduledFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.CheckForNull;
@@ -68,7 +69,7 @@ public class CeProcessingSchedulerImpl implements CeProcessingScheduler {
   public void startScheduling() {
     for (ChainingCallback chainingCallback : chainingCallbacks) {
       ListenableScheduledFuture<CeWorker.Result> future = executorService.schedule(chainingCallback.worker, delayBetweenEnabledTasks, timeUnit);
-      addCallback(future, chainingCallback);
+      addCallback(future, chainingCallback, MoreExecutors.directExecutor());
     }
   }
 
@@ -200,7 +201,7 @@ public class CeProcessingSchedulerImpl implements CeProcessingScheduler {
 
     private void addCallback() {
       if (workerFuture != null) {
-        Futures.addCallback(workerFuture, this);
+        Futures.addCallback(workerFuture, this, MoreExecutors.directExecutor());
       }
     }
 

diff --git a/server/sonar-main/src/main/java/org/sonar/application/es/EsConnectorImpl.java b/server/sonar-main/src/main/java/org/sonar/application/es/EsConnectorImpl.java
index 3ab89817001dd4c8ba6f0915b459eeee5255b987..d03ad986b378108981ebde7148cb88fd35a3197a 100644 (file)
--- a/server/sonar-main/src/main/java/org/sonar/application/es/EsConnectorImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/es/EsConnectorImpl.java
@@ -105,16 +105,16 @@ public class EsConnectorImpl implements EsConnector {
       boolean connectedToOneHost = false;
       for (HostAndPort hostAndPort : hostAndPorts) {
         try {
-          addTransportAddress(new TransportAddress(InetAddress.getByName(hostAndPort.getHostText()), hostAndPort.getPortOrDefault(9001)));
+          addTransportAddress(new TransportAddress(InetAddress.getByName(hostAndPort.getHost()), hostAndPort.getPortOrDefault(9001)));
           connectedToOneHost = true;
         } catch (UnknownHostException e) {
-          LOG.debug("Can not resolve host [" + hostAndPort.getHostText() + "]", e);
+          LOG.debug("Can not resolve host [" + hostAndPort.getHost() + "]", e);
         }
       }
       if (!connectedToOneHost) {
         throw new IllegalStateException(format("Can not connect to one node from [%s]",
           hostAndPorts.stream()
-            .map(h -> format("%s:%d", h.getHostText(), h.getPortOrDefault(9001)))
+            .map(h -> format("%s:%d", h.getHost(), h.getPortOrDefault(9001)))
             .collect(Collectors.joining(","))));
       }
     }

diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClientProvider.java b/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClientProvider.java
index b84ab902146ae28139e865c81bf5203e2dd86801..87d8fdd16e03eac1eb2a5c5953f6a25c3def9596 100644 (file)
--- a/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClientProvider.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClientProvider.java
@@ -88,7 +88,7 @@ public class EsClientProvider extends ProviderAdapter {
 
   private static void addHostToClient(HostAndPort host, TransportClient client) {
     try {
-      client.addTransportAddress(new TransportAddress(InetAddress.getByName(host.getHostText()), host.getPortOrDefault(9001)));
+      client.addTransportAddress(new TransportAddress(InetAddress.getByName(host.getHost()), host.getPortOrDefault(9001)));
     } catch (UnknownHostException e) {
       throw new IllegalStateException("Can not resolve host [" + host + "]", e);
     }