5 files changed, 14 insertions, 14 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={}");
     }
   }