Skip to content

Commit bf712d8

Browse files
henryjusonartech
authored andcommitted
SONAR-27512 Extract the scanner engine to another repo
1 parent 637e3ac commit bf712d8

963 files changed

Lines changed: 97 additions & 74196 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.

build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ subprojects {
439439
dependency 'org.aspectj:aspectjtools:1.9.25.1'
440440
dependencySet(group: 'com.squareup.okhttp3', version: '5.3.2') {
441441
entry 'okhttp'
442+
entry 'okhttp-jvm'
442443
entry 'mockwebserver'
443444
entry 'okhttp-tls'
444445
entry 'logging-interceptor'
@@ -594,7 +595,12 @@ subprojects {
594595
// to be used only in sonar-ws-generator
595596
dependency 'org.apache.velocity:velocity-engine-core:2.4.1'
596597
dependency 'com.google.code.findbugs:jsr305:3.0.2'
597-
// please keep this list alphabetically ordered
598+
// Scanner Engine
599+
dependencySet(group: 'com.sonarsource.scanner.engine', version: "${scannerEngineVersion}") {
600+
entry 'scanner-engine-community'
601+
entry 'scanner-engine-protocol-server'
602+
entry 'protobuf-utils'
603+
}
598604
}
599605
}
600606

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ webappVersion=2026.3.0.46822
2424
useLocalOrg=false
2525
useLocalSca=false
2626
eventsApiVersion=1.7.0.2189
27+
scannerEngineVersion=12.26.0.2875

server/sonar-ce-common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
api project(':server:sonar-ce-task')
3939
api project(':server:sonar-server-common')
4040
api project(':sonar-core')
41-
api project(':sonar-scanner-protocol')
41+
api 'com.sonarsource.scanner.engine:scanner-engine-protocol-server'
4242

4343
compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
4444

server/sonar-ce-common/src/main/java/org/sonar/ce/common/scanner/ScannerReportReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.io.InputStream;
2424
import java.util.Optional;
2525
import javax.annotation.CheckForNull;
26-
import org.sonar.core.util.CloseableIterator;
26+
import org.sonar.scanner.protobuf.utils.CloseableIterator;
2727
import org.sonar.scanner.protocol.output.ScannerReport;
2828

2929
public interface ScannerReportReader {

server/sonar-ce-common/src/testFixtures/java/org/sonar/ce/common/scanner/ScannerReportReaderRule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.junit.rules.TestRule;
3939
import org.junit.runner.Description;
4040
import org.junit.runners.model.Statement;
41-
import org.sonar.core.util.CloseableIterator;
41+
import org.sonar.scanner.protobuf.utils.CloseableIterator;
4242
import org.sonar.scanner.protocol.output.ScannerReport;
4343
import org.sonar.scanner.protocol.output.ScannerReport.LineSgnificantCode;
4444

server/sonar-ce-task-projectanalysis/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dependencies {
4141
api project(':server:sonar-server-common')
4242
api project(':sonar-plugin-api-impl')
4343
api project(':sonar-duplications')
44-
api project(':sonar-scanner-protocol')
44+
api 'com.sonarsource.scanner.engine:scanner-engine-protocol-server'
4545

4646
compileOnlyApi 'com.github.spotbugs:spotbugs-annotations'
4747

server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStepIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
import org.junit.Rule;
2727
import org.junit.Test;
2828
import org.sonar.api.utils.System2;
29-
import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder;
3029
import org.sonar.ce.common.scanner.ScannerReportReader;
30+
import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder;
3131
import org.sonar.ce.task.step.TestComputationStepContext;
32-
import org.sonar.core.util.CloseableIterator;
3332
import org.sonar.core.util.UuidFactoryFast;
3433
import org.sonar.db.DbTester;
3534
import org.sonar.db.component.AnalysisPropertyDto;
35+
import org.sonar.scanner.protobuf.utils.CloseableIterator;
3636
import org.sonar.scanner.protocol.output.ScannerReport;
3737

3838
import static org.apache.commons.lang3.RandomStringUtils.secure;

server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
import org.junit.Rule;
2525
import org.junit.Test;
2626
import org.sonar.api.utils.System2;
27+
import org.sonar.ce.common.scanner.ScannerReportReaderRule;
2728
import org.sonar.ce.task.CeTask;
2829
import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule;
29-
import org.sonar.ce.common.scanner.ScannerReportReaderRule;
3030
import org.sonar.ce.task.step.TestComputationStepContext;
31-
import org.sonar.core.util.CloseableIterator;
3231
import org.sonar.db.DbClient;
3332
import org.sonar.db.DbTester;
33+
import org.sonar.scanner.protobuf.utils.CloseableIterator;
3434

3535
import static java.util.Arrays.asList;
3636
import static java.util.Collections.emptyList;

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/ScannerContextImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.Map;
2424
import javax.annotation.concurrent.Immutable;
2525
import org.sonar.api.ce.posttask.ScannerContext;
26-
import org.sonar.core.util.CloseableIterator;
26+
import org.sonar.scanner.protobuf.utils.CloseableIterator;
2727
import org.sonar.scanner.protocol.output.ScannerReport;
2828

2929
@Immutable

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/IssueResolutionVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
import org.sonar.core.config.CorePropertyDefinitions;
4343
import org.sonar.core.issue.DefaultIssue;
4444
import org.sonar.core.rule.RuleType;
45-
import org.sonar.core.util.CloseableIterator;
4645
import org.sonar.db.user.UserIdDto;
46+
import org.sonar.scanner.protobuf.utils.CloseableIterator;
4747
import org.sonar.scanner.protocol.output.ScannerReport.IssueResolution;
4848
import org.sonar.scanner.protocol.output.ScannerReport.IssueResolutionStatus;
4949
import org.sonar.server.issue.IssueFieldsSetter;

0 commit comments

Comments
 (0)