Merge branch 'master' into sv/VSC-tests

eclipse-che · Mar 1, 2021 · 80c52ff · 80c52ff
2 parents d4deda3 + 8dec90b
commit 80c52ff
Show file tree

Hide file tree

Showing 119 changed files with 851 additions and 113 deletions.
diff --git a/.ci/cico-happy-path-pr-test.sh b/.ci/cico-happy-path-pr-test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # shellcheck disable=SC1091,SC1090
 #
-# Copyright (c) 2012-2020 Red Hat, Inc.
+# Copyright (c) 2012-2021 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/

diff --git a/.ci/cico-plugin-registry-pr-test.sh b/.ci/cico-plugin-registry-pr-test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # shellcheck disable=SC1091,SC1090
 #
-# Copyright (c)2020 Red Hat, Inc.
+# Copyright (c)2020-2021 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/

diff --git a/.ci/digest-validation-pr.sh b/.ci/digest-validation-pr.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2012-2020 Red Hat, Inc.
+# Copyright (c) 2012-2021 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/

diff --git a/.ci/sidecar-build-publish.sh b/.ci/sidecar-build-publish.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.ci/tests-runner.py b/.ci/tests-runner.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -120,7 +120,7 @@ module.exports = {
             "*********************************************************************",
             {
               "pattern": "^ \\* Copyright \\(c\\) \\d{4}(-\\d{4})* Red Hat, Inc\\.$",
-              "template": " * Copyright (c) 2020 Red Hat, Inc."
+              "template": " * Copyright (c) 2021 Red Hat, Inc."
             },
             " *",
             " * This program and the accompanying materials are made",

diff --git a/.github/workflows/build-jobs.yml b/.github/workflows/build-jobs.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.github/workflows/image-build-pr-check.yml b/.github/workflows/image-build-pr-check.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.github/workflows/publish-content-push-main.yml b/.github/workflows/publish-content-push-main.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.github/workflows/publish-plugin-report.yaml b/.github/workflows/publish-plugin-report.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.github/workflows/publish-pr-check-content.yml b/.github/workflows/publish-pr-check-content.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.github/workflows/shellcheck-pr-check.yml b/.github/workflows/shellcheck-pr-check.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.github/workflows/sidecar-build-push.yaml b/.github/workflows/sidecar-build-push.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.github/workflows/sidecar-pr-checks.yaml b/.github/workflows/sidecar-pr-checks.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/.github/workflows/typescript-pr-check.yml b/.github/workflows/typescript-pr-check.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/build/dockerfiles/entrypoint.sh b/build/dockerfiles/entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/build/dockerfiles/rhel.entrypoint.sh b/build/dockerfiles/rhel.entrypoint.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/build/dockerfiles/rhel.install.sh b/build/dockerfiles/rhel.install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/che-editors.yaml b/che-editors.yaml
@@ -101,7 +101,7 @@ editors:
             value: /remote-endpoint/plugin-remote-endpoint
           - name: REMOTE_ENDPOINT_VOLUME_NAME
             value: remote-endpoint
-  - id: eclipse/che-theia/7.26.1
+  - id: eclipse/che-theia/7.26.2
     title: Eclipse Theia
     displayName: theia-ide
     description: Eclipse Theia
@@ -165,7 +165,7 @@ editors:
           discoverable: false
     containers:
       - name: theia-ide
-        image: "quay.io/eclipse/che-theia:7.26.1"
+        image: "quay.io/eclipse/che-theia:7.26.2"
         env:
           - name: THEIA_PLUGINS
             value: local-dir:///plugins
@@ -190,7 +190,7 @@ editors:
         memoryLimit: "512M"
     initContainers:
       - name: remote-runtime-injector
-        image: "quay.io/eclipse/che-theia-endpoint-runtime-binary:7.26.1"
+        image: "quay.io/eclipse/che-theia-endpoint-runtime-binary:7.26.2"
         volumeMounts:
           - name: remote-endpoint
             path: "/remote-endpoint"

diff --git a/che-plugins.yaml b/che-plugins.yaml
@@ -130,7 +130,7 @@ plugins:
           - /go/bin/che-machine-exec
           - '--url'
           - '127.0.0.1:4444'
-  - id: eclipse/che-machine-exec-plugin/7.26.1
+  - id: eclipse/che-machine-exec-plugin/7.26.2
     displayName: Che machine-exec Service
     description: >-
       Che Plug-in with che-machine-exec service to provide creation terminal or
@@ -149,7 +149,7 @@ plugins:
           cookiesAuthEnabled: true
     containers:
       - name: che-machine-exec
-        image: 'quay.io/eclipse/che-machine-exec:7.26.1'
+        image: 'quay.io/eclipse/che-machine-exec:7.26.2'
         ports:
           - exposedPort: 4444
         command:

diff --git a/che-theia-plugins.yaml b/che-theia-plugins.yaml
@@ -189,7 +189,7 @@ plugins:
         https://download.jboss.org/jbosstools/vscode/3rdparty/vscode-yaml/vscode-yaml-0.8.0.vsix
   - repository:
       url: 'https://github.com/camel-tooling/vscode-camelk'
-      revision: 0.0.20
+      revision: 0.0.21
     sidecar:
       directory: camelk
       name: vscode-camelk
@@ -198,7 +198,7 @@ plugins:
       cpuRequest: 30m
     extensions:
       - >-
-        https://download.jboss.org/jbosstools/vscode/stable/vscode-camelk/vscode-camelk-0.0.20-83.vsix
+        https://download.jboss.org/jbosstools/vscode/stable/vscode-camelk/vscode-camelk-0.0.21-109.vsix
       - >-
         https://download.jboss.org/jbosstools/vscode/3rdparty/vscode-kubernetes-tools/vscode-kubernetes-tools-1.2.1.vsix
       - >-
@@ -741,3 +741,11 @@ plugins:
     extensions:
       - >-
         https://download.jboss.org/jbosstools/vscode/3rdparty/vscode-eslint/vscode-eslint-2.1.1-1e15d3.vsix
+  - repository:
+      url: 'https://github.com/mjbvz/vscode-markdown-mermaid'
+      revision: 1.9.2
+    extensions:
+      - >-
+        https://github.com/redhat-developer/codeready-workspaces-vscode-extensions/releases/download/vf278912/vscode-markdown-mermaid-1.9.2.vsix
+      - >-
+        https://github.com/redhat-developer/codeready-workspaces-vscode-extensions/releases/download/vf278912/vscode-mermaid-syntax-highlight-d4247b5feadd92d429d69a6b511f5ed0e1011895.vsix
diff --git a/cico_build_ci.sh b/cico_build_ci.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/cico_build_nightly.sh b/cico_build_nightly.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/cico_build_release.sh b/cico_build_release.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/cico_functions.sh b/cico_functions.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/deploy/kubernetes/che-plugin-registry/Chart.yaml b/deploy/kubernetes/che-plugin-registry/Chart.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/deploy/kubernetes/che-plugin-registry/templates/configmap.yaml b/deploy/kubernetes/che-plugin-registry/templates/configmap.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/deploy/kubernetes/che-plugin-registry/templates/deployment.yaml b/deploy/kubernetes/che-plugin-registry/templates/deployment.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/deploy/kubernetes/che-plugin-registry/templates/ingress.yaml b/deploy/kubernetes/che-plugin-registry/templates/ingress.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/deploy/kubernetes/che-plugin-registry/templates/service.yaml b/deploy/kubernetes/che-plugin-registry/templates/service.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/deploy/kubernetes/che-plugin-registry/values.yaml b/deploy/kubernetes/che-plugin-registry/values.yaml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/deploy/openshift/che-plugin-registry.yml b/deploy/openshift/che-plugin-registry.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2020 Red Hat, Inc.
+# Copyright (c) 2018-2021 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/

diff --git a/sidecars/camelk/Dockerfile b/sidecars/camelk/Dockerfile
@@ -9,7 +9,7 @@
 #   Red Hat, Inc. - initial API and implementation
 FROM quay.io/eclipse/che-sidecar-kubernetes-tooling:1.2.1-6144144
 
-ENV KAMEL_VERSION 1.2.1
+ENV KAMEL_VERSION 1.3.1
 
 RUN curl -L https://github.com/apache/camel-k/releases/download/v${KAMEL_VERSION}/camel-k-client-${KAMEL_VERSION}-linux-64bit.tar.gz | tar -C /usr/local/bin -xz \
     && chmod +x /usr/local/bin/kamel
diff --git a/sidecars/java/Dockerfile b/sidecars/java/Dockerfile
@@ -11,6 +11,7 @@
 FROM alpine:3.12.1
 
 ENV HOME=/home/theia
+ENV LOMBOK_VERSION=1.18.18
 
 RUN mkdir /projects ${HOME} && \
     # Change permissions to let any arbitrary user
@@ -24,6 +25,8 @@ RUN apk --no-cache add openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpi
 ENV JAVA_HOME /usr/lib/jvm/default-jvm/
 ADD etc/before-start.sh /before-start.sh
 
+RUN wget -O ${HOME}/lombok.jar https://projectlombok.org/downloads/lombok-${LOMBOK_VERSION}.jar
+
 WORKDIR /projects
 
 ADD etc/entrypoint.sh /entrypoint.sh

diff --git a/sidecars/java8/Dockerfile b/sidecars/java8/Dockerfile
@@ -11,6 +11,7 @@
 FROM alpine:3.10.2
 
 ENV HOME=/home/theia
+ENV LOMBOK_VERSION=1.18.18
 
 RUN mkdir /projects ${HOME} && \
     # Change permissions to let any arbitrary user
@@ -25,6 +26,8 @@ ADD etc/before-start.sh /before-start.sh
 
 ADD etc/entrypoint.sh /entrypoint.sh
 
+RUN wget -O ${HOME}/lombok.jar https://projectlombok.org/downloads/lombok-${LOMBOK_VERSION}.jar
+
 WORKDIR /projects
 
 ENTRYPOINT ["/entrypoint.sh"]

diff --git a/tools/automation/.ci/publish-report.sh b/tools/automation/.ci/publish-report.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright (c) 2020-2021 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/

diff --git a/tools/automation/src/check-plugin-updates.ts b/tools/automation/src/check-plugin-updates.ts
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2020 Red Hat, Inc.
+ * Copyright (c) 2020-2021 Red Hat, Inc.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at

diff --git a/tools/automation/tests/pr-check.spec.ts b/tools/automation/tests/pr-check.spec.ts
@@ -1,5 +1,5 @@
 /**********************************************************************
- * Copyright (c) 2020 Red Hat, Inc.
+ * Copyright (c) 2020-2021 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/tools/build/__mocks__/decompress.ts b/tools/build/__mocks__/decompress.ts
@@ -1,5 +1,5 @@
 /**********************************************************************
- * Copyright (c) 2020 Red Hat, Inc.
+ * Copyright (c) 2020-2021 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/tools/build/__mocks__/fs-extra.ts b/tools/build/__mocks__/fs-extra.ts
@@ -1,5 +1,5 @@
 /**********************************************************************
- * Copyright (c) 2020 Red Hat, Inc.
+ * Copyright (c) 2020-2021 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/tools/build/src/che-plugin/che-plugins-analyzer.ts b/tools/build/src/che-plugin/che-plugins-analyzer.ts
@@ -1,5 +1,5 @@
 /**********************************************************************
- * Copyright (c) 2020 Red Hat, Inc.
+ * Copyright (c) 2020-2021 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0

diff --git a/tools/build/src/che-plugin/che-plugins-meta-info.ts b/tools/build/src/che-plugin/che-plugins-meta-info.ts
@@ -1,5 +1,5 @@
 /**********************************************************************
- * Copyright (c) 2020 Red Hat, Inc.
+ * Copyright (c) 2020-2021 Red Hat, Inc.
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0