Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>org.sonarsource.sonarqube</groupId>
<artifactId>server</artifactId>
<version>6.5</version>
<relativePath>..</relativePath>
<relativePath/>

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Cross-Repo: sonar-java-symbolic-execution ruling test still uses the sonarqube-6.5 path

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 deletes the sonarqube-6.5/ tree on se-engine and moves the fixture to sonar-server/ (see sonar-server/pom.xml:8, which now resolves its parent through <relativePath/>). se-engine is the branch that the its/sources submodule in SonarSource/sonar-java-symbolic-execution tracks. On that repo's default branch, 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. When the submodule is bumped to this commit, that POM is gone, so the Maven build fails and the ruling test fails too. The expected baselines are keyed by the old project path, so they will most likely need regenerating as well.

The PR description already plans a companion PR there, so the break is intended. It only stays safe if the submodule bump, the path change and the baseline update land together in that one companion PR.

Here: Keep this PR in draft until the companion sonar-java-symbolic-execution PR exists and is green. Link it by URL in the description, and state that its/sources must not move to this commit by itself.

There: In the same PR that bumps its/sources to this commit, change the POM path in JavaRulingTest.sonarqube_server to ../sources/sonar-server/pom.xml and update the project/component naming. Then 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 now at: ../sources/sonar-server/pom.xml

Was this helpful? React with 👍 / 👎

</parent>
<artifactId>sonar-server</artifactId>
<name>SonarQube :: Server</name>
Expand Down
Loading