Skip to content

SONARJAVA-5611 Use lightweight Enterprise SQ edition in integration tests #5157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erwan-serandour merged 1 commit into from
Jun 16, 2025
Merged

SONARJAVA-5611 Use lightweight Enterprise SQ edition in integration tests #5157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions its/autoscan/src/test/java/org/sonar/java/it/AutoScanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public class AutoScanTest {

@ClassRule
public static OrchestratorRule orchestrator = OrchestratorRule.builderEnv()
.setEdition(com.sonar.orchestrator.container.Edition.ENTERPRISE_LW)
.activateLicense()
.useDefaultAdminCredentialsForBuilds(true)
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
.addPlugin(FileLocation.of(TestClasspathUtils.findModuleJarPath("../../sonar-java-plugin").toFile()))
Expand Down
3 changes: 2 additions & 1 deletion its/plugin/tests/src/test/java/com/sonar/it/java/JspTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ private static OrchestratorRule getEnterpriseOrchestratorOrNull() {
OrchestratorRuleBuilder orchestratorBuilder = OrchestratorRule.builderEnv()
.useDefaultAdminCredentialsForBuilds(true)
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
.setEdition(Edition.ENTERPRISE)
.setEdition(Edition.ENTERPRISE_LW)
.activateLicense()
.addPlugin(JavaTestSuite.JAVA_PLUGIN_LOCATION)
// we need html plugin to have "jsp" language
.addPlugin(MavenLocation.of("org.sonarsource.html", "sonar-html-plugin", "DEV"))
Expand Down
2 changes: 2 additions & 0 deletions its/plugin/tests/src/test/java/com/sonar/it/java/suite/CacheEnabledTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public void test_cache_is_disabled() {

private static OrchestratorRule initServer() {
return OrchestratorRule.builderEnv()
.setEdition(com.sonar.orchestrator.container.Edition.ENTERPRISE_LW)
.activateLicense()
.useDefaultAdminCredentialsForBuilds(true)
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
.addPlugin(JavaTestSuite.JAVA_PLUGIN_LOCATION)
Expand Down
2 changes: 2 additions & 0 deletions its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ public class JavaTestSuite {
OrchestratorRuleBuilder orchestratorBuilder = OrchestratorRule.builderEnv()
.useDefaultAdminCredentialsForBuilds(true)
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
.setEdition(com.sonar.orchestrator.container.Edition.ENTERPRISE_LW)
.activateLicense()
.addPlugin(JAVA_PLUGIN_LOCATION)
// for support of custom rules
.addPlugin(FileLocation.of(TestUtils.pluginJar("java-extension-plugin")))
Expand Down
2 changes: 1 addition & 1 deletion its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private static OrchestratorRule createOrchestrator() {
if (isCommunityEditionTestsOnly()) {
orchestratorBuilder.setEdition(Edition.COMMUNITY);
} else {
orchestratorBuilder.setEdition(Edition.DEVELOPER)
orchestratorBuilder.setEdition(Edition.ENTERPRISE_LW)
.activateLicense();
}
return orchestratorBuilder.build();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<sonar.plugin.api.version>11.0.0.2664</sonar.plugin.api.version>
<sonarlint.plugin.api.version>10.13.0.79996</sonarlint.plugin.api.version>
<analyzer.commons.version>2.17.0.3322</analyzer.commons.version>
<orchestrator.version>5.5.0.2535</orchestrator.version>
<orchestrator.version>5.6.2.2625</orchestrator.version>
<sslr.version>1.24.0.633</sslr.version>
<argLine>-Xmx512m</argLine>
<gitRepositoryName>sonar-java</gitRepositoryName>
Expand Down