Browse Source

SCANCLI-145 Update to the latest build

tags/6.0.0.4432
Julien HENRY 1 month ago
parent
commit
6ffdbb6890

+ 1
- 1
it/pom.xml View File

<dependency> <dependency>
<groupId>org.assertj</groupId> <groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId> <artifactId>assertj-core</artifactId>
<version>3.12.2</version>
<version>3.24.2</version>
</dependency> </dependency>
</dependencies> </dependencies>



+ 8
- 2
it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java View File



assertThat(buildResult.isSuccess()).isFalse(); assertThat(buildResult.isSuccess()).isFalse();
assertThat(buildResult.getLogs()) 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 @Test
assertThat(result.isSuccess()).isFalse(); assertThat(result.isSuccess()).isFalse();
// with the following message // with the following message
assertThat(result.getLogs()) 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 // SONARPLUGINS-3574

+ 3
- 3
pom.xml View File

<dependency> <dependency>
<groupId>org.sonarsource.scanner.lib</groupId> <groupId>org.sonarsource.scanner.lib</groupId>
<artifactId>sonar-scanner-java-library</artifactId> <artifactId>sonar-scanner-java-library</artifactId>
<version>3.0.0.76</version>
<version>3.0.0.114</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
<configuration> <configuration>
<rules> <rules>
<requireFilesSize> <requireFilesSize>
<minsize>3000000</minsize>
<maxsize>3100000</maxsize>
<minsize>3400000</minsize>
<maxsize>3500000</maxsize>
<files> <files>
<file>${project.build.directory}/sonar-scanner-${project.version}.zip</file> <file>${project.build.directory}/sonar-scanner-${project.version}.zip</file>
</files> </files>

+ 2
- 2
src/main/java/org/sonarsource/scanner/cli/Main.java View File



import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import org.sonarsource.scanner.lib.ScanProperties;
import org.sonarsource.scanner.lib.ScannerEngineBootstrapper; import org.sonarsource.scanner.lib.ScannerEngineBootstrapper;
import org.sonarsource.scanner.lib.ScannerEngineFacade; import org.sonarsource.scanner.lib.ScannerEngineFacade;
import org.sonarsource.scanner.lib.ScannerProperties;


/** /**
* Arguments : * Arguments :
} }


private void checkSkip(Properties properties) { 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"); logger.info("SonarScanner CLI analysis skipped");
exit.exit(Exit.SUCCESS); exit.exit(Exit.SUCCESS);
} }

+ 1
- 1
src/main/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactory.java View File

} }


ScannerEngineBootstrapper newScannerEngineBootstrapper(String appName, String appVersion) { ScannerEngineBootstrapper newScannerEngineBootstrapper(String appName, String appVersion) {
return new ScannerEngineBootstrapper(appName, appVersion, logger.getLogOutputAdapter());
return ScannerEngineBootstrapper.create(appName, appVersion, logger.getLogOutputAdapter());
} }





+ 2
- 2
src/test/java/org/sonarsource/scanner/cli/MainTest.java View File

import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.sonar.api.utils.MessageException; import org.sonar.api.utils.MessageException;
import org.sonarsource.scanner.lib.ScanProperties;
import org.sonarsource.scanner.lib.ScannerEngineBootstrapper; import org.sonarsource.scanner.lib.ScannerEngineBootstrapper;
import org.sonarsource.scanner.lib.ScannerEngineFacade; import org.sonarsource.scanner.lib.ScannerEngineFacade;
import org.sonarsource.scanner.lib.ScannerProperties;


import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
@Test @Test
public void should_skip() { public void should_skip() {
Properties p = new Properties(); Properties p = new Properties();
p.setProperty(ScanProperties.SKIP, "true");
p.setProperty(ScannerProperties.SKIP, "true");
when(conf.properties()).thenReturn(p); when(conf.properties()).thenReturn(p);
when(cli.getInvokedFrom()).thenReturn(""); when(cli.getInvokedFrom()).thenReturn("");



Loading…
Cancel
Save