diff --git a/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java b/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java index c5c51ddcc049899dd7db711bc2c99922c2275d4e..250ff76fd4e11e610b8bbc7d528ffd143e2bec45 100644 --- a/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java +++ b/test/src/test/java/jenkins/install/LoadDetachedPluginsTest.java @@ -27,7 +27,6 @@ package jenkins.install; import hudson.ClassicPluginStrategy; import jenkins.plugins.DetachedPluginsUtil; import jenkins.plugins.DetachedPluginsUtil.DetachedPlugin; -import hudson.Plugin; import hudson.PluginManager; import hudson.PluginManagerUtil; import hudson.PluginWrapper; @@ -87,62 +86,6 @@ public class LoadDetachedPluginsTest { }); } - @Issue("JENKINS-48604") - @Test - @LocalData - public void upgradeFromJenkins2WithNewerDependency() { - VersionNumber since = new VersionNumber("2.0"); - rr.then(r -> { - List detachedPlugins = DetachedPluginsUtil.getDetachedPlugins(since); - assertThat("Plugins have been detached since the pre-upgrade version", - detachedPlugins.size(), greaterThan(1)); - assertThat("Plugins detached between the pre-upgrade version and the current version should be installed", - getInstalledDetachedPlugins(r, detachedPlugins).size(), equalTo(detachedPlugins.size())); - Plugin scriptSecurity = r.jenkins.getPlugin("script-security"); - assertThat("Script-security should be installed", scriptSecurity, notNullValue()); - assertThat("Dependencies of detached plugins should not be downgraded", - scriptSecurity.getWrapper().getVersionNumber(), equalTo(new VersionNumber("1.34"))); - assertNoFailedPlugins(r); - }); - } - - @Test - @LocalData - public void upgradeFromJenkins2WithOlderDependency() { - VersionNumber since = new VersionNumber("2.0"); - rr.then(r -> { - List detachedPlugins = DetachedPluginsUtil.getDetachedPlugins(since); - assertThat("Plugins have been detached since the pre-upgrade version", - detachedPlugins.size(), greaterThan(1)); - assertThat("Plugins detached between the pre-upgrade version and the current version should be installed", - getInstalledDetachedPlugins(r, detachedPlugins).size(), equalTo(detachedPlugins.size())); - Plugin scriptSecurity = r.jenkins.getPlugin("script-security"); - assertThat("Script-security should be installed", scriptSecurity, notNullValue()); - assertThat("Dependencies of detached plugins should be upgraded to the required version", - scriptSecurity.getWrapper().getVersionNumber(), equalTo(new VersionNumber("1.56"))); - assertNoFailedPlugins(r); - }); - } - - @Issue("JENKINS-48899") - @Test - @LocalData - public void upgradeFromJenkins2WithNewerPlugin() { - // @LocalData has command-launcher 1.2 installed, which should not be downgraded to the detached version: 1.0. - VersionNumber since = new VersionNumber("2.0"); - rr.then(r -> { - List detachedPlugins = DetachedPluginsUtil.getDetachedPlugins(since); - assertThat("Plugins have been detached since the pre-upgrade version", - detachedPlugins.size(), greaterThan(1)); - assertThat("Plugins detached between the pre-upgrade version and the current version should be installed", - getInstalledDetachedPlugins(r, detachedPlugins).size(), equalTo(detachedPlugins.size())); - Plugin commandLauncher = r.jenkins.getPlugin("command-launcher"); - assertThat("Installed detached plugins should not be overwritten by older versions", - commandLauncher.getWrapper().getVersionNumber(), equalTo(new VersionNumber("1.2"))); - assertNoFailedPlugins(r); - }); - } - @Test public void newInstallation() { rr.then(r -> { diff --git a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerDependency/jenkins.install.InstallUtil.lastExecVersion b/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerDependency/jenkins.install.InstallUtil.lastExecVersion deleted file mode 100644 index 415b19fc3623413817e5ad457fcd8f530c06047a..0000000000000000000000000000000000000000 --- a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerDependency/jenkins.install.InstallUtil.lastExecVersion +++ /dev/null @@ -1 +0,0 @@ -2.0 \ No newline at end of file diff --git a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerDependency/plugins/script-security.jpi b/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerDependency/plugins/script-security.jpi deleted file mode 100644 index 39a6c2b2674ca3133da274ff65b4dc0f680a2e2f..0000000000000000000000000000000000000000 Binary files a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerDependency/plugins/script-security.jpi and /dev/null differ diff --git a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin/jenkins.install.InstallUtil.lastExecVersion b/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin/jenkins.install.InstallUtil.lastExecVersion deleted file mode 100644 index 415b19fc3623413817e5ad457fcd8f530c06047a..0000000000000000000000000000000000000000 --- a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin/jenkins.install.InstallUtil.lastExecVersion +++ /dev/null @@ -1 +0,0 @@ -2.0 \ No newline at end of file diff --git a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin/plugins/command-launcher.jpi b/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin/plugins/command-launcher.jpi deleted file mode 100644 index 770dd49efefb88d5b34538ad83a9f7498e189c94..0000000000000000000000000000000000000000 Binary files a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin/plugins/command-launcher.jpi and /dev/null differ diff --git a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin/plugins/script-security.jpi b/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin/plugins/script-security.jpi deleted file mode 100644 index 5843cf3822e3cf6ae48a63a9e9ff16d9b0f86abf..0000000000000000000000000000000000000000 Binary files a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithNewerPlugin/plugins/script-security.jpi and /dev/null differ diff --git a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithOlderDependency/jenkins.install.InstallUtil.lastExecVersion b/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithOlderDependency/jenkins.install.InstallUtil.lastExecVersion deleted file mode 100644 index 415b19fc3623413817e5ad457fcd8f530c06047a..0000000000000000000000000000000000000000 --- a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithOlderDependency/jenkins.install.InstallUtil.lastExecVersion +++ /dev/null @@ -1 +0,0 @@ -2.0 \ No newline at end of file diff --git a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithOlderDependency/plugins/script-security.jpi b/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithOlderDependency/plugins/script-security.jpi deleted file mode 100644 index 5a8e624bca63c4acbb8d04f802101b901e04c3e9..0000000000000000000000000000000000000000 Binary files a/test/src/test/resources/jenkins/install/LoadDetachedPluginsTest/upgradeFromJenkins2WithOlderDependency/plugins/script-security.jpi and /dev/null differ diff --git a/war/pom.xml b/war/pom.xml index 5bcfd78481d4bba0b54a476d920c24fe5b551343..ee080b92786c4872e420988a27b70b88f5b835a2 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -405,7 +405,7 @@ THE SOFTWARE. org.jenkins-ci.plugins command-launcher - 1.0 + 1.2 hpi