Skip to content

RC-352 Move sonar-server ruling project to the repository root - #18

Merged
romainbrenguier merged 1 commit into
masterfrom
move-sonar-server
Nov 16, 2026
Merged

romainbrenguier merged 1 commit into
masterfrom
move-sonar-server

Conversation

@romainbrenguier

@romainbrenguier romainbrenguier commented Oct 29, 2026 •

Copy link
Copy Markdown

Summary

  • Move the SonarQube 6.5 sonar-server fixture to the top-level sonar-server directory.
  • Resolve its Maven parent from the repository rather than the removed local parent hierarchy.
  • Remove the unused wrapper POMs, README, and ignore file.

Companion PRs

These consumers build sonar-server from this repository and must bump its/sources together with their ruling test update:

Merge this fixture PR first. Until their companion PRs merge, the consumers must keep their its/sources submodule pinned before this commit.

Validation

  • Verified all 2,960 moved files are byte-for-byte unchanged except for the intended Maven parent relative-path update.
  • git diff --check HEAD passes.
  • Ruling integration tests are intentionally left to CI.
  • The automatic secrets scan timed out; secrets were not checked.

Part of RC-352

@gitar-bot

gitar-bot Bot commented Oct 29, 2026 •

Copy link
Copy Markdown
Code Review ✅ Approved 🟡 Medium risk 1 closed / 1 findings

Moving the 6.5 server fixture to sonar-server and changing its Maven parent path could break fixture builds or dependent ruling tests if path resolution differs.

Moves the SonarQube 6.5 sonar-server ruling fixture to the repository root, with its Maven parent resolved from the repository and unused wrapper POMs, README, and ignore file removed. The previously open finding about the stale symbolic-execution fixture path was addressed in #19. No open issues remain.

✅ 1 closed
✅ Cross-Repo: sonar-java-symbolic-execution ruling still points at the old fixture path

📄 sonar-server/pom.xml:8
Fix here and in SonarSource/sonar-java-symbolic-execution

Breaks in: SonarSource/sonar-java-symbolic-execution - its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java - JavaRulingTest.sonarqube_server

This PR moves the fixture from sonarqube-6.5/server/sonar-server to the top-level sonar-server directory and deletes the wrapper POMs. In SonarSource/sonar-java-symbolic-execution, JavaRulingTest.sonarqube_server (its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java) still builds ../sources/sonarqube-6.5/server/sonar-server/pom.xml. The next time that repo bumps its its/sources submodule past this commit, the POM will be missing and the ruling test will fail. The PR description names only SonarSource/sonar-java#6436 as a companion, so nothing covers this second consumer. Its expected baselines are keyed by the project/component path, so they will likely need regenerating as well.

Here: Add SonarSource/sonar-java-symbolic-execution to the companion list in the PR description, and hold the merge until a matching PR exists there (or state that its submodule must stay pinned until then).

There: In JavaRulingTest.sonarqube_server, change the POM path to ../sources/sonar-server/pom.xml. Do this in the same change that bumps its/sources, and regenerate the expected ruling baselines for the moved project.

In SonarSource/sonar-java-symbolic-execution - its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java:

// its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java (sonarqube_server)
MavenBuild build = test_project("org.sonarsource.sonarqube:sonar-server", "sonar-server", ...);
// was: "sonarqube-6.5/server/sonar-server"
// POM: ../sources/sonar-server/pom.xml
Verification Repos 2 inspected · PRs 3 inspected

Functional validation No results

Rules 1 not applicable

Broader impact Repos 2 inspected PRs 3 inspected
Cross-repo 2 repositories inspected 0 open impacts

SonarSource/sonar-java Inspected
SonarSource/sonar-java-symbolic-execution Inspected

Cross-PR 3 PRs inspected 0 open impacts

PR 6436: RC-352 Update ruling tests for the relocated sonar-server fixture Inspected
PR 6403: SONARJAVA-7240: Improve S9398 to allow helper and builder types nested in interfaces Inspected
PR 6429: Test ruling-diff action across all ruling projects Inspected

Auto-approval Not enabled

Set up

For more verification details, comment gitar display:verbose.

Options

Auto-apply is off → Gitar will not commit updates to this branch.
Display: compact → Showing compact verification results.

Comment with these commands to change the behavior for this request:

Auto-apply Compact
gitar auto-apply:on         
gitar display:verbose         

Was this helpful? React with 👍 / 👎 | Gitar

Comment thread sonar-server/pom.xml Resolved

@BartLucien BartLucien left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@romainbrenguier
romainbrenguier merged commit 59f36d6 into master Nov 16, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants