Skip to content

Commit a619f5e

Browse files
ericg138ericg138
committed
BUILD-4823 Rename sonar-scanner-commons to sonar-scanner-java-library
1 parent c09a88b commit a619f5e

89 files changed

Lines changed: 268 additions & 281 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.cirrus.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ env:
2020
### Project variables
2121
DEPLOY_PULL_REQUEST: true
2222
ARTIFACTS: "\
23-
org.sonarsource.scanner.commons:sonar-scanner-commons:jar,\
24-
org.sonarsource.scanner.commons:sonar-scanner-commons-batch:jar,\
25-
org.sonarsource.scanner.commons:sonar-scanner-commons-batch-interface:jar,\
26-
org.sonarsource.scanner.commons:sonar-scanner-commons-parent:jar"
23+
org.sonarsource.scanner.lib:sonar-scanner-java-library:jar,\
24+
org.sonarsource.scanner.lib:sonar-scanner-java-library-batch:jar,\
25+
org.sonarsource.scanner.lib:sonar-scanner-java-library-batch-interface:jar,\
26+
org.sonarsource.scanner.lib:sonar-scanner-java-library-parent:jar"
2727

2828
#
2929
# RE-USABLE CONFIGS

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# SonarQube Scanner Commons
1+
# SonarScanner Java Library
22

33
Common library used by many Scanners (SQ Scanner, SQ Scanner for Maven, SQ Scanner for Gradle, SQ Scanner for Ant, ...).
44

5-
Used to programmatically run SQ analysis to help developers write [Clean Code](https://www.sonarsource.com/solutions/clean-code/?utm_medium=referral&utm_source=github&utm_campaign=clean-code&utm_content=sonar-scanner-commons).
5+
Used to programmatically run SQ analysis to help developers write [Clean Code](https://www.sonarsource.com/solutions/clean-code/?utm_medium=referral&utm_source=github&utm_campaign=clean-code&utm_content=sonar-scanner-java-library).
66

77
![Build Status](https://api.cirrus-ci.com/github/SonarSource/sonar-scanner-api.svg)
88

‎batch-interface/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>org.sonarsource.scanner.commons</groupId>
5-
<artifactId>sonar-scanner-commons-parent</artifactId>
4+
<groupId>org.sonarsource.scanner.lib</groupId>
5+
<artifactId>sonar-scanner-java-library-parent</artifactId>
66
<version>2.17-SNAPSHOT</version>
77
</parent>
88

9-
<artifactId>sonar-scanner-commons-batch-interface</artifactId>
10-
<name>SonarQube Scanner Commons - Batch Interface</name>
9+
<artifactId>sonar-scanner-java-library-batch-interface</artifactId>
10+
<name>SonarScanner Java Library - Batch Interface</name>
1111

1212
</project>

batch-interface/src/main/java/org/sonarsource/scanner/api/internal/batch/IsolatedLauncher.java renamed to batch-interface/src/main/java/org/sonarsource/scanner/lib/internal/batch/IsolatedLauncher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SonarQube Scanner Commons - Batch Interface
2+
* SonarScanner Java Library - Batch Interface
33
* Copyright (C) 2011-2024 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
@@ -17,7 +17,7 @@
1717
* along with this program; if not, write to the Free Software Foundation,
1818
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*/
20-
package org.sonarsource.scanner.api.internal.batch;
20+
package org.sonarsource.scanner.lib.internal.batch;
2121

2222
import java.util.Map;
2323

batch-interface/src/main/java/org/sonarsource/scanner/api/internal/batch/LogOutput.java renamed to batch-interface/src/main/java/org/sonarsource/scanner/lib/internal/batch/LogOutput.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SonarQube Scanner Commons - Batch Interface
2+
* SonarScanner Java Library - Batch Interface
33
* Copyright (C) 2011-2024 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
@@ -17,7 +17,7 @@
1717
* along with this program; if not, write to the Free Software Foundation,
1818
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*/
20-
package org.sonarsource.scanner.api.internal.batch;
20+
package org.sonarsource.scanner.lib.internal.batch;
2121

2222
/**
2323
* Allow to redirect batch logs to a custom output. By defaults logs are written to System.out

batch-interface/src/main/java/org/sonarsource/scanner/api/internal/batch/package-info.java renamed to batch-interface/src/main/java/org/sonarsource/scanner/lib/internal/batch/package-info.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SonarQube Scanner Commons - Batch Interface
2+
* SonarScanner Java Library - Batch Interface
33
* Copyright (C) 2011-2024 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
@@ -17,4 +17,4 @@
1717
* along with this program; if not, write to the Free Software Foundation,
1818
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*/
20-
package org.sonarsource.scanner.api.internal.batch;
20+
package org.sonarsource.scanner.lib.internal.batch;

‎batch/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>org.sonarsource.scanner.commons</groupId>
5-
<artifactId>sonar-scanner-commons-parent</artifactId>
4+
<groupId>org.sonarsource.scanner.lib</groupId>
5+
<artifactId>sonar-scanner-java-library-parent</artifactId>
66
<version>2.17-SNAPSHOT</version>
77
</parent>
88

9-
<artifactId>sonar-scanner-commons-batch</artifactId>
10-
<name>SonarQube Scanner Commons - Batch</name>
9+
<artifactId>sonar-scanner-java-library-batch</artifactId>
10+
<name>SonarScanner Java Library - Batch</name>
1111

1212
<properties>
1313
<sonarQubeVersion>6.6</sonarQubeVersion>
@@ -16,7 +16,7 @@
1616
<dependencies>
1717
<dependency>
1818
<groupId>${project.groupId}</groupId>
19-
<artifactId>sonar-scanner-commons-batch-interface</artifactId>
19+
<artifactId>sonar-scanner-java-library-batch-interface</artifactId>
2020
<version>${project.version}</version>
2121
<scope>provided</scope>
2222
</dependency>

batch/src/main/java/org/sonarsource/scanner/api/internal/batch/BatchFactory.java renamed to batch/src/main/java/org/sonarsource/scanner/lib/internal/batch/BatchFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SonarQube Scanner Commons - Batch
2+
* SonarScanner Java Library - Batch
33
* Copyright (C) 2011-2024 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
@@ -17,11 +17,11 @@
1717
* along with this program; if not, write to the Free Software Foundation,
1818
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*/
20-
package org.sonarsource.scanner.api.internal.batch;
20+
package org.sonarsource.scanner.lib.internal.batch;
2121

2222
import java.util.Map;
2323
import org.sonar.batch.bootstrapper.Batch;
2424

2525
interface BatchFactory {
26-
Batch createBatch(Map<String, String> properties, final org.sonarsource.scanner.api.internal.batch.LogOutput logOutput);
26+
Batch createBatch(Map<String, String> properties, final LogOutput logOutput);
2727
}

batch/src/main/java/org/sonarsource/scanner/api/internal/batch/BatchIsolatedLauncher.java renamed to batch/src/main/java/org/sonarsource/scanner/lib/internal/batch/BatchIsolatedLauncher.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SonarQube Scanner Commons - Batch
2+
* SonarScanner Java Library - Batch
33
* Copyright (C) 2011-2024 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
@@ -17,7 +17,7 @@
1717
* along with this program; if not, write to the Free Software Foundation,
1818
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*/
20-
package org.sonarsource.scanner.api.internal.batch;
20+
package org.sonarsource.scanner.lib.internal.batch;
2121

2222
import java.io.BufferedReader;
2323
import java.io.IOException;
@@ -42,7 +42,7 @@ public BatchIsolatedLauncher(BatchFactory factory) {
4242
}
4343

4444
@Override
45-
public void execute(Map<String, String> properties, org.sonarsource.scanner.api.internal.batch.LogOutput logOutput) {
45+
public void execute(Map<String, String> properties, LogOutput logOutput) {
4646
factory.createBatch(properties, logOutput).execute();
4747
}
4848

batch/src/main/java/org/sonarsource/scanner/api/internal/batch/DefaultBatchFactory.java renamed to batch/src/main/java/org/sonarsource/scanner/lib/internal/batch/DefaultBatchFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SonarQube Scanner Commons - Batch
2+
* SonarScanner Java Library - Batch
33
* Copyright (C) 2011-2024 SonarSource SA
44
* mailto:info AT sonarsource DOT com
55
*
@@ -17,7 +17,7 @@
1717
* along with this program; if not, write to the Free Software Foundation,
1818
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1919
*/
20-
package org.sonarsource.scanner.api.internal.batch;
20+
package org.sonarsource.scanner.lib.internal.batch;
2121

2222
import java.util.Map;
2323
import org.sonar.batch.bootstrapper.Batch;
@@ -28,7 +28,7 @@ class DefaultBatchFactory implements BatchFactory {
2828
private static final String SCANNER_APP_VERSION_KEY = "sonar.scanner.appVersion";
2929

3030
@Override
31-
public Batch createBatch(Map<String, String> properties, final org.sonarsource.scanner.api.internal.batch.LogOutput logOutput) {
31+
public Batch createBatch(Map<String, String> properties, final LogOutput logOutput) {
3232
EnvironmentInformation env = new EnvironmentInformation(properties.get(SCANNER_APP_KEY), properties.get(SCANNER_APP_VERSION_KEY));
3333
return Batch.builder()
3434
.setEnvironment(env)

0 commit comments

Comments
 (0)