aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/assembly/dist-linux-aarch64.xml6
-rw-r--r--src/main/assembly/dist-linux-x64.xml6
-rw-r--r--src/main/assembly/dist-macosx-aarch64.xml6
-rw-r--r--src/main/assembly/dist-macosx-x64.xml6
-rw-r--r--src/main/java/org/sonarsource/scanner/cli/SystemInfo.java4
-rw-r--r--src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java23
-rw-r--r--src/test/java/testutils/LogTester.java6
7 files changed, 37 insertions, 20 deletions
diff --git a/src/main/assembly/dist-linux-aarch64.xml b/src/main/assembly/dist-linux-aarch64.xml
index 3e92aa7..4109d88 100644
--- a/src/main/assembly/dist-linux-aarch64.xml
+++ b/src/main/assembly/dist-linux-aarch64.xml
@@ -9,7 +9,7 @@
<!-- jre basic, except bin/ -->
<fileSet>
- <directory>${unpack.dir}/linux-aarch64/${jre.dirname.linux}</directory>
+ <directory>${unpack.dir}/linux-aarch64/${jre.dirname.linux.aarch64}</directory>
<outputDirectory>jre</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
@@ -22,7 +22,7 @@
<!-- jre bin/java -->
<fileSet>
- <directory>${unpack.dir}/linux-aarch64/${jre.dirname.linux}/bin</directory>
+ <directory>${unpack.dir}/linux-aarch64/${jre.dirname.linux.aarch64}/bin</directory>
<outputDirectory>jre/bin</outputDirectory>
<includes>
<include>java</include>
@@ -32,7 +32,7 @@
<!-- jre lib executable files -->
<fileSet>
- <directory>${unpack.dir}/linux-aarch64/${jre.dirname.linux}/lib</directory>
+ <directory>${unpack.dir}/linux-aarch64/${jre.dirname.linux.aarch64}/lib</directory>
<outputDirectory>jre/lib</outputDirectory>
<includes>
<include>jspawnhelper</include>
diff --git a/src/main/assembly/dist-linux-x64.xml b/src/main/assembly/dist-linux-x64.xml
index f13e733..34c465c 100644
--- a/src/main/assembly/dist-linux-x64.xml
+++ b/src/main/assembly/dist-linux-x64.xml
@@ -9,7 +9,7 @@
<!-- jre basic, except bin/ -->
<fileSet>
- <directory>${unpack.dir}/linux-x64/${jre.dirname.linux}</directory>
+ <directory>${unpack.dir}/linux-x64/${jre.dirname.linux.x64}</directory>
<outputDirectory>jre</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
@@ -22,7 +22,7 @@
<!-- jre bin/java -->
<fileSet>
- <directory>${unpack.dir}/linux-x64/${jre.dirname.linux}/bin</directory>
+ <directory>${unpack.dir}/linux-x64/${jre.dirname.linux.x64}/bin</directory>
<outputDirectory>jre/bin</outputDirectory>
<includes>
<include>java</include>
@@ -32,7 +32,7 @@
<!-- jre lib executable files -->
<fileSet>
- <directory>${unpack.dir}/linux-x64/${jre.dirname.linux}/lib</directory>
+ <directory>${unpack.dir}/linux-x64/${jre.dirname.linux.x64}/lib</directory>
<outputDirectory>jre/lib</outputDirectory>
<includes>
<include>jspawnhelper</include>
diff --git a/src/main/assembly/dist-macosx-aarch64.xml b/src/main/assembly/dist-macosx-aarch64.xml
index 2329b9b..ecddba0 100644
--- a/src/main/assembly/dist-macosx-aarch64.xml
+++ b/src/main/assembly/dist-macosx-aarch64.xml
@@ -9,7 +9,7 @@
<!-- jre basic, except bin/ and misc -->
<fileSet>
- <directory>${unpack.dir}/macosx-aarch64/${jre.dirname.macosx}</directory>
+ <directory>${unpack.dir}/macosx-aarch64/${jre.dirname.macosx.aarch64}</directory>
<outputDirectory>jre</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
@@ -20,7 +20,7 @@
<!-- jre bin/java -->
<fileSet>
- <directory>${unpack.dir}/macosx-aarch64/${jre.dirname.macosx}/bin</directory>
+ <directory>${unpack.dir}/macosx-aarch64/${jre.dirname.macosx.aarch64}/bin</directory>
<outputDirectory>jre/bin</outputDirectory>
<includes>
<include>java</include>
@@ -30,7 +30,7 @@
<!-- jre lib executable files -->
<fileSet>
- <directory>${unpack.dir}/macosx-aarch64/${jre.dirname.macosx}/lib</directory>
+ <directory>${unpack.dir}/macosx-aarch64/${jre.dirname.macosx.aarch64}/lib</directory>
<outputDirectory>jre/lib</outputDirectory>
<includes>
<include>jspawnhelper</include>
diff --git a/src/main/assembly/dist-macosx-x64.xml b/src/main/assembly/dist-macosx-x64.xml
index 9429ff6..3967d1b 100644
--- a/src/main/assembly/dist-macosx-x64.xml
+++ b/src/main/assembly/dist-macosx-x64.xml
@@ -9,7 +9,7 @@
<!-- jre basic, except bin/ and misc -->
<fileSet>
- <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx}</directory>
+ <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx.x64}</directory>
<outputDirectory>jre</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
@@ -20,7 +20,7 @@
<!-- jre bin/java -->
<fileSet>
- <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx}/bin</directory>
+ <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx.x64}/bin</directory>
<outputDirectory>jre/bin</outputDirectory>
<includes>
<include>java</include>
@@ -30,7 +30,7 @@
<!-- jre lib executable files -->
<fileSet>
- <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx}/lib</directory>
+ <directory>${unpack.dir}/macosx-x64/${jre.dirname.macosx.x64}/lib</directory>
<outputDirectory>jre/lib</outputDirectory>
<includes>
<include>jspawnhelper</include>
diff --git a/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java b/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java
index 4e39a4f..762e9e2 100644
--- a/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java
+++ b/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java
@@ -44,11 +44,11 @@ class SystemInfo {
static void print() {
LOG.info("SonarScanner CLI {}", ScannerVersion.version());
- LOG.atInfo().log(SystemInfo::java);
+ LOG.atDebug().log(SystemInfo::java);
LOG.atInfo().log(SystemInfo::os);
String scannerOpts = system.getenv("SONAR_SCANNER_OPTS");
if (scannerOpts != null) {
- LOG.atInfo().addArgument(() -> redactSensitiveArguments(scannerOpts)).log("SONAR_SCANNER_OPTS={}");
+ LOG.atDebug().addArgument(() -> redactSensitiveArguments(scannerOpts)).log("SONAR_SCANNER_OPTS={}");
}
}
diff --git a/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java
index da00b00..6e8698c 100644
--- a/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java
+++ b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java
@@ -74,7 +74,21 @@ class SystemInfoTest {
}
@Test
- void should_print() {
+ void should_print_scanner_version_and_os_at_info() {
+ mockOs();
+ mockJava();
+
+ SystemInfo.print();
+
+ verify(mockSystem).getProperty("os.version");
+
+ assertThat(logTester.logs(Level.INFO))
+ .containsOnly("SonarScanner CLI " + ScannerVersion.version(), "linux 2.5 x64");
+ }
+
+ @Test
+ void should_print_jvm_version_and_opts_at_debug() {
+ logTester.setLevel(Level.DEBUG);
mockOs();
mockJava();
when(mockSystem.getenv("SONAR_SCANNER_OPTS")).thenReturn("arg");
@@ -85,12 +99,13 @@ class SystemInfoTest {
verify(mockSystem).getProperty("os.version");
verify(mockSystem).getenv("SONAR_SCANNER_OPTS");
- assertThat(logTester.logs(Level.INFO))
- .containsOnly("SonarScanner CLI " + ScannerVersion.version(), "Java 1.9 oracle (64-bit)", "linux 2.5 x64", "SONAR_SCANNER_OPTS=arg");
+ assertThat(logTester.logs(Level.DEBUG))
+ .containsOnly("Java 1.9 oracle (64-bit)", "SONAR_SCANNER_OPTS=arg");
}
@Test
void should_not_print_sensitive_data() {
+ logTester.setLevel(Level.DEBUG);
mockOs();
mockJava();
when(mockSystem.getenv("SONAR_SCANNER_OPTS"))
@@ -98,6 +113,6 @@ class SystemInfoTest {
SystemInfo.print();
- assertThat(logTester.logs(Level.INFO)).contains("SONAR_SCANNER_OPTS=-Dsonar.login=* -Dsonar.whatever=whatever -Dsonar.password=* -Dsonar.whatever2=whatever2 -Dsonar.token=*");
+ assertThat(logTester.logs(Level.DEBUG)).contains("SONAR_SCANNER_OPTS=-Dsonar.login=* -Dsonar.whatever=whatever -Dsonar.password=* -Dsonar.whatever2=whatever2 -Dsonar.token=*");
}
}
diff --git a/src/test/java/testutils/LogTester.java b/src/test/java/testutils/LogTester.java
index 4b87c52..8a9d0f0 100644
--- a/src/test/java/testutils/LogTester.java
+++ b/src/test/java/testutils/LogTester.java
@@ -28,6 +28,8 @@ import org.junit.jupiter.api.extension.ExtensionContext;
import org.slf4j.LoggerFactory;
import org.slf4j.event.Level;
+import static java.util.stream.Collectors.*;
+
public class LogTester implements BeforeEachCallback, AfterEachCallback {
private final ConcurrentListAppender<ILoggingEvent> listAppender = new ConcurrentListAppender<>();
@@ -55,7 +57,7 @@ public class LogTester implements BeforeEachCallback, AfterEachCallback {
public List<String> logs() {
return listAppender.list.stream().map(e -> (LoggingEvent) e)
.map(LoggingEvent::getFormattedMessage)
- .toList();
+ .collect(toList());
}
/**
@@ -66,7 +68,7 @@ public class LogTester implements BeforeEachCallback, AfterEachCallback {
return listAppender.list.stream().map(e -> (LoggingEvent) e)
.filter(e -> e.getLevel().equals(ch.qos.logback.classic.Level.fromLocationAwareLoggerInteger(level.toInt())))
.map(LoggingEvent::getFormattedMessage)
- .toList();
+ .collect(toList());
}
public LogTester clear() {
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-30 17:45:52 +0000