Skip to content
Open
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 still points at the old fixture 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 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

Was this helpful? React with 👍 / 👎

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