Merge ~nick-moffitt/mojo/+git/mojo-specs:discontinue-plugins into ~mojo-maintainers/mojo/+git/mojo-specs:master

[Nick Moffitt]

Fixed plugins to match lp:canonical-mojo-specs/is/pkg-jenkins/files/jenkins-plugins-list

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 53de26ffaa65a37816180d440c0ccd9f2b38a72b

diff --git a/pkg-jenkins-canonical/bundle.yaml b/pkg-jenkins-canonical/bundle.yaml
index b8321d6..b81b94e 100644
--- a/pkg-jenkins-canonical/bundle.yaml
+++ b/pkg-jenkins-canonical/bundle.yaml
@@ -15,15 +15,16 @@ applications:
             plugins: >-
                 ace-editor
                 analysis-core
+                android-signing
                 ansicolor
                 ant
                 antisamy-markup-formatter
+                any-buildstep
                 apache-httpcomponents-client-4-api
                 authentication-tokens
                 aws-credentials
                 aws-java-sdk
                 bazaar
-                blueocean
                 blueocean-autofavorite
                 blueocean-bitbucket-pipeline
                 blueocean-commons
@@ -32,8 +33,9 @@ applications:
                 blueocean-dashboard
                 blueocean-display-url
                 blueocean-events
-                blueocean-git-pipeline
                 blueocean-github-pipeline
+                blueocean-git-pipeline
+                blueocean
                 blueocean-i18n
                 blueocean-jira
                 blueocean-jwt
@@ -47,17 +49,29 @@ applications:
                 bouncycastle-api
                 branch-api
                 build-blocker-plugin
-                build-monitor-plugin
+                build-failure-analyzer
+                build-metrics
+                build-name-setter
+                build-pipeline-plugin
+                build-publisher
                 build-timeout
+                build-token-root
+                build-with-parameters
+                chroot
                 claim
                 cloudbees-bitbucket-branch-source
                 cloudbees-folder
+                cmakebuilder
+                cobertura
+                code-coverage-api
                 command-launcher
                 conditional-buildstep
                 copyartifact
-                credentials
                 credentials-binding
+                credentials
+                cvs
                 dashboard-view
+                debian-package-builder
                 dependency-check-jenkins-plugin
                 description-setter
                 disk-usage
@@ -66,50 +80,79 @@ applications:
                 docker-build-step
                 docker-commons
                 docker-workflow
+                downstream-ext
+                dtkit-api
                 durable-task
+                dynamic-axis
                 ec2
+                elastic-axis
                 email-ext
+                envinject-api
+                envinject
+                Exclusion
+                extensible-choice-parameter
                 external-monitor-job
                 favorite
+                flexible-publish
                 generic-webhook-trigger
                 ghprb
-                git
                 git-client
-                git-server
-                github
+                git
                 github-api
                 github-branch-source
+                github
                 github-organization-folder
                 github-pullrequest
+                git-server
+                global-build-stats
+                gradle
+                greenballs
+                groovy
                 handlebars
                 handy-uri-templates-2-api
                 htmlpublisher
                 icon-shim
+                influxdb
                 instant-messaging
                 ircbot
                 jackson2-api
                 javadoc
+                javatest-report
+                jdk-tool
                 jenkins-design-language
                 jira
-                jquery
+                jobgenerator
+                join
                 jquery-detached
+                jquery
                 jsch
                 junit
                 ldap
+                lockable-resources
                 mailer
+                mapdb-api
                 matrix-auth
                 matrix-combinations-parameter
                 matrix-project
+                matrix-reloaded
                 maven-plugin
                 mercurial
+                metrics
                 momentjs
+                multiple-scms
+                naginator
+                nested-view
                 node-iterator-api
                 nodelabelparameter
-                openid
+                notification
+                okhttp-api
                 openid4java
+                openid
                 pam-auth
                 parameterized-scheduler
                 parameterized-trigger
+                pegdown-formatter
+                periodicbackup
                 pipeline-build-step
                 pipeline-github-lib
                 pipeline-graph-analysis
@@ -126,27 +169,47 @@ applications:
                 pipeline-utility-steps
                 plain-credentials
                 postbuildscript
+                postbuild-task
+                PrioritySorter
+                promoted-builds
                 pubsub-light
+                purge-build-queue-plugin
                 rebuild
                 resource-disposer
+                rich-text-publisher-plugin
                 run-condition
                 scm-api
+                scm-sync-configuration
                 script-security
                 secondary-timestamper-plugin
+                sectioned-view
+                sidebar-link
+                simple-theme-plugin
                 sse-gateway
                 ssh-agent
                 ssh-credentials
+                ssh-slaves
                 structs
+                subversion
+                support-core
+                swarm
                 thinBackup
+                throttle-concurrents
                 timestamper
                 token-macro
+                translation
+                trilead-api
+                urltrigger
+                vagrant
+                validating-string-parameter
                 variant
+                view-job-filters
                 windows-slaves
                 workflow-aggregator
                 workflow-api
                 workflow-basic-steps
-                workflow-cps
                 workflow-cps-global-lib
+                workflow-cps
                 workflow-durable-task-step
                 workflow-job
                 workflow-multibranch
@@ -155,6 +218,7 @@ applications:
                 workflow-step-api
                 workflow-support
                 ws-cleanup
+                xunit
             remove-unlisted-plugins: "yes"
             plugins-site: "https://pkg.jenkins.canonical.com/plugins/"
             bundle-site: "https://pkg.jenkins.io"