diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2025-01-09 17:36:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-09 16:36:28 +0000 |
| commit | 4b01d1b8d0d0c9d217fd466484cda461bf548a13 (patch) | |
| tree | 681a9e917ae55eedf3720a360fb2ed45504a0a93 | |
| parent | 2e5f66e99ca00cab5d689a0daebd2f5a7f44f371 (diff) | |
| download | sonar-scanner-cli-4b01d1b8d0d0c9d217fd466484cda461bf548a13.tar.gz sonar-scanner-cli-4b01d1b8d0d0c9d217fd466484cda461bf548a13.zip | |
SCANCLI-166 Update license headers for 2025
27 files changed, 33 insertions, 29 deletions
@@ -6,7 +6,7 @@ <parent> <groupId>org.sonarsource.parent</groupId> <artifactId>parent</artifactId> - <version>82.0.0.2314</version> + <version>83.0.0.2369</version> <relativePath /> </parent> diff --git a/it/src/test/java/com/sonarsource/scanner/it/DistributionTest.java b/it/src/test/java/com/sonarsource/scanner/it/DistributionTest.java index 71192bb..9506bd9 100644 --- a/it/src/test/java/com/sonarsource/scanner/it/DistributionTest.java +++ b/it/src/test/java/com/sonarsource/scanner/it/DistributionTest.java @@ -1,6 +1,6 @@ /* * SonarSource :: IT :: SonarScanner CLI - * Copyright (C) 2009-2024 SonarSource SA + * Copyright (C) 2009-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/it/src/test/java/com/sonarsource/scanner/it/MultimoduleTest.java b/it/src/test/java/com/sonarsource/scanner/it/MultimoduleTest.java index 66c338e..e16c146 100644 --- a/it/src/test/java/com/sonarsource/scanner/it/MultimoduleTest.java +++ b/it/src/test/java/com/sonarsource/scanner/it/MultimoduleTest.java @@ -1,6 +1,6 @@ /* * SonarSource :: IT :: SonarScanner CLI - * Copyright (C) 2009-2024 SonarSource SA + * Copyright (C) 2009-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java b/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java index 6381951..2e690ce 100644 --- a/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java +++ b/it/src/test/java/com/sonarsource/scanner/it/ScannerTest.java @@ -1,6 +1,6 @@ /* * SonarSource :: IT :: SonarScanner CLI - * Copyright (C) 2009-2024 SonarSource SA + * Copyright (C) 2009-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java index abb699e..6b12552 100644 --- a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java +++ b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java @@ -1,6 +1,6 @@ /* * SonarSource :: IT :: SonarScanner CLI - * Copyright (C) 2009-2024 SonarSource SA + * Copyright (C) 2009-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or @@ -116,8 +116,12 @@ public abstract class ScannerTestCase { SonarScanner newScannerWithAdminCredentials(File baseDir, String... keyValueProperties) { SonarScanner scannerCli = SonarScanner.create(baseDir, keyValueProperties); scannerCli.setScannerVersion(artifactVersion().toString()); - scannerCli.setProperty("sonar.login", Server.ADMIN_LOGIN); - scannerCli.setProperty("sonar.password", Server.ADMIN_PASSWORD); + if (orchestrator.getServer().version().isGreaterThanOrEquals(25, 1)) { + scannerCli.setProperty("sonar.token", orchestrator.getDefaultAdminToken()); + } else { + scannerCli.setProperty("sonar.login", Server.ADMIN_LOGIN); + scannerCli.setProperty("sonar.password", Server.ADMIN_PASSWORD); + } return scannerCli; } diff --git a/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java b/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java index a6a128f..d4c8c36 100644 --- a/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java +++ b/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java @@ -1,6 +1,6 @@ /* * SonarSource :: IT :: SonarScanner CLI - * Copyright (C) 2009-2024 SonarSource SA + * Copyright (C) 2009-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or @@ -5,7 +5,7 @@ <parent> <groupId>org.sonarsource.parent</groupId> <artifactId>parent</artifactId> - <version>82.0.0.2314</version> + <version>83.0.0.2369</version> </parent> <groupId>org.sonarsource.scanner.cli</groupId> diff --git a/src/main/java/org/sonarsource/scanner/cli/Cli.java b/src/main/java/org/sonarsource/scanner/cli/Cli.java index a39b0af..db25dcc 100644 --- a/src/main/java/org/sonarsource/scanner/cli/Cli.java +++ b/src/main/java/org/sonarsource/scanner/cli/Cli.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/main/java/org/sonarsource/scanner/cli/Conf.java b/src/main/java/org/sonarsource/scanner/cli/Conf.java index d71d82c..a0f75c1 100644 --- a/src/main/java/org/sonarsource/scanner/cli/Conf.java +++ b/src/main/java/org/sonarsource/scanner/cli/Conf.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/main/java/org/sonarsource/scanner/cli/Exit.java b/src/main/java/org/sonarsource/scanner/cli/Exit.java index d265bed..7c9cd66 100644 --- a/src/main/java/org/sonarsource/scanner/cli/Exit.java +++ b/src/main/java/org/sonarsource/scanner/cli/Exit.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/main/java/org/sonarsource/scanner/cli/Main.java b/src/main/java/org/sonarsource/scanner/cli/Main.java index df60585..b103418 100644 --- a/src/main/java/org/sonarsource/scanner/cli/Main.java +++ b/src/main/java/org/sonarsource/scanner/cli/Main.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/main/java/org/sonarsource/scanner/cli/PropertyResolver.java b/src/main/java/org/sonarsource/scanner/cli/PropertyResolver.java index 0b33f8b..3dba3d3 100644 --- a/src/main/java/org/sonarsource/scanner/cli/PropertyResolver.java +++ b/src/main/java/org/sonarsource/scanner/cli/PropertyResolver.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/main/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactory.java b/src/main/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactory.java index a0983d9..b66f4b0 100644 --- a/src/main/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactory.java +++ b/src/main/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactory.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/main/java/org/sonarsource/scanner/cli/ScannerVersion.java b/src/main/java/org/sonarsource/scanner/cli/ScannerVersion.java index 831841b..bdcf91a 100644 --- a/src/main/java/org/sonarsource/scanner/cli/ScannerVersion.java +++ b/src/main/java/org/sonarsource/scanner/cli/ScannerVersion.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/main/java/org/sonarsource/scanner/cli/Stats.java b/src/main/java/org/sonarsource/scanner/cli/Stats.java index 28cb88d..0f78c18 100644 --- a/src/main/java/org/sonarsource/scanner/cli/Stats.java +++ b/src/main/java/org/sonarsource/scanner/cli/Stats.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java b/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java index 205a902..4e39a4f 100644 --- a/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java +++ b/src/main/java/org/sonarsource/scanner/cli/SystemInfo.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/main/java/org/sonarsource/scanner/cli/package-info.java b/src/main/java/org/sonarsource/scanner/cli/package-info.java index 09a8d86..2420e5d 100644 --- a/src/main/java/org/sonarsource/scanner/cli/package-info.java +++ b/src/main/java/org/sonarsource/scanner/cli/package-info.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/test/java/org/sonar/api/utils/MessageException.java b/src/test/java/org/sonar/api/utils/MessageException.java index e388c9d..b4fcc5f 100644 --- a/src/test/java/org/sonar/api/utils/MessageException.java +++ b/src/test/java/org/sonar/api/utils/MessageException.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/test/java/org/sonarsource/scanner/cli/CliTest.java b/src/test/java/org/sonarsource/scanner/cli/CliTest.java index 5cb05d8..dcf84d7 100644 --- a/src/test/java/org/sonarsource/scanner/cli/CliTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/CliTest.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/test/java/org/sonarsource/scanner/cli/ConfTest.java b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java index 280c7b7..0c737b5 100644 --- a/src/test/java/org/sonarsource/scanner/cli/ConfTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/ConfTest.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/test/java/org/sonarsource/scanner/cli/MainTest.java b/src/test/java/org/sonarsource/scanner/cli/MainTest.java index 48b2ed3..36e21a4 100644 --- a/src/test/java/org/sonarsource/scanner/cli/MainTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/MainTest.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/test/java/org/sonarsource/scanner/cli/PropertyResolverTest.java b/src/test/java/org/sonarsource/scanner/cli/PropertyResolverTest.java index a22f9f6..f5c2792 100644 --- a/src/test/java/org/sonarsource/scanner/cli/PropertyResolverTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/PropertyResolverTest.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/test/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactoryTest.java b/src/test/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactoryTest.java index c25ddb1..f1842ae 100644 --- a/src/test/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactoryTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/ScannerEngineBootstrapperFactoryTest.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/test/java/org/sonarsource/scanner/cli/StatsTest.java b/src/test/java/org/sonarsource/scanner/cli/StatsTest.java index 174acbc..fa888a6 100644 --- a/src/test/java/org/sonarsource/scanner/cli/StatsTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/StatsTest.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java index b372d9c..da00b00 100644 --- a/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java +++ b/src/test/java/org/sonarsource/scanner/cli/SystemInfoTest.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/test/java/testutils/ConcurrentListAppender.java b/src/test/java/testutils/ConcurrentListAppender.java index b31e34e..f8b9ed0 100644 --- a/src/test/java/testutils/ConcurrentListAppender.java +++ b/src/test/java/testutils/ConcurrentListAppender.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or diff --git a/src/test/java/testutils/LogTester.java b/src/test/java/testutils/LogTester.java index 1708479..4b87c52 100644 --- a/src/test/java/testutils/LogTester.java +++ b/src/test/java/testutils/LogTester.java @@ -1,6 +1,6 @@ /* * SonarScanner CLI - * Copyright (C) 2011-2024 SonarSource SA + * Copyright (C) 2011-2025 SonarSource SA * mailto:info AT sonarsource DOT com * * This program is free software; you can redistribute it and/or |