Update to the latest scanner-java-library

4 files changed, 3 insertions, 104 deletions

diff --git a/src/main/java/org/sonarsource/scanner/cli/Conf.java b/src/main/java/org/sonarsource/scanner/cli/Conf.java
index b1cbe62..47f431f 100644
--- a/src/main/java/org/sonarsource/scanner/cli/Conf.java
+++ b/src/main/java/org/sonarsource/scanner/cli/Conf.java
@@ -81,8 +81,8 @@ class Conf {
     return resolver.resolve();
   }
 
-  private Map<String, String> loadEnvironmentProperties() {
-    return EnvironmentConfig.load(new Slf4jLogOutput());
+  private static Map<String, String> loadEnvironmentProperties() {
+    return EnvironmentConfig.load();
   }
 
   private Properties loadGlobalProperties() {
diff --git a/src/main/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactory.java b/src/main/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactory.java
index 63ee9d0..a0983d9 100644
--- a/src/main/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactory.java
+++ b/src/main/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactory.java
@@ -38,7 +38,7 @@ class ScannerEngineBootstrapperFactory {
   }
 
   ScannerEngineBootstrapper newScannerEngineBootstrapper(String appName, String appVersion) {
-    return ScannerEngineBootstrapper.create(appName, appVersion, new Slf4jLogOutput());
+    return ScannerEngineBootstrapper.create(appName, appVersion);
   }
 
 
diff --git a/src/main/java/org/sonarsource/scanner/cli/Slf4jLogOutput.java b/src/main/java/org/sonarsource/scanner/cli/Slf4jLogOutput.java
deleted file mode 100644
index 2ce5cba..0000000
--- a/src/main/java/org/sonarsource/scanner/cli/Slf4jLogOutput.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * SonarScanner CLI
- * Copyright (C) 2011-2024 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonarsource.scanner.cli;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.sonarsource.scanner.lib.LogOutput;
-
-public class Slf4jLogOutput implements LogOutput {
-
-  private static final Logger LOG = LoggerFactory.getLogger(Slf4jLogOutput.class);
-
-  @Override
-  public void log(String s, Level level) {
-    switch (level) {
-      case TRACE:
-        LOG.trace(s);
-        break;
-      case DEBUG:
-        LOG.debug(s);
-        break;
-      case INFO:
-        LOG.info(s);
-        break;
-      case WARN:
-        LOG.warn(s);
-        break;
-      case ERROR:
-        LOG.error(s);
-        break;
-    }
-  }
-}
diff --git a/src/test/java/org/sonarsource/scanner/cli/Slf4jLogOutputTest.java b/src/test/java/org/sonarsource/scanner/cli/Slf4jLogOutputTest.java
deleted file mode 100644
index adf29f4..0000000
--- a/src/test/java/org/sonarsource/scanner/cli/Slf4jLogOutputTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * SonarScanner CLI
- * Copyright (C) 2011-2024 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonarsource.scanner.cli;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.slf4j.event.Level;
-import org.sonarsource.scanner.lib.LogOutput;
-import testutils.LogTester;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class Slf4jLogOutputTest {
-
-  @RegisterExtension
-  LogTester logTester = new LogTester().setLevel(Level.TRACE);
-
-  @Test
-  void make_coverage_happy() {
-    var underTest = new Slf4jLogOutput();
-    underTest.log("trace", LogOutput.Level.TRACE);
-    underTest.log("debug", LogOutput.Level.DEBUG);
-    underTest.log("info", LogOutput.Level.INFO);
-    underTest.log("warn", LogOutput.Level.WARN);
-    underTest.log("error", LogOutput.Level.ERROR);
-
-    assertThat(logTester.logs(Level.TRACE)).containsOnly("trace");
-    assertThat(logTester.logs(Level.DEBUG)).containsOnly("debug");
-    assertThat(logTester.logs(Level.INFO)).containsOnly("info");
-    assertThat(logTester.logs(Level.WARN)).containsOnly("warn");
-    assertThat(logTester.logs(Level.ERROR)).containsOnly("error");
-  }
-
-}