Skip to content

Commit 47a2f3c

Browse files
MarkEWaiteNotMyFault
authored andcommitted
[JENKINS-70301] Do not report implied dependencies for WMI Windows Agents plugin (#7568)
* Hide split of windows-slaves from other plugins https://issues.jenkins.io/browse/JENKINS-70301 notes that the WMI Windows Agents plugin (id:windows-slaves) was split from core in 1.547 and is now deprecated. Because it is deprecated, users want to remove it. They cannot remove it if they have plugins installed that depend on a Jenkins version prior to 1.547. Only two plugins actually depend of any classes from the WMI Windows Agent plugin. * cli-extras-plugin - never released, no tags, no install history * multi-slave-config - already requires windows-slaves plugin explicitly and already requires a Jenkins core version newer than 1.547. 1340 installations, last released 8 years ago Rather than require updates of all the plugins that require a Jenkins version less than 1.547, this removes the windows-slaves plugin from the split plugins list. Users will not be warned that their plugin might have a dependency on windows-slaves because the analysis has confirmed that there is only 1 delivered plugin with that dependency, and it is an explicitly declared dependency with a newer Jenkins minimum version than the version from which the WMI Windows Agents plugion was split. Testing done * Installed suggested plugins from wizard and confirmed WMI Windows Agents plugin is not installed * Installed slave-setup plugin (has implied WMI Windows Agents plugin dependency) and confirmed that WMI Windows Agents plugin is not installed * Installed multi-slave-setup plugin (has explicit WMI Windows Agents plugin dependency) and confirmed that WMI Windows Agents plugin was installed as a dependency * Remove multi-slave-setup plugin and WMI Windows Agents plugin and confirmed that Jenkins reported no errors or issues * Installed five plugins with old base versions and confirmed that WMI Windows Agents plugin was not installed. The five plugins included backup-plugin, cloudbees-credentials-plugin, unity3d-plugin, groovy-label-assignment-plugin, and maven-deployment-linker plugin. * Performed a backup with the backup plugin and confirmed that it was well behaved https://docs.google.com/spreadsheets/d/1KDIJIu41rIRlj6PjzyhAY9vazKmd3PVwqM3_-32Lt-o/edit?usp=sharing lists the plugins that have an implied dependency on the WMI Windows Agents plugin. * Remove windows-slaves from war file No need to bundle a detached plugin that has no consumers of its API that are based on a Jenkins version before the plugin was split from core. #7568 (review) detected that the bundling was left in by the original commit. (cherry picked from commit f0cbe38)
1 parent e05bb34 commit 47a2f3c

File tree

3 files changed

+0
-10
lines changed

3 files changed

+0
-10
lines changed

core/src/main/resources/jenkins/split-plugin-cycles.txt

-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
# JENKINS-28942 could make this obsolete.
33

44
credentials matrix-auth
5-
credentials windows-slaves
65

76
script-security antisamy-markup-formatter
87
script-security bouncycastle-api
98
script-security command-launcher
109
script-security matrix-auth
1110
script-security matrix-project
12-
script-security windows-slaves
1311

1412
# Weird unexpected cycle that showed up during testing of this new plugin
1513
# so breaking all potential cycles until JENKINS-28942
@@ -25,7 +23,6 @@ ldap jaxb
2523
pam-auth jaxb
2624
mailer jaxb
2725
matrix-auth jaxb
28-
windows-slaves jaxb
2926
antisamy-markup-formatter jaxb
3027
matrix-project jaxb
3128
junit jaxb

core/src/main/resources/jenkins/split-plugins.txt

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ ldap 1.467 1.0
1616
pam-auth 1.467 1.0
1717
mailer 1.493 1.2
1818
matrix-auth 1.535 1.0.2
19-
windows-slaves 1.547 1.0
2019
antisamy-markup-formatter 1.553 1.0
2120
matrix-project 1.561 1.0
2221
junit 1.577 1.0

war/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,6 @@ THE SOFTWARE.
301301
<version>2.6.6</version>
302302
<type>hpi</type>
303303
</artifactItem>
304-
<artifactItem>
305-
<groupId>org.jenkins-ci.plugins</groupId>
306-
<artifactId>windows-slaves</artifactId>
307-
<version>1.8.1</version>
308-
<type>hpi</type>
309-
</artifactItem>
310304
<artifactItem>
311305
<groupId>org.jenkins-ci.plugins</groupId>
312306
<artifactId>antisamy-markup-formatter</artifactId>

0 commit comments

Comments
 (0)