upstream

Author: Haitham Shahin

plugins.txt

@@ -2,31 +2,6 @@ ace-editor:1.1
 apache-httpcomponents-client-4-api:4.5.5-3.0
 authentication-tokens:1.3
 blueocean-autofavorite:1.2.3
-<<<<<<< HEAD
-blueocean-bitbucket-pipeline:1.10.2
-blueocean-commons:1.10.2
-blueocean-config:1.10.2
-blueocean-core-js:1.10.2
-blueocean-dashboard:1.10.2
-blueocean-display-url:2.2.0
-blueocean-events:1.10.2
-blueocean-github-pipeline:1.10.2
-blueocean-git-pipeline:1.10.2
-blueocean:1.10.2
-blueocean-i18n:1.10.2
-blueocean-jira:1.10.2
-blueocean-jwt:1.10.2
-blueocean-personalization:1.10.2
-blueocean-pipeline-api-impl:1.10.2
-blueocean-pipeline-editor:1.10.2
-blueocean-pipeline-scm-api:1.10.2
-blueocean-rest:1.10.2
-blueocean-rest-impl:1.10.2
-blueocean-web:1.10.2
-branch-api:2.0.20
-cloudbees-bitbucket-branch-source:2.4.2
-cloudbees-folder:6.6
-=======
 blueocean-bitbucket-pipeline:1.13.2
 blueocean-commons:1.13.2
 blueocean-config:1.13.2
@@ -50,44 +25,27 @@ blueocean-web:1.13.2
 branch-api:2.1.2
 cloudbees-bitbucket-branch-source:2.4.2
 cloudbees-folder:6.7
->>>>>>> c969fe429a2a169d5f755e42c7629a88413b7770
 conditional-buildstep:1.3.6
 config-file-provider:3.5
 credentials-binding:1.18
 credentials:2.1.18
 display-url-api:2.3.0
-<<<<<<< HEAD
-docker-commons:1.11
-docker-workflow:1.14
-durable-task:1.26
-favorite:2.3.1
-git-client:2.7.3
-=======
 docker-commons:1.13
 docker-workflow:1.17
 durable-task:1.29
 favorite:2.3.2
 git-client:2.7.6
->>>>>>> c969fe429a2a169d5f755e42c7629a88413b7770
 git:3.9.3
 github-api:1.95
 github-branch-source:2.4.2
 github:1.29.4
 github-organization-folder:1.6
 git-server:1.7
-<<<<<<< HEAD
-handlebars:1.1
-handy-uri-templates-2-api:2.1.6-1.0
-htmlpublisher:1.16
-jackson2-api:2.9.8
-jenkins-design-language:1.10.2
-=======
 handlebars:1.1.1
 handy-uri-templates-2-api:2.1.7-1.0
 htmlpublisher:1.18
 jackson2-api:2.9.8
 jenkins-design-language:1.13.2
->>>>>>> c969fe429a2a169d5f755e42c7629a88413b7770
 jira:3.0.5
 job-dsl:1.72
 jquery-detached:1.2.1
@@ -124,23 +82,14 @@ pipeline-utility-steps:2.3.0
 plain-credentials:1.5
 pubsub-light:1.12
 run-condition:1.2
-<<<<<<< HEAD
-scm-api:2.2.8
-=======
 scm-api:2.3.0
->>>>>>> c969fe429a2a169d5f755e42c7629a88413b7770
 script-security:1.54
 sse-gateway:1.17
 ssh-credentials:1.15
 structs:1.17
 subversion:2.12.1
-<<<<<<< HEAD
-token-macro:2.6
-variant:1.1
-=======
 token-macro:2.7
 variant:1.2
->>>>>>> c969fe429a2a169d5f755e42c7629a88413b7770
 workflow-aggregator:2.6
 workflow-api:2.33
 workflow-basic-steps:2.14
@@ -161,11 +110,6 @@ ant:1.9
 badge:1.7
 bouncycastle-api:2.17
 build-failure-analyzer:1.22.0
-<<<<<<< HEAD
-# build-flow-plugin:0.20
-# - https://wiki.jenkins.io/display/JENKINS/Build+Flow+Plugin
-=======
->>>>>>> c969fe429a2a169d5f755e42c7629a88413b7770
 buildgraph-view:1.8
 build-monitor-plugin:1.12+build.201809061734
 build-pipeline-plugin:1.5.8
@@ -175,13 +119,7 @@ checkstyle:4.0.0
 claim:2.15
 cobertura:1.13
 command-launcher:1.3
-<<<<<<< HEAD
-# copy-to-slave:1.4.4
-# - https://wiki.jenkins.io/display/JENKINS/Copy+To+Slave+Plugin
-cucumber-reports:3.20.0
-=======
 cucumber-reports:4.5.0
->>>>>>> c969fe429a2a169d5f755e42c7629a88413b7770
 cvs:2.14
 dashboard-view:2.10
 email-ext:2.65
@@ -230,15 +168,8 @@ ssh-slaves:1.29.4
 summary_report:1.15
 support-core:2.56
 timestamper:1.9
-<<<<<<< HEAD
-view-job-filters:2.1.1
-=======
->>>>>>> c969fe429a2a169d5f755e42c7629a88413b7770
 vsphere-cloud:2.19
 windows-slaves:1.4
 ws-cleanup:0.37
 xunit:2.3.3
-<<<<<<< HEAD
-=======
 code-coverage-api:1.0.7
->>>>>>> c969fe429a2a169d5f755e42c7629a88413b7770