Skip to content

Commit 8ce779a

Browse files
authored
JAVASE-4 Use lightweight Enterprise SQ edition in integration tests (#22)
1 parent 821d332 commit 8ce779a

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

.cirrus.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ ruling_task:
9696
- git submodule update --init --recursive
9797
env:
9898
MAVEN_OPTS: "-Xmx3g"
99+
GITHUB_TOKEN: VAULT[development/github/token/licenses-ro token]
99100
matrix:
100101
# Supported values for JAVA_PLUGIN_VERSION:
101102
# LATEST_RELEASE, LATEST_MASTER, LATEST_DOGFOOD, POM_PROPERTY or a fixed version like 8.15.0.39249

its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.sonar.orchestrator.build.BuildResult;
2323
import com.sonar.orchestrator.build.MavenBuild;
2424
import com.sonar.orchestrator.build.SonarScanner;
25+
import com.sonar.orchestrator.container.Edition;
2526
import com.sonar.orchestrator.container.Server;
2627
import com.sonar.orchestrator.junit4.OrchestratorRule;
2728
import com.sonar.orchestrator.junit4.OrchestratorRuleBuilder;
@@ -73,6 +74,8 @@ public class JavaRulingTest {
7374

7475
private static OrchestratorRule createOrchestrator() {
7576
OrchestratorRuleBuilder orchestratorBuilder = OrchestratorRule.builderEnv()
77+
.setEdition(Edition.ENTERPRISE_LW)
78+
.activateLicense()
7679
.useDefaultAdminCredentialsForBuilds(true)
7780
.setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
7881
.addPlugin(MavenLocation.of("org.sonarsource.java", "sonar-java-plugin", System.getProperty("sonar.java.version", "DEV")))

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<sonar.plugin.api.version>11.0.0.2664</sonar.plugin.api.version>
8686
<sonarlint.plugin.api.version>10.13.0.79996</sonarlint.plugin.api.version>
8787
<analyzer.commons.version>2.17.0.3322</analyzer.commons.version>
88-
<orchestrator.version>5.5.0.2535</orchestrator.version>
88+
<orchestrator.version>5.6.2.2625</orchestrator.version>
8989
<sslr.version>1.24.0.633</sslr.version>
9090
<argLine>-Xmx512m</argLine>
9191
<gitRepositoryName>sonar-java-symbolic-execution</gitRepositoryName>

0 commit comments

Comments
 (0)