Bring up to date with main branch.

.github/CODEOWNERS

@@ -1,68 +1,41 @@
 # Global Owners
-* @vparfonov
-
-# dashboard
-dashboard/** @ashumilova @benoitf
+* @nickboldt @sparkoo
 
 # dockerfiles
-dockerfiles/** @riuvshin @benoitf
-
-# ide
-ide/che-core-ide-stacks/** @ashumilova
-
-# agents
-agents/** @tolusha
-agents/go-agents/** @garagatyi
+dockerfiles/** @benoitf @nickboldt
 
 # assembly
-assembly/** @riuvshin @skabashnyuk
+assembly/** @skabashnyuk @nickboldt
+assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/** @sleshchenko @ibuziuk @nickboldt @themr0c @boczkowska @MichalMaler
 
 # core
-core/** @skabashnyuk
+core/** @skabashnyuk @nickboldt
 
 # workspace runtime infrastructure implementations
-infrastructures/** @garagatyi @sleshchenko
+infrastructures/** @skabashnyuk @amisevsk @metlos @nickboldt @sleshchenko
 
 # multiuser che
-multiuser/api/**  @sleshchenko
-multiuser/integration-tests/**  @mshaposhnik @sleshchenko
-multiuser/keycloak/**  @mshaposhnik
-multiuser/machine-auth/**  @mshaposhnik
-multiuser/permission/**  @sleshchenko
-multiuser/personal-account/**  @sleshchenko
-multiuser/sql-schema/**  @mshaposhnik @sleshchenko
-
-# plugins
-plugins/plugin*debugger/** @tolusha
-plugins/plugin-gdb/** @tolusha
-plugins/plugin-docker/** @garagatyi @sleshchenko
-plugins/plugin-java/** @vparfonov
-plugins/plugin-languageserver/** @vparfonov @dkuleshov
-plugins/plugin-maven/** @vparfonov
-plugins/plugin-orion/** @azatsarynnyy
-plugins/plugin-testing*/** @vparfonov
-plugins/plugin-traefik/** @benoitf
+multiuser/api/**  @skabashnyuk @nickboldt
+multiuser/integration-tests/**  @mshaposhnik @skabashnyuk @nickboldt
+multiuser/keycloak/**  @mshaposhnik @nickboldt
+multiuser/machine-auth/**  @mshaposhnik @nickboldt
+multiuser/permission/**  @skabashnyuk @nickboldt
+multiuser/personal-account/**  @skabashnyuk @nickboldt
+multiuser/sql-schema/**  @mshaposhnik @sleshchenko @nickboldt
 
 # wsmaster
-wsmaster/** @skabashnyuk
-wsmaster/che-core-api-workspace*/** @garagatyi
-wsmaster/che-core-api-factory/** @mshaposhnik
-wsmaster/che-core-api-factory-shared/**   @mshaposhnik
-wsmaster/che-core-api-workspace-activity/**   @mshaposhnik
-
-# wsagent
-wsagent/activity/** @skabashnyuk
-wsagent/agent/** @tolusha
-wsagent/che-core-api-debug*/** @tolusha
-wsagent/che-core-api-languageserver*/** @vparfonov @dkuleshov
-wsagent/che-core-api-testing*/** @vparfonov
-wsagent/che-wsagent-core/** @skabashnyuk
-wsagent/wsagent-local/** @skabashnyuk
-wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/search/server/** @skabashnyuk
-wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/search/** @skabashnyuk
+wsmaster/** @skabashnyuk @nickboldt
+wsmaster/che-core-api-factory/** @mshaposhnik @nickboldt
+wsmaster/che-core-api-factory-shared/**   @mshaposhnik @nickboldt
+wsmaster/che-core-api-workspace-activity/**   @mshaposhnik @nickboldt
+wsmaster/che-core-api-workspace/**  @skabashnyuk @mshaposhnik @metlos @nickboldt @sleshchenko
 
 # deploy
-deploy/** @riuvshin @l0rd @garagatyi @eivantsov @sleshchenko
+deploy/** @tolusha @nickboldt
+deploy/openshift/templates/monitoring/** @skabashnyuk @metlos @nickboldt
+
+# e2e tests
+tests/e2e/**  @musienko-maxim @Ohrimenko1988 @rhopp @nickboldt @Katka92 @ScrewTSW
 
-# selenium tests
-selenium/** @musienko-maxim @dmytro-ndp @Ohrimenko1988
+# e2e tests infra
+tests/.infra/centos-ci/** @musienko-maxim @rhopp @nickboldt

.github/ISSUE_TEMPLATE/a_question.md

@@ -0,0 +1,27 @@
+---
+name: Question 🤔
+about: Usage question or discussion about Eclipse Che.
+title: ''
+labels: 'kind/question'
+assignees: ''
+
+---
+<!--
+  To make it easier for us to help you, please include as much useful information as possible.
+
+  Useful Links:
+  - Documentation: https://www.eclipse.org/che/docs
+  - Contributing: https://github.com/eclipse/che/blob/master/CONTRIBUTING.md
+
+  Eclipse Che has public chat on:
+
+  - Mattermost: https://mattermost.eclipse.org/eclipse/channels/eclipse-che
+
+  Before opening a new issue, please search existing issues https://github.com/eclipse/che/issues
+-->
+
+## Summary
+
+## Relevant information
+
+<!-- Provide as much useful information as you can -->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,78 @@
+---
+name: Bug report 🐞
+about: Report a bug found in Eclipse Che
+title: ''
+labels: 'kind/bug'
+assignees: ''
+
+---
+<!--
+  To make it easier for us to help you, please include as much useful information as possible.
+
+  Useful Links:
+  - Documentation: https://www.eclipse.org/che/docs
+  - Contributing: https://github.com/eclipse/che/blob/master/CONTRIBUTING.md
+
+  Eclipse Che has public chat on:
+
+  - Mattermost: https://mattermost.eclipse.org/eclipse/channels/eclipse-che
+
+  Before opening a new issue, please search existing issues https://github.com/eclipse/che/issues
+-->
+
+### Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+### Che version
+<!-- (if workspace is running, version can be obtained with help/about menu) -->
+ - [ ] latest
+ - [ ] nightly
+ - [ ] other: please specify
+
+### Steps to reproduce
+
+<!--
+1. Do '...'
+2. Click on '....'
+3. See error
+-->
+
+### Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+### Runtime
+   - [ ] kubernetes (include output of `kubectl version`)
+   - [ ] Openshift (include output of `oc version`)
+   - [ ] minikube (include output of `minikube version` and `kubectl version`)
+   - [ ] minishift (include output of `minishift version` and `oc version`)
+   - [ ] docker-desktop + K8S (include output of `docker version` and `kubectl version`)
+   - [ ] other: (please specify)
+
+### Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+### Installation method
+   - [ ] chectl
+     * provide a full command that was used to deploy Eclipse Che (including the output)
+     * provide an output of `chectl version` command
+   - [ ] OperatorHub
+   - [ ] I don't know
+
+### Environment
+   - [ ] my computer
+       - [ ] Windows
+       - [ ] Linux
+       - [ ] macOS
+   - [ ] Cloud
+       - [ ] Amazon
+       - [ ] Azure
+       - [ ] GCE
+       - [ ] other (please specify)
+   - [ ] Dev Sandbox (workspaces.openshift.com)
+   - [ ] other: please specify
+
+### Eclipse Che Logs
+<!-- https://www.eclipse.org/che/docs/che-7/collecting-logs-using-chectl -->
+
+### Additional context
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/enhancement.md

@@ -0,0 +1,19 @@
+---
+name: Enhancement💡
+about: Suggest a enhancement for Eclipse Che
+title: ''
+labels: 'kind/enhancement'
+assignees: ''
+
+---
+### Is your enhancement related to a problem? Please describe.
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+### Describe the solution you'd like
+<!-- A clear and concise description of what you want to happen. -->
+
+### Describe alternatives you've considered
+<!--A clear and concise description of any alternative solutions or features you've considered. -->
+
+### Additional context
+<!-- Add any other context or screenshots about the enhancement here. -->

.github/ISSUE_TEMPLATE/release.md

@@ -0,0 +1,54 @@
+---
+name: Release📦
+about: Create new release issue for Eclipse Che
+title: ''
+labels: 'kind/release'
+assignees: ''
+
+---
+
+### List of pending issues / PRs
+* [ ] description #xxx https://github.com/eclipse/che/issues/xxx
+
+### Release status
+
+The following will be released via [che-release](https://github.com/eclipse/che-release/blob/master/cico_release.sh) according to a series of phases:
+
+1. [ ] che-machine-exec, che-theia, che-devfile-registry, che-dashboard, devworkspace-operator, jwtproxy, kubernetes image puller
+2. [ ] che-plugin-registry (once che-theia and machine-exec are done)
+3. [ ] che-parent and che server
+4. [ ] devworkspace-che-operator
+5. [ ] che-operator
+
+Each phase will [send a Mattermost notification to the Eclipse Che releases channel](https://mattermost.eclipse.org/eclipse/channels/eclipse-che-releases).
+
+Then, these steps will be done, once the above projects are released and PRs are merged:
+
+- [ ] [chectl](https://github.com/che-incubator/chectl/actions/workflows/release-stable-PRs.yml) _(depends on che-operator)_
+- [ ] [Che community operator PRs](https://github.com/operator-framework/community-operators/pulls?q=%22Update+eclipse-che+operator%22+is%3Aopen) _(depends on che-operator)_
+- [ ] [che-docs PR](https://github.com/eclipse/che-docs/pulls/che-bot) _(depends on che-operator)_
+
+If this is a .0 release:
+
+- [ ] complete current milestone
+  - [ ] move incomplete *deferred* issues to backlog
+  - [ ] move incomplete *WIP* issues to next milestone
+  - [ ] close completed issues
+  - [ ] close milestone
+
+| Process <sup>[1]</sup> | Script | Action | Container(s) + Artifact(s) |
+| --- | --- | --- | --- |
+| [che-release](https://github.com/eclipse/che-release/blob/master/RELEASE.md) | [cico_release.sh](https://github.com/eclipse/che-release/blob/master/cico_release.sh) | [Action](https://github.com/eclipse/che-release/actions?query=workflow%3A%22Release+-+Orchestrate+Overall+Release+Phases%22) | n/a |
+| [che-theia](https://github.com/eclipse/che-theia/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-theia/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che-theia/actions?query=workflow%3A%22Release+Che+Theia%22) | [`eclipse/che-theia`](https://quay.io/eclipse/che-theia) |
+| [che-machine-exec](https://github.com/eclipse-che/che-machine-exec/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse-che/che-machine-exec/blob/master/make-release.sh) | [Action](https://github.com/eclipse-che/che-machine-exec/actions?query=workflow%3A%22Release+Che+Machine+Exec%22) | [`eclipse/che-machine-exec`](https://quay.io/eclipse/che-machine-exec)|
+| [che-devfile-registry](https://github.com/eclipse/che-devfile-registry/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-devfile-registry/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che-devfile-registry/actions?query=workflow%3A%22Release+Che+Devfile+Registry%22) | [`eclipse/che-devfile-registry`](https://quay.io/eclipse/che-devfile-registry)|
+| [che-plugin-registry](https://github.com/eclipse/che-plugin-registry/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-plugin-registry/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che-plugin-registry/actions?query=workflow%3A%22Release+Che+Plugin+Registry%22) | [`eclipse/che-plugin-registry`](https://quay.io/eclipse/che-plugin-registry)|
+| [che-parent](https://github.com/eclipse/che-parent/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-parent/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che/actions?query=workflow%3A%22Release+Che+Server%22) | [che-server](https://search.maven.org/search?q=a:che-server) <sup>[2]</sup> |
+| [che-dashboard](https://github.com/eclipse-che/che-dashboard/blob/main/RELEASE.md) | [make-release.sh](https://github.com/eclipse-che/che-dashboard/blob/master/make-release.sh) | [Action](https://github.com/eclipse-che/che-dashboard/actions?query=workflow%3A%22Release+Che+Dashboard%22) | [`che-dashboard`](https://quay.io/repository/eclipse/che-dashboard?tag=next&tab=tags) |
+| [che](https://github.com/eclipse/che/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che/actions?query=workflow%3A%22Release+Che+Server%22) | [`eclipse/che-server`](https://quay.io/eclipse/che-server),<br/>[`eclipse/che-endpoint-watcher`](https://quay.io/eclipse/che-endpoint-watcher),<br/> [`eclipse/che-keycloak`](https://quay.io/eclipse/che-keycloak),<br/> [`eclipse/che-postgres`](https://quay.io/eclipse/che-postgres),<br/> [`eclipse/che-server`](https://quay.io/eclipse/che-server),<br/> [`eclipse/che-e2e`](https://quay.io/eclipse/che-e2e) |
+| [devworkspace-operator (controller)](https://github.com/devfile/devworkspace-operator/) | [make-release.sh](https://github.com/devfile/devworkspace-operator/blob/main/make-release.sh) | [Action](https://github.com/devfile/devworkspace-operator/actions/workflows/release.yml) | [`devfile/devworkspace-controller`](https://quay.io/repository/devfile/devworkspace-controller?tab=tags)|
+| [devworkspace-che-operator](https://github.com/che-incubator/devworkspace-che-operator/) | [make-release.sh](https://github.com/che-incubator/devworkspace-che-operator/blob/main/make-release.sh) | [Action](https://github.com/che-incubator/devworkspace-che-operator/actions/workflows/release.yml) | [`che-incubator/devworkspace-che-operator`](https://quay.io/repository/che-incubator/devworkspace-che-operator?tab=tags)|
+| [che-operator](https://github.com/eclipse-che/che-operator/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse-che/che-operator/blob/master/make-release.sh) | [Action](https://github.com/eclipse-che/che-operator/actions?query=workflow%3A%22Release+Che+Operator%22) | [`eclipse/che-operator`](https://quay.io/eclipse/che-operator)|
+| [chectl](https://github.com/che-incubator/chectl/blob/master/RELEASE.md) | [make-release.sh](https://github.com/che-incubator/chectl/blob/master/make-release.sh) | [Action](https://github.com/che-incubator/chectl/actions) | [chectl releases](https://github.com/che-incubator/chectl/releases)
+
+<sup>[1]</sup> Overall process owner: @mkuznyetsov

.github/ISSUE_TEMPLATE/task.md

@@ -0,0 +1,19 @@
+---
+name: Task 🔧
+about: Internal things, technical debt, and to-do tasks to be performed.
+title: ''
+labels: 'kind/task'
+assignees: ''
+
+---
+### Is your task related to a problem? Please describe.
+<!-- A clear and concise description of what the problem is.-->
+
+### Describe the solution you'd like
+<!-- A clear and concise description of what you want to happen. -->
+
+### Describe alternatives you've considered
+<!--A clear and concise description of any alternative solutions or features you've considered. -->
+
+### Additional context
+<!-- Add any other context or screenshots about the task here. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,24 +1,43 @@
 <!-- Please review the following before submitting a PR:
 Che's Contributing Guide: https://github.com/eclipse/che/blob/master/CONTRIBUTING.md
 Pull Request Policy: https://github.com/eclipse/che/wiki/Development-Workflow#pull-requests
-
-COMMITTERS: please include labels on each PR. Labels are listed here: https://github.com/eclipse/che/wiki/Labels but at a minimum you should include `kind/..` and `Dev Open Pull Request Status` labels.
 -->
 
 ### What does this PR do?
 
 
+### Screenshot/screencast of this PR
+<!-- Please include a screenshot or a screencast explaining what is doing this PR -->
+
+
 ### What issues does this PR fix or reference?
+<!-- Please include any related issue from eclipse che repository (or from another issue tracker).
+     Include link to other pull requests like documentation PR from [the docs repo](https://github.com/eclipse/che-docs)
+-->
+
+
+### How to test this PR?
+<!-- Please explain for example :
+  - The test platform (openshift, kubernetes, minikube, CodeReady Container, docker-desktop, etc)
+  - Installation method: chectl / che-operator
+  - steps to reproduce
+ -->
+
 
-<!-- #### Changelog -->
-<!-- The changelog will be pulled from the PR's title. 
-     Please provide a clear and meaningful title to the PR and don't include issue number -->
+### PR Checklist
 
+[As the author of this Pull Request I made sure that:](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#pull-request-template-and-its-checklist)
 
-#### Release Notes
-<!-- markdown to be included in marketing announcement - N/A for bugs -->
+- [ ] [The Eclipse Contributor Agreement is valid](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#the-eclipse-contributor-agreement-is-valid)
+- [ ] [Code produced is complete](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#code-produced-is-complete)
+- [ ] [Code builds without errors](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#code-builds-without-errors)
+- [ ] [Tests are covering the bugfix](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#tests-are-covering-the-bugfix)
+- [ ] [The repository devfile is up to date and works](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#the-repository-devfile-is-up-to-date-and-works)
+- [ ] [Sections `What issues does this PR fix or reference` and `How to test this PR` completed](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#sections-what-issues-does-this-pr-fix-or-reference-and-how-to-test-this-pr-completed)
+- [ ] [Relevant user documentation updated](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#relevant-contributing-documentation-updated)
+- [ ] [Relevant contributing documentation updated](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#relevant-contributing-documentation-updated)
+- [ ] [CI/CD changes implemented, documented and communicated](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#cicd-changes-implemented-documented-and-communicated)
 
+### Reviewers
 
-#### Docs PR
-<!-- Please add a matching PR to [the docs repo](https://github.com/eclipse/che-docs) and link that PR to this issue.
-Both will be merged at the same time. -->
+Reviewers, please comment how you tested the PR when approving it.

.github/workflows/contributing-repositories-check.yml

@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2020 Red Hat, Inc.
+# This program and the accompanying materials are made
+# available under the terms of the Eclipse Public License 2.0
+# which is available at https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+
+# Eclipse Che workflow for checking repository list in CONTRIBUTING.md file
+name: CI
+
+# Trigger the workflow on push or pull request
+on: 
+  push:
+    paths:
+      - '.repositories.yaml'
+  pull_request:
+    paths:
+      - '.repositories.yaml'
+jobs:
+  check-contributing-up-to-date:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      name: Checkout che-theia source code
+    - name: check
+      run: |
+        ./.repositories-update-contributing.sh check