@@ -62,7 +62,7 @@ | |||
<dependency> | |||
<groupId>org.assertj</groupId> | |||
<artifactId>assertj-core</artifactId> | |||
<version>3.12.2</version> | |||
<version>3.24.2</version> | |||
</dependency> | |||
</dependencies> | |||
@@ -188,7 +188,10 @@ public class ScannerTest extends ScannerTestCase { | |||
assertThat(buildResult.isSuccess()).isFalse(); | |||
assertThat(buildResult.getLogs()) | |||
.contains("SonarQube server [http://from-env.org] can not be reached"); | |||
.containsAnyOf( | |||
"No such host is known (from-env.org)", // Windows | |||
"from-env.org: Name or service not known" // Linux | |||
); | |||
} | |||
@Test | |||
@@ -214,7 +217,10 @@ public class ScannerTest extends ScannerTestCase { | |||
assertThat(result.isSuccess()).isFalse(); | |||
// with the following message | |||
assertThat(result.getLogs()) | |||
.contains("SonarQube server [http://foo] can not be reached"); | |||
.containsAnyOf( | |||
"No such host is known (foo)", // Windows | |||
"foo: No address associated with hostname" // Linux | |||
); | |||
} | |||
// SONARPLUGINS-3574 |
@@ -66,7 +66,7 @@ | |||
<dependency> | |||
<groupId>org.sonarsource.scanner.lib</groupId> | |||
<artifactId>sonar-scanner-java-library</artifactId> | |||
<version>3.0.0.76</version> | |||
<version>3.0.0.114</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.google.code.findbugs</groupId> | |||
@@ -188,8 +188,8 @@ | |||
<configuration> | |||
<rules> | |||
<requireFilesSize> | |||
<minsize>3000000</minsize> | |||
<maxsize>3100000</maxsize> | |||
<minsize>3400000</minsize> | |||
<maxsize>3500000</maxsize> | |||
<files> | |||
<file>${project.build.directory}/sonar-scanner-${project.version}.zip</file> | |||
</files> |
@@ -21,9 +21,9 @@ package org.sonarsource.scanner.cli; | |||
import java.util.Map; | |||
import java.util.Properties; | |||
import org.sonarsource.scanner.lib.ScanProperties; | |||
import org.sonarsource.scanner.lib.ScannerEngineBootstrapper; | |||
import org.sonarsource.scanner.lib.ScannerEngineFacade; | |||
import org.sonarsource.scanner.lib.ScannerProperties; | |||
/** | |||
* Arguments : | |||
@@ -96,7 +96,7 @@ public class Main { | |||
} | |||
private void checkSkip(Properties properties) { | |||
if ("true".equalsIgnoreCase(properties.getProperty(ScanProperties.SKIP))) { | |||
if ("true".equalsIgnoreCase(properties.getProperty(ScannerProperties.SKIP))) { | |||
logger.info("SonarScanner CLI analysis skipped"); | |||
exit.exit(Exit.SUCCESS); | |||
} |
@@ -44,7 +44,7 @@ class ScannerEngineBootstrapperFactory { | |||
} | |||
ScannerEngineBootstrapper newScannerEngineBootstrapper(String appName, String appVersion) { | |||
return new ScannerEngineBootstrapper(appName, appVersion, logger.getLogOutputAdapter()); | |||
return ScannerEngineBootstrapper.create(appName, appVersion, logger.getLogOutputAdapter()); | |||
} | |||
@@ -29,9 +29,9 @@ import org.mockito.Mock; | |||
import org.mockito.Mockito; | |||
import org.mockito.MockitoAnnotations; | |||
import org.sonar.api.utils.MessageException; | |||
import org.sonarsource.scanner.lib.ScanProperties; | |||
import org.sonarsource.scanner.lib.ScannerEngineBootstrapper; | |||
import org.sonarsource.scanner.lib.ScannerEngineFacade; | |||
import org.sonarsource.scanner.lib.ScannerProperties; | |||
import static org.assertj.core.api.Assertions.assertThat; | |||
import static org.mockito.ArgumentMatchers.any; | |||
@@ -221,7 +221,7 @@ public class MainTest { | |||
@Test | |||
public void should_skip() { | |||
Properties p = new Properties(); | |||
p.setProperty(ScanProperties.SKIP, "true"); | |||
p.setProperty(ScannerProperties.SKIP, "true"); | |||
when(conf.properties()).thenReturn(p); | |||
when(cli.getInvokedFrom()).thenReturn(""); | |||