Automatic merge from branch-5.6

* origin/branch-5.6:
  Fix Java plugin version in UpgradeTest

diff --cc tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java
index 88eb5e55a1b50e62dd8a630837d06c6c5e91d8f5,5020202d3dd707d1fa2599259bcdf2cc4ecba593..dd9a803c7b1015cd55799a6fcba9c9cf87ec8d7e
--- 1/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java
--- 2/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java
+++ b/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java
@@@ -63,24 -57,25 +63,24 @@@ public class UpgradeTest 
  
    @Test
    public void test_upgrade_from_5_2() {
-     testDatabaseUpgrade(Version.create("5.2"));
+     testDatabaseUpgrade(Version.create("5.2"), "3.14");
    }
  
-   private void testDatabaseUpgrade(Version fromVersion) {
-     startServer(fromVersion, false);
 -  private void testDatabaseUpgrade(Version fromVersion, String javaVersion, BeforeUpgrade... tasks) {
++  private void testDatabaseUpgrade(Version fromVersion, String javaVersion) {
+     startServer(fromVersion, javaVersion, false);
      scanProject();
      int files = countFiles(PROJECT_KEY);
      assertThat(files).isGreaterThan(0);
  
 -    for (BeforeUpgrade task : tasks) {
 -      task.execute();
 -    }
 -
      stopServer();
      // latest version
-     startServer(Version.create(Orchestrator.builderEnv().getSonarVersion()), true);
+     startServer(Version.create(Orchestrator.builderEnv().getSonarVersion()), "LATEST_RELEASE", true);
      checkSystemStatus(ServerStatusResponse.Status.DB_MIGRATION_NEEDED);
 +    checkUrlsBeforeUpgrade();
 +
      upgradeDatabase();
      checkSystemStatus(ServerStatusResponse.Status.UP);
 +    checkUrlsAfterUpgrade();
  
      assertThat(countFiles(PROJECT_KEY)).isEqualTo(files);
      scanProject();