SCA-699 Use .tar.xzHEADmaster

4 files changed, 15 insertions, 15 deletions

diff --git a/server/sonar-ce-common/src/main/java/org/sonar/ce/common/scanner/ScannerReportReader.java b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/scanner/ScannerReportReader.java
index 459ba57009a..925d57bb540 100644
--- a/server/sonar-ce-common/src/main/java/org/sonar/ce/common/scanner/ScannerReportReader.java
+++ b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/scanner/ScannerReportReader.java
@@ -74,7 +74,7 @@ public interface ScannerReportReader {
 
   CloseableIterator<ScannerReport.TelemetryEntry> readTelemetryEntries();
 
-  File readDependencyFilesZip();
+  File readDependencyFilesArchive();
 
   CloseableIterator<ScannerReport.AnalysisData> readAnalysisData();
 }
diff --git a/server/sonar-ce-common/src/testFixtures/java/org/sonar/ce/common/scanner/ScannerReportReaderRule.java b/server/sonar-ce-common/src/testFixtures/java/org/sonar/ce/common/scanner/ScannerReportReaderRule.java
index 29e718bfe96..5887533d74e 100644
--- a/server/sonar-ce-common/src/testFixtures/java/org/sonar/ce/common/scanner/ScannerReportReaderRule.java
+++ b/server/sonar-ce-common/src/testFixtures/java/org/sonar/ce/common/scanner/ScannerReportReaderRule.java
@@ -64,7 +64,7 @@ public class ScannerReportReaderRule implements TestRule, ScannerReportReader, A
   private List<ScannerReport.AnalysisWarning> analysisWarnings = Collections.emptyList();
   private byte[] analysisCache;
   private List<ScannerReport.TelemetryEntry> telemetryEntries = new ArrayList<>();
-  private File dependencyFilesZip;
+  private File dependencyFilesArchive;
   private List<ScannerReport.AnalysisData> analysisData = new ArrayList<>();
 
   @Override
@@ -347,15 +347,15 @@ public class ScannerReportReaderRule implements TestRule, ScannerReportReader, A
   }
 
   @Override
-  public File readDependencyFilesZip() {
-    if (dependencyFilesZip == null) {
+  public File readDependencyFilesArchive() {
+    if (dependencyFilesArchive == null) {
       return null;
     }
-    return this.dependencyFilesZip;
+    return this.dependencyFilesArchive;
   }
 
-  public ScannerReportReaderRule putDependencyFilesZip(File dependencyFilesZip) {
-    this.dependencyFilesZip = dependencyFilesZip;
+  public ScannerReportReaderRule putDependencyFilesArchive(File dependencyFilesArchive) {
+    this.dependencyFilesArchive = dependencyFilesArchive;
     return this;
   }
 }
diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImpl.java
index 5f2627c31a0..fb39308cd00 100644
--- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImpl.java
+++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImpl.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.ce.task.projectanalysis.scanner;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,6 +36,8 @@ import org.sonar.scanner.protocol.output.FileStructure;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.LineSgnificantCode;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 public class ScannerReportReaderImpl implements ScannerReportReader {
 
   private final ScannerReportDirectoryHolder scannerReportDirectoryHolder;
@@ -235,9 +235,9 @@ public class ScannerReportReaderImpl implements ScannerReportReader {
   }
 
   @Override
-  public File readDependencyFilesZip() {
+  public File readDependencyFilesArchive() {
     ensureInitialized();
-    return delegate.readDependencyFilesZip();
+    return delegate.readDependencyFilesArchive();
   }
 
   @Override
diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImplTest.java
index 6abf97d1ba9..d954d5eb819 100644
--- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImplTest.java
+++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImplTest.java
@@ -303,9 +303,9 @@ public class ScannerReportReaderImplTest {
   }
 
   @Test
-  public void verify_readDependencyFilesZip() throws IOException {
+  public void verify_readDependencyFilesArchive() throws IOException {
     File tempDir = tempFolder.newDir();
-    File tempFile = new File(tempDir, "dependency-files.zip");
+    File tempFile = new File(tempDir, "dependency-files.tar.xz");
     byte[] expectedBytes = "hello world!".getBytes();
     try (FileOutputStream fos = new FileOutputStream(tempFile)) {
       fos.write(expectedBytes);
@@ -313,8 +313,8 @@ public class ScannerReportReaderImplTest {
 
     writer.writeScaFile(tempFile);
 
-    assertThat(underTest.readDependencyFilesZip()).isNotNull();
-    var returnBytes = FileUtils.readFileToByteArray(underTest.readDependencyFilesZip());
+    assertThat(underTest.readDependencyFilesArchive()).isNotNull();
+    var returnBytes = FileUtils.readFileToByteArray(underTest.readDependencyFilesArchive());
     assertThat(returnBytes).isEqualTo(expectedBytes);
   }
 }