SONAR-5037 Remove "automatic" plugin upgrade features from "system updates" tab

diff --git a/server/sonar-web/pom.xml b/server/sonar-web/pom.xml
index e61cb39ede6753e57c2a92451e5c4835b27294e7..cc6e2043a1bd479d3c5cec68a617f1c4fc366059 100644 (file)
--- a/server/sonar-web/pom.xml
+++ b/server/sonar-web/pom.xml
@@ -350,7 +350,6 @@
                 <sonar.log.console>true</sonar.log.console>
                 <sonar.log.profilingLevel>BASIC</sonar.log.profilingLevel>
                 <sonar.web.context>/dev</sonar.web.context>
-                <sonar.updatecenter.activate>false</sonar.updatecenter.activate>
               </systemProperties>
             </configuration>
           </plugin>

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
index 9399514f7bc97933a4e9e09546f65d26977024f4..9b7c63199cec508d10532da8a6d9a06bef9032b9 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
@@ -69,34 +69,25 @@
                       Follow those steps to upgrade SonarQube from version <%= sonar_version -%> to
                       version <%= release.getVersion() -%> :
                       <ol class="bulletpoints">
+                        <li>Stop SonarQube</li>
+                        <li><%= link_to 'Download', release.getDownloadUrl(), :class => 'external' -%> and install
+                          SonarQube <%= release.getVersion() -%> after having carefully read the <a href="http://docs.codehaus.org/display/SONAR/Upgrading" class="external">upgrade guide</a>.
+                        </li>
                         <% update.getIncompatiblePlugins().each do |incompatible_plugin| %>
-                          <li>
-                            <form method="post"
-                                  action="<%= ApplicationController.root_context -%>/updatecenter/uninstall?key=<%= incompatible_plugin.getKey() -%>&amp;from=system_updates"
-                                  style="display: inline-block">
-                              <%= image_tag 'warning.png' -%>
-                              <input type="submit" value="Uninstall" class="red-button" onClick="return submitForm(this);"/>
-                              the plugin <%= incompatible_plugin.getName() -%> which is not compatible with
-                              SonarQube <%= release.getVersion() -%>.
-                            </form>
-                          </li>
+                        <li>
+                            Uninstall the plugin <%= incompatible_plugin.getName() -%> which is not compatible with
+                            SonarQube <%= release.getVersion() -%>.
+                          </form>
+                        </li>
                         <% end %>
                         <% update.getPluginsToUpgrade().each do |plugin_to_upgrade| %>
-                          <li>
-                            <form method="post" id="upgrade-form-<%= plugin_to_upgrade.getArtifact().getKey() -%>"
-                                  action="<%= ApplicationController.root_context -%>/updatecenter/install?key=<%= plugin_to_upgrade.getArtifact().getKey() -%>&amp;version=<%= plugin_to_upgrade.getVersion() -%>&amp;from=system_updates"
-                                  style="display: inline-block">
-                              <input type="submit" id="upgrade-submit-<%= plugin_to_upgrade.getArtifact().getKey() -%>" value="Upgrade" onClick="return submitForm(this);"/>
-                              the plugin <%= plugin_to_upgrade.getArtifact().getName() -%> to
-                              version <%= plugin_to_upgrade.getVersion() -%>
-                            </form>
-                          </li>
-                        <% end %>
-                        <li>Stop Sonar</li>
-                        <li><%= link_to 'Download', release.getDownloadUrl(), :class => 'external' -%> and install
-                          SonarQube <%= release.getVersion() -%> after having carefully read the <a href="http://docs.codehaus.org/display/SONAR/Upgrading" class="external">upgrade guide</a>.
+                        <li>
+                            Replace current version of plugin <%= plugin_to_upgrade.getArtifact().getName() -%> by
+                            version <%= plugin_to_upgrade.getVersion() -%>
+                          </form>
                         </li>
-                        <li>Start Sonar</li>
+                        <% end %>
+                        <li>Start SonarQube</li>
                       </ol>
 
                     <% else %>