Update to the upstream.

README.md

@@ -1,2 +1,48 @@
-TODO
-### Che server
+[![Next build Status](https://github.com/eclipse-che/che-theia/actions/workflows/next-build.yml/badge.svg)]
+[![Release build Status](https://github.com/eclipse-che/che-theia/actions/workflows/release.yml/badge.svg)]
+
+# What is Che server
+Che Server is a core component of the [Eclipse Che](https://github.com/eclipse/che/). This component is responsibe for creation and managing of Che workspaces, but will some day be replaced by the [Dev Workspace Operator](https://github.com/devfile/devworkspace-operator). 
+
+# Project structure
+Che Server is mostly a Java web application deployed on a Apache Tomcat server in a container. 
+- ['pom.xml'](https://github.com/eclipse-che/che-server/tree/main/pom.xml) The root Maven module, that lists all dependencies and structure. 
+- ['assembly'](https://github.com/eclipse-che/che-server/tree/main/assembly) - module for final assemblies of Che web applications
+- ['dockerfiles'](https://github.com/eclipse-che/che-server/tree/main/dockerfiles) - directory contains image Dockerfile for Che Server, as well as additional images.
+- ['core'](https://github.com/eclipse-che/che-server/tree/main/core) - core and utility modules for Che.
+- ['wsmaster'](https://github.com/eclipse-che/che-server/tree/main/wsmaster) - primary modules of the Che Server API.
+- ['multiuser'](https://github.com/eclipse-che/che-server/tree/main/multiuser) - modules related to multiuser implementation of Che.
+- ['infrastructure'](https://github.com/eclipse-che/che-server/tree/main/infrastructure) - implementations for the underlying infrastructure, on which Che is running (Kubernetes, Openshift, etc.)
+- ['deploy'](https://github.com/eclipse-che/che-server/tree/main/deploy) - deployment files for Helm installation.
+- ['typescript-dto'](https://github.com/eclipse-che/che-server/tree/main/typescript-dto) module, that provides DTO objects for typescript projects that may depend on Che Server, such as Che Theia.
+
+# Build requirements
+- Apache Maven 3.6.3 or Higher
+- JDK Version 11
+- Podman or Docker (required for running integration tests)
+
+# Build and debug
+Run `mvn clean install` to build 
+Activate a faster profile build by adding `-Pfast`
+To debug, run `mvn clean install -X` and connect your IDE to the debug port
+
+# CI
+There are several [GitHub Actions](https://github.com/eclipse-che/che-server/actions) workflows implemented for this repository:
+
+- [`next`](https://github.com/eclipse-che/che-server/actions/workflows/next-build.yml) - builds Maven artifacts, builds container images and pushes them to [quay.io](https://quay.io/organization/eclipse) on each commit to [`main`](https://github.com/eclipse-che/che-server/tree/main) branch.
+- [`release`](https://github.com/eclipse-che/che-server/actions/workflows/release.yml) - builds Maven artifacts and container images. Images are public and pushed to [quay.io](https://quay.io/organization/eclipse). See [RELEASE.md](https://github.com/eclipse-che/che-server/blob/master/RELEASE.md) for more information about this workflow.
+- [`release-changelog`](https://github.com/eclipse-che/che-server/actions/workflows/release-changelog.yml) - create GitHub release and generate, which will include a generated changelog
+- [`build-pr-check`](https://github.com/eclipse-che/che-server/actions/workflows/build-pr-check.yml) - builds Maven artifacts and container images. This workflow is used as a pull request check for all pull requests, that are submitted to this project 
+- [`sonar`](https://github.com/eclipse-che/che-server/actions/workflows/sonar.yml) - This check runs Sonar against the main branch. The result can be seen here https://sonarcloud.io/dashboard?id=org.eclipse.che%3Ache-server
+# License
+
+- [Eclipse Public License 2.0](LICENSE)
+
+# Join the community
+
+The Eclipse Che community is globally reachable through public chat rooms, mailing list and weekly calls.
+See https://www.eclipse.org/che/docs/che-7/overview/introduction-to-eclipse-che/#_joining_the_community
+
+## Report issues
+
+Issues are tracked on the main Eclipse Che Repository: https://github.com/eclipse/che/issues

core/che-core-db-vendor-h2/pom.xml

@@ -32,7 +32,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <scope>provided</scope>
  </dependency>
  </dependencies>

core/che-core-db-vendor-mysql/pom.xml

@@ -32,7 +32,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <scope>provided</scope>
  </dependency>
  </dependencies>

core/che-core-db-vendor-postgresql/pom.xml

@@ -36,7 +36,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <scope>provided</scope>
  </dependency>
  </dependencies>

core/che-core-db/pom.xml

@@ -76,7 +76,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <scope>provided</scope>
  </dependency>
  <dependency>

core/commons/che-core-commons-test/pom.xml

@@ -73,7 +73,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <scope>provided</scope>
  </dependency>
  </dependencies>

infrastructures/kubernetes/pom.xml

@@ -199,7 +199,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  </dependency>
  <dependency>
  <groupId>org.slf4j</groupId>

make-release.sh

@@ -116,7 +116,7 @@ checkoutTags() {
  cd ..
 }
 
-# check for build errors, since we're using set +e above to NOT fail the build for Nexus problems
+# check for build errors, since we're using set +e above to NOT fail the build for network errors
 checkLogForErrors () {
  tmplog="$1"
  errors_in_log="$(grep -E "FAILURE \[|BUILD FAILURE|Failed to execute goal" $tmplog || true)"
@@ -237,8 +237,8 @@ releaseCheServer() {
  mvn clean install -ntp -U -Pcodenvy-release -Dgpg.passphrase=$CHE_OSS_SONATYPE_PASSPHRASE | tee $tmpmvnlog
  EXIT_CODE=$?
  set -e
- # try maven build again if Nexus dies
- if grep -q -E "502 - Bad Gateway|Nexus connection problem" $tmpmvnlog; then
+ # try maven build again if we receive a server error
+ if grep -q -E "502 - Bad Gateway" $tmpmvnlog; then
  rm -f $tmpmvnlog || true
  mvn clean install -ntp -U -Pcodenvy-release -Dgpg.passphrase=$CHE_OSS_SONATYPE_PASSPHRASE | tee $tmpmvnlog
  EXIT_CODE=$?
@@ -260,8 +260,8 @@ releaseCheServer() {
  mvn clean install -U -Pcodenvy-release -Dgpg.passphrase=$CHE_OSS_SONATYPE_PASSPHRASE | tee $tmpmvnlog
  EXIT_CODE=$?
  set -e
- # try maven build again if Nexus dies
- if grep -q -E "502 - Bad Gateway|Nexus connection problem" $tmpmvnlog; then
+ # try maven build again if we receive a server error
+ if grep -q -E "502 - Bad Gateway" $tmpmvnlog; then
  rm -f $tmpmvnlog || true
  mvn clean install -U -Pcodenvy-release -Dgpg.passphrase=$CHE_OSS_SONATYPE_PASSPHRASE | tee $tmpmvnlog
  EXIT_CODE=$?

multiuser/api/che-multiuser-api-organization/pom.xml

@@ -120,7 +120,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  </dependency>
  <dependency>
  <groupId>org.everrest</groupId>

multiuser/api/che-multiuser-api-permission/pom.xml

@@ -105,7 +105,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <scope>provided</scope>
  </dependency>
  <dependency>

multiuser/api/che-multiuser-api-resource/pom.xml

@@ -100,7 +100,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  </dependency>
  <dependency>
  <groupId>org.slf4j</groupId>

multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml

@@ -112,7 +112,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  </dependency>
  <dependency>
  <groupId>org.everrest</groupId>

multiuser/permission/che-multiuser-permission-devfile/pom.xml

@@ -112,7 +112,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <scope>provided</scope>
  </dependency>
  <dependency>

multiuser/permission/che-multiuser-permission-workspace/pom.xml

@@ -111,7 +111,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <scope>provided</scope>
  </dependency>
  <dependency>

pom.xml

@@ -53,33 +53,33 @@
  <com.fasterxml.jackson.version>2.11.2</com.fasterxml.jackson.version>
  <com.github.kirviq.dumbster.version>1.7.1</com.github.kirviq.dumbster.version>
  <com.github.tomakehurst.wiremock-jre8-standalone.version>2.31.0</com.github.tomakehurst.wiremock-jre8-standalone.version>
- <com.google.code.guice.version>4.2.2</com.google.code.guice.version>
+ <com.google.code.guice.version>5.0.1</com.google.code.guice.version>
  <com.google.errorprone>2.3.4</com.google.errorprone>
  <com.google.guava.version>30.1.1-jre</com.google.guava.version>
  <com.google.http-client.version>1.39.1</com.google.http-client.version>
- <com.google.oauth-client.version>1.31.5</com.google.oauth-client.version>
+ <com.google.oauth-client.version>1.32.1</com.google.oauth-client.version>
  <com.googlecode.gson.version>2.8.5</com.googlecode.gson.version>
  <com.h2database.version>1.4.196</com.h2database.version>
  <com.jcraft.jsch.version>0.1.54</com.jcraft.jsch.version>
  <com.squareup.okhttp3.version>3.12.12</com.squareup.okhttp3.version>
  <com.squareup.okio.version>1.15.0</com.squareup.okio.version>
  <commons-codec.version>1.11</commons-codec.version>
  <commons-fileupload.version>1.3.3</commons-fileupload.version>
- <commons-io.version>2.8.0</commons-io.version>
+ <commons-io.version>2.11.0</commons-io.version>
  <commons-lang.version>2.6</commons-lang.version>
  <enforcer.skip>false</enforcer.skip>
  <integration.mysql.db.image>quay.io/eclipse/che--centos--mysql-57-centos7:latest-e08ee4d43b7356607685b69bde6335e27cf20c020f345b6c6c59400183882764</integration.mysql.db.image>
- <integration.postgresql.db.image>quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392</integration.postgresql.db.image>
+ <integration.postgresql.db.image>quay.io/eclipse/che--centos--postgresql-13-centos7:1-71b24684d64da46f960682cc4216222a7e4ed8b1a31dd5a865b3e71afdea20d2</integration.postgresql.db.image>
  <io.fabric8.kubernetes-client>5.7.3</io.fabric8.kubernetes-client>
- <io.github.mweirauch.micrometer-jvm-extras.version>0.1.3</io.github.mweirauch.micrometer-jvm-extras.version>
+ <io.github.mweirauch.micrometer-jvm-extras.version>0.2.2</io.github.mweirauch.micrometer-jvm-extras.version>
  <io.jaegertracing.micrometer.version>1.0.0</io.jaegertracing.micrometer.version>
  <io.jaegertracing.version>1.0.0</io.jaegertracing.version>
  <io.jsonwebtoken.jjwt.version>0.11.2</io.jsonwebtoken.jjwt.version>
  <io.micrometer.version>1.3.1</io.micrometer.version>
  <io.opentracing.api.extensions.version>0.5.0</io.opentracing.api.extensions.version>
  <io.opentracing.concurrent.version>0.4.0</io.opentracing.concurrent.version>
  <io.opentracing.contrib.metrics.version>0.3.0</io.opentracing.contrib.metrics.version>
- <io.opentracing.jdbc.version>0.1.8</io.opentracing.jdbc.version>
+ <io.opentracing.jdbc.version>0.2.15</io.opentracing.jdbc.version>
  <io.opentracing.tracerresolver.version>0.1.8</io.opentracing.tracerresolver.version>
  <io.opentracing.version>0.33.0</io.opentracing.version>
  <io.opentracing.web-servlet-filter.version>0.4.0</io.opentracing.web-servlet-filter.version>
@@ -115,7 +115,7 @@
  <maven.dependency.plugin.version>3.1.2</maven.dependency.plugin.version>
  <maven.enforcer.plugin.version>3.0.0</maven.enforcer.plugin.version>
  <maven.exec.plugin.version>3.0.0</maven.exec.plugin.version>
- <maven.fabric8io.docker.plugin.version>0.35.0</maven.fabric8io.docker.plugin.version>
+ <maven.fabric8io.docker.plugin.version>0.37.0</maven.fabric8io.docker.plugin.version>
  <maven.failsafe.plugin.version>3.0.0-M5</maven.failsafe.plugin.version>
  <maven.fmt.plugin.version>2.5.1</maven.fmt.plugin.version>
  <maven.install.plugin.version>3.0.0-M1</maven.install.plugin.version>
@@ -141,13 +141,13 @@
  <org.apache.maven.verson>3.3.3</org.apache.maven.verson>
  <org.apache.tomcat.version>10.0.11</org.apache.tomcat.version>
  <org.codehaus.plexus.utils.version>3.0.20</org.codehaus.plexus.utils.version>
- <org.eclipse.persistence.eclipselink.version>2.7.5</org.eclipse.persistence.eclipselink.version>
- <org.eclipse.persistence.version>2.2.0</org.eclipse.persistence.version>
- <org.eclipse.sisu.version>0.3.0</org.eclipse.sisu.version>
+ <org.eclipse.persistence.eclipselink.version>2.7.9</org.eclipse.persistence.eclipselink.version>
+ <org.eclipse.persistence.version>2.2.3</org.eclipse.persistence.version>
+ <org.eclipse.sisu.version>0.3.5</org.eclipse.sisu.version>
  <org.everrest.version>1.15.0</org.everrest.version>
  <org.flyway.version>4.2.0</org.flyway.version>
  <org.hamcrest.version>2.2</org.hamcrest.version>
- <org.javassist.version>3.18.2-GA</org.javassist.version>
+ <org.javassist.version>3.28.0-GA</org.javassist.version>
  <org.jgroups.kubernetes.version>1.0.13.Final</org.jgroups.kubernetes.version>
  <org.jgroups.version>4.1.9.Final</org.jgroups.version>
  <org.leadpony.justify.version>3.1.0</org.leadpony.justify.version>
@@ -1190,7 +1190,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <version>${org.eclipse.persistence.version}</version>
  </dependency>
  <dependency>

wsmaster/che-core-api-account/pom.xml

@@ -54,7 +54,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <scope>provided</scope>
  </dependency>
  <dependency>

wsmaster/che-core-api-auth-bitbucket/src/main/java/org/eclipse/che/security/oauth1/NoopOAuthAuthenticator.java

@@ -18,32 +18,32 @@
  * integration is configured.
  */
 public class NoopOAuthAuthenticator extends OAuthAuthenticator {
- protected NoopOAuthAuthenticator() {
+ public NoopOAuthAuthenticator() {
  super(null, null, null, null, null, null, null);
  }
 
  @Override
- String getOAuthProvider() {
+ public String getOAuthProvider() {
  return "Noop";
  }
 
  @Override
  String getAuthenticateUrl(URL requestUrl, String requestMethod, String signatureMethod)
  throws OAuthAuthenticationException {
- throw new RuntimeException(
+ throw new OAuthAuthenticationException(
  "The fallback noop authenticator cannot be used for authentication. Make sure OAuth is properly configured.");
  }
 
  @Override
  String callback(URL requestUrl) throws OAuthAuthenticationException {
- throw new RuntimeException(
+ throw new OAuthAuthenticationException(
  "The fallback noop authenticator cannot be used for authentication. Make sure OAuth is properly configured.");
  }
 
  @Override
  public String computeAuthorizationHeader(String userId, String requestMethod, String requestUrl)
  throws OAuthAuthenticationException {
- throw new RuntimeException(
+ throw new OAuthAuthenticationException(
  "The fallback noop authenticator cannot be used for authentication. Make sure OAuth is properly configured.");
  }
 

wsmaster/che-core-api-auth/src/main/java/org/eclipse/che/security/oauth1/OAuthAuthenticator.java

@@ -233,7 +233,7 @@ String callback(final URL requestUrl) throws OAuthAuthenticationException {
  *
  * @return the oauth provider name.
  */
- abstract String getOAuthProvider();
+ public abstract String getOAuthProvider();
 
  /**
  * Returns URL to initiate authentication process using given authenticator. Typically points to

wsmaster/che-core-api-auth/src/test/java/org/eclipse/che/security/oauth1/OAuthAuthenticatorTest.java

@@ -54,7 +54,7 @@ void start() {
  null,
  "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDZvr2tssVQ46qE1UBK1DFRZrKuIBMCL5q+cltLAVJZ7dlsdv2Yr5mgt3il2BQa0CSmwxTsMdwYqRIDchroVREs5IAfcwOFAL6OnMos/8AEg8Gamnz/Fu1/968bmlV/abKfrdlfkUNuOtpzG5PCf8UAQEt0ajMtFWKFeXPl527BTwRqz1rRVU/wqDC3nS6PM335XCr6mjdBzFDMUC1M91l34M6wPJVPcDRi3cQDb1+YMrFmuzloEs6nlUtM9gH4t9SD9bmBOOj5M7lo3jMuNJ+tE/5M/wrjs1BYbFiUKL3n/BKdyPHpGDssFwo25UBvJWPZZ/YFu6HTD85uUfsbDuTlAgMBAAECggEAA0hY27GCQAHupCoC2h3w0GVX9EAPiUzmbFCVB8BxWWG4kWYJ1K9xBXc+nmFvjCfvJYRzYEwwIT8LQnoJ5c7Cf4bCV7cIKo0kUkoS0jLY1jiWRpploALceb1mKmhdOZqCUt3wFPy/o33HpUyZIamDcsmFWa/wLZHQ9moqUSD4Dnn3Wy6mLyipQDC8LIjPQceuU96VGbZa/XJR8sVMulpgUHvQRzr9PZ1tw4yAK+tcg3rfx4XT6qZS64o4mYrNGYO3QBH3AMUZl1BVG9Q2SlrUM+RGlS5c3DYsFCD40yDBCJIvW1Tfoc4nuDn71rgDEQUZzZlP9X6q1Eh8karaHCrEAQKBgQD16HUcfEd+asDa80BZm3U9Rp0lI1JIfrF/AWR6RR1rldnZOGnQD4untYSZF8vpGdSN5t26szYGJQz9SZl1dtz5sQsyXY9TrGnSf/byoy8yJ6FU3IRaIfoxiAV1fL/QxLsyDls4G5OF9kCu4u2IDKPgDQnb1x9Kq8dQHIyB44eWJQKBgQDirmZToQNZE2GKS+GMxFeeGBTLuV2ED3YuyhRAE3v1bvMRsxcNpMWeCxPMfu8Ctn51yxvTkhRYF3vUz7HjfHYfSMFPf+DwZjOCVWMTT6d8XOcjXIq+mY2Dyek7Kagbbx2oMyBC9HCe0/iK0nOhUNfYFi8PFyDrosvmcQO3qEX3wQKBgG/+5xeKIqWYySzvDKfC/apitr9rTtZlnUFSyQhG4hdVsFoWL1rrOZewPCvdgqkvcncOZn3ZkQlLZpcVJicxc4Lk90yA//4D0E5mqXnoiF43Xmrf5AeI4gIdCR9xKYtTjk5F65WqOY4RkXQVNkl4OEqapZrSZxYDFkuONRATKHVhAoGAQSku4wVa6AUpOc78RDHAmgKEH9fmKOsk5uhSD+VJ8dB18PWRP+vIntjCVTt7y0TYb1X2ZsgMLxJ5F0Co+yKw9ec9InQ5HgHS9rlC5K82DwrJqqGUhJuxUVv+PnKID3LOjKY9tOF9ajq2rHk4ofuSQFyIJIdagEHo6RI9plKp4kECgYAtVUUoXAn5EKLuNVPzlnH+E+iBco0WaQGtsWhIlu6RVhSwJNrldxMFIuWzG56RoFV5tu+KA05RZx82cbazcJJVfwn7S6rmHCdxri3bjpnwgNHmY9E9cxBsEBW2DIYTyI8tbEytbH8syYPGSxb5+VIZEuP+8qel12mVfcoNl/oCCw==") {
  @Override
- String getOAuthProvider() {
+ public String getOAuthProvider() {
  return null;
  }
 

wsmaster/che-core-api-devfile/pom.xml

@@ -101,7 +101,7 @@
  </dependency>
  <dependency>
  <groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>jakarta.persistence</artifactId>
  <scope>provided</scope>
  </dependency>
  <dependency>