diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
index fecfc14c9ea..990d6bc8a93 100644
--- a/.github/ISSUE_TEMPLATE/release.md
+++ b/.github/ISSUE_TEMPLATE/release.md
@@ -44,7 +44,7 @@ If this is a .0 release:
| [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) [2] |
-| [che-dashboard](https://github.com/eclipse/che-dashboard/blob/master/RELEASE.md) | [make-release.sh](https://github.com/eclipse/che-dashboard/blob/master/make-release.sh) | [Action](https://github.com/eclipse/che-dashboard/actions?query=workflow%3A%22Release+Che+Dashboard%22) | [`che-dashboard`](https://quay.io/repository/eclipse/che-dashboard?tag=next&tab=tags) |
+| [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),
[`eclipse/che-endpoint-watcher`](https://quay.io/eclipse/che-endpoint-watcher),
[`eclipse/che-keycloak`](https://quay.io/eclipse/che-keycloak),
[`eclipse/che-postgres`](https://quay.io/eclipse/che-postgres),
[`eclipse/che-server`](https://quay.io/eclipse/che-server),
[`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)|
diff --git a/.repositories.yaml b/.repositories.yaml
index 07b96938574..7b441c13a3a 100644
--- a/.repositories.yaml
+++ b/.repositories.yaml
@@ -48,11 +48,11 @@ repositories:
devfile: https://github.com/che-incubator/chectl/blob/master/devfile.yaml
doc: https://github.com/che-incubator/chectl/blob/master/CONTRIBUTING.md
useCheReleaseLifecycle: true
- - url: https://github.com/eclipse/che-dashboard
+ - url: https://github.com/eclipse-che/che-dashboard
name: dashboard
description: >-
UI to manage workspaces, devfiles, etc.
- devfile: https://github.com/eclipse/che-dashboard/blob/master/devfile.yaml
+ devfile: https://github.com/eclipse-che/che-dashboard/blob/main/devfile.yaml
doc: https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#dashboard
useCheReleaseLifecycle: true
- url: https://github.com/eclipse-che/che-devfile-registry
@@ -98,7 +98,7 @@ repositories:
https://eclipse.org/che website source code.
devfile: https://github.com/eclipse/che-website/blob/master/devfile.yaml
useCheReleaseLifecycle: false
- - url: https://github.com/eclipse/che-workspace-client
+ - url: https://github.com/eclipse-che/che-workspace-client
name: workspace-client
description: >-
JS library to interact with a che-server.
@@ -242,11 +242,6 @@ repositories:
description: >-
Eclipse Che Sidecar container for node tooling
useCheReleaseLifecycle: false
- - url: https://github.com/che-incubator/che-dashboard-next
- name: che-dashboard-next
- description: >-
- New dashboard for Eclipse CHE
- useCheReleaseLifecycle: false
- url: https://github.com/che-incubator/che-theia-openshift-auth
name: che-theia-openshift-auth
description: >-
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 822e9da11b3..3db2fa9ae86 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ Repository | Component | Description | Devfile | Documentation
[che-theia](https://github.com/eclipse-che/che-theia) | | Theia IDE integrated in Che. | [devfile](https://github.com/eclipse-che/che-theia/blob/master/devfiles/che-theia-all.devfile.yaml) | [doc](https://github.com/eclipse-che/che-theia/blob/master/CONTRIBUTING.md)
---| [generator](https://github.com/eclipse-che/che-theia/tree/master/generator) | `che:theia init` CLI to prepare and build che-theia | | |
[chectl](https://github.com/che-incubator/chectl) | | The CLI to install Che, create and start workspaces and devfiles | [devfile](https://github.com/che-incubator/chectl/blob/master/devfile.yaml) | [doc](https://github.com/che-incubator/chectl/blob/master/CONTRIBUTING.md)
-[dashboard](https://github.com/eclipse/che-dashboard) | | UI to manage workspaces, devfiles, etc. | [devfile](https://github.com/eclipse/che-dashboard/blob/master/devfile.yaml) | [doc](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#dashboard)
+[dashboard](https://github.com/eclipse-che/che-dashboard) | | UI to manage workspaces, devfiles, etc. | [devfile](https://github.com/eclipse-che/che-dashboard/blob/main/devfile.yaml) | [doc](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#dashboard)
[devfile-registry](https://github.com/eclipse-che/che-devfile-registry) | | The default set of devfiles that would be made available on the Che dashboard stacks. | |
[docs](https://github.com/eclipse/che-docs) | | Eclipse Che documentation https://www.eclipse.org/che/docs/ source code. | [devfile](https://github.com/eclipse/che-docs/blob/master/devfile.yaml) | [doc](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#dashboard)
[machine-exec](https://github.com/eclipse-che/che-machine-exec) | | Interface to execute tasks and terminals on other containers within a workspace. | [devfile](https://github.com/eclipse-che/che-machine-exec/blob/master/devfile.yaml) | [doc](https://github.com/eclipse-che/che-machine-exec/blob/master/CONTRIBUTING.md)
@@ -29,7 +29,7 @@ Repository | Component | Description | Devfile | Documentation
[plugin-broker](https://github.com/eclipse/che-plugin-broker) | | The workspace microservice that is in charge of analyzing, preparing and installing the workspace components defined in a Devfile. | [devfile](https://github.com/eclipse/che-plugin-broker/blob/master/devfile.yaml) | [doc](https://github.com/eclipse/che-plugin-broker/blob/master/CONTRIBUTING.md)
[plugin-registry](https://github.com/eclipse-che/che-plugin-registry) | | The default set of Che plugins (vscode extension + containers) or editors that could be installed on any Che workspaces. | |
[website](https://github.com/eclipse/che-website) | | https://eclipse.org/che website source code. | [devfile](https://github.com/eclipse/che-website/blob/master/devfile.yaml) |
-[workspace-client](https://github.com/eclipse/che-workspace-client) | | JS library to interact with a che-server. | |
+[workspace-client](https://github.com/eclipse-che/che-workspace-client) | | JS library to interact with a che-server. | |
[che-sidecar-bazel](https://github.com/che-dockerfiles/che-sidecar-bazel) | | Eclipse Che Sidecar container for Bazel tooling | |
[che-sidecar-protobuf](https://github.com/che-dockerfiles/che-sidecar-protobuf) | | Eclipse Che Sidecar container for Protobuf tooling | |
[che-sidecar-tekton](https://github.com/che-dockerfiles/che-sidecar-tekton) | | Eclipse Che Sidecar container for Tekton tooling | |
@@ -58,7 +58,6 @@ Repository | Component | Description | Devfile | Documentation
[che-sidecar-java](https://github.com/che-dockerfiles/che-sidecar-java) | | Eclipse Che Sidecar container for java tooling | |
[che-sidecar-dependency-analytics](https://github.com/che-dockerfiles/che-sidecar-dependency-analytics) | | Eclipse Che Sidecar container for dependency analytics tooling | |
[che-sidecar-node](https://github.com/che-dockerfiles/che-sidecar-node) | | Eclipse Che Sidecar container for node tooling | |
-[che-dashboard-next](https://github.com/che-incubator/che-dashboard-next) | | New dashboard for Eclipse CHE | |
[che-theia-openshift-auth](https://github.com/che-incubator/che-theia-openshift-auth) | | OpenShift authentication plugin | |
[configbump](https://github.com/che-incubator/configbump) | | Simple Kubernetes controller that is able to quickly synchronize a set of config maps | |
[workspace-data-sync](https://github.com/che-incubator/workspace-data-sync) | | Provides the ability to increase I/O performance for a developer workspaces | |
@@ -89,12 +88,12 @@ Let's cover the developer flow for theses projects:
### Dashboard
-Dashboard source code is located in [https://github.com/eclipse/che-dashboard](https://github.com/eclipse/che-dashboard) repository.
+Dashboard source code is located in [https://github.com/eclipse-che/che-dashboard](https://github.com/eclipse-che/che-dashboard) repository.
It is an AngularJS application. Here is the developer workflow if you want to contribute to it:
#### Devfile for dashboard development
-The devfile: [https://github.com/eclipse/che-dashboard/blob/master/devfile.yaml](https://github.com/eclipse/che-dashboard/blob/master/devfile.yaml)
+The devfile: [https://github.com/eclipse-che/che-dashboard/blob/master/devfile.yaml](https://github.com/eclipse-che/che-dashboard/blob/master/devfile.yaml)
In this section, we show how to setup a Che environment to work on the Che dashboard, and how to use it.
For the whole workflows, we will need a workspace with such containers:
@@ -118,7 +117,7 @@ In this section we are going to start a new workspace to work on che-theia. The
The devfile could be started using `chectl`:
```bash
-$ chectl workspace:start -f https://raw.githubusercontent.com/eclipse/che-dashboard/master/devfile.yaml
+$ chectl workspace:start -f https://raw.githubusercontent.com/eclipse-che/che-dashboard/master/devfile.yaml
```
#### Step 2: Build
diff --git a/tests/.infra/crw-ci/dashboard-next/pr-check/Jenkinsfile b/tests/.infra/crw-ci/dashboard-next/pr-check/Jenkinsfile
index 6624b365df3..5797be1459b 100644
--- a/tests/.infra/crw-ci/dashboard-next/pr-check/Jenkinsfile
+++ b/tests/.infra/crw-ci/dashboard-next/pr-check/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
mutableCheImageTag = ""
pathToChectl = ""
- UPSTREAM_DASHBOARD_REPO_URL="https://github.com/eclipse/che-dashboard.git"
+ UPSTREAM_DASHBOARD_REPO_URL="https://github.com/eclipse-che/che-dashboard.git"
}
parameters {
@@ -42,10 +42,10 @@ pipeline {
description: 'URL of devfile of test workspace')
string(name: 'ghprbSourceBranch',
- defaultValue: "master")
+ defaultValue: "main")
string(name: 'ghprbAuthorRepoGitUrl',
- defaultValue: "https://github.com/eclipse/che-dashboard.git")
+ defaultValue: "https://github.com/eclipse-che/che-dashboard.git")
string(name: 'e2eTestParameters',
defaultValue: "")
@@ -181,14 +181,14 @@ pipeline {
stage("Build and push 'che-dashboard' image"){
steps {
sh """
- echo "Download the 'che-dashboard-next' project and checkout to branch"
+ echo "Download the 'che-dashboard' project and checkout to branch"
git clone $ghprbAuthorRepoGitUrl
cd che-dashboard
if [[ "$UPSTREAM_DASHBOARD_REPO_URL" != "$ghprbAuthorRepoGitUrl" ]]; then
echo "Using fork $ghprbAuthorRepoGitUrl"
- git fetch -f $UPSTREAM_DASHBOARD_REPO_URL master:$ghprbSourceBranch
+ git fetch -f $UPSTREAM_DASHBOARD_REPO_URL main:$ghprbSourceBranch
fi
git checkout $ghprbSourceBranch