Merge pull request #94 from PizzaFactory/prp-update-to-the-upstream

Update to the upstream

Author: monaka

.github/workflows/build-pr-check.yml

@@ -20,17 +20,11 @@ jobs:
         fetch-depth: 0
     - name: Check all properties have description
       run: ./check_properties_description.sh
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-       path: ~/.m2/repository
-       key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-       restore-keys: |
-        ${{ runner.os }}-maven-      
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
-        java-version: '11.0.11+9'
+        distribution: 'temurin'
+        java-version: '11.0.14'
+        cache: 'maven'
     - name: Build with Maven
       run: mvn -B clean install -U -Pintegration

.github/workflows/next-build.yml

@@ -22,18 +22,12 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-       path: ~/.m2/repository
-       key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-       restore-keys: |
-        ${{ runner.os }}-maven-      
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
-        java-version: '11.0.11+9'
+        distribution: 'temurin'
+        java-version: '11.0.14'
+        cache: 'maven'
     - name: Login to docker.io
       uses: docker/login-action@v1
       with:
@@ -67,14 +61,6 @@ jobs:
 
         docker push quay.io/eclipse/che-server:next
         docker push quay.io/eclipse/che-server:${{ steps.build.outputs.short_sha1 }}
-    - name: Build ubi8 Che Server image
-      run: |
-        ./dockerfiles/che/build.sh --dockerfile:"rhel.Dockerfile" --tag:"rhel-next"
-        docker tag quay.io/eclipse/che-server:rhel-next quay.io/eclipse/che-server:rhel-${{ steps.build.outputs.short_sha1 }}
-    - name: Push ubi8 Che Server image
-      run: |
-        docker push quay.io/eclipse/che-server:rhel-next
-        docker push quay.io/eclipse/che-server:rhel-${{ steps.build.outputs.short_sha1 }}
     - name: Create failure MM message
       if: ${{ failure() }}
       run: |

.github/workflows/release.yml

@@ -81,8 +81,9 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: '11.0.11+9'
+          distribution: 'temurin'
+          java-version: '11.0.14'
+          cache: 'maven'
       - name: Set up environment
         run: |
           sudo apt-get update -y || true

.github/workflows/sonar.yaml

@@ -14,20 +14,15 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          distribution: 'adopt'
-          java-version: '11.0.11+9'
+          distribution: 'temurin'
+          java-version: '11.0.14'
+          cache: 'maven'
       - name: Cache SonarCloud packages
         uses: actions/cache@v1
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
-      - name: Cache Maven packages
-        uses: actions/cache@v1
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any

assembly/assembly-che-tomcat/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-che-tomcat</artifactId>
     <packaging>jar</packaging>

assembly/assembly-main/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-main</artifactId>
     <packaging>pom</packaging>

assembly/assembly-root-war/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-root-war</artifactId>
     <packaging>war</packaging>

assembly/assembly-swagger-war/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-swagger-war</artifactId>
     <packaging>war</packaging>

assembly/assembly-wsmaster-war/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-assembly-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>assembly-wsmaster-war</artifactId>
     <packaging>war</packaging>

assembly/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-server</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>che-assembly-parent</artifactId>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-api-core</artifactId>
     <packaging>jar</packaging>

core/che-core-api-dto-maven-plugin/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-api-dto-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>

core/che-core-api-dto/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-api-dto</artifactId>
     <packaging>jar</packaging>

core/che-core-api-model/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-api-model</artifactId>
     <packaging>jar</packaging>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db-vendor-h2</artifactId>
     <name>Che Core :: Commons :: DB :: Vendor H2</name>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db-vendor-mysql</artifactId>
     <name>Che Core :: Commons :: DB :: Vendor MySQL</name>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db-vendor-postgresql</artifactId>
     <name>Che Core :: Commons :: DB :: Vendor PostgreSQL</name>

core/che-core-db/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-db</artifactId>
     <name>Che Core :: Commons :: DB</name>

core/che-core-logback/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-logback</artifactId>
     <packaging>jar</packaging>

core/che-core-metrics-core/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-metrics-core</artifactId>
     <name>Che Core :: Commons :: Metrics :: Core</name>

core/che-core-tracing-core/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-tracing-core</artifactId>
     <name>Che Core :: Commons :: Tracing :: Core</name>

core/che-core-tracing-metrics/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-tracing-metrics</artifactId>
     <name>Che Core :: Commons :: Tracing :: Metrics</name>

core/che-core-tracing-web/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-tracing-web</artifactId>
     <name>Che Core :: Commons :: Tracing :: Web</name>

core/che-core-typescript-dto-maven-plugin/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-typescript-dto-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-commons-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-annotations</artifactId>
     <packaging>jar</packaging>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-commons-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-inject</artifactId>
     <packaging>jar</packaging>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-commons-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-j2ee</artifactId>
     <packaging>jar</packaging>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-commons-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-json</artifactId>
     <packaging>jar</packaging>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-commons-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-lang</artifactId>
     <packaging>jar</packaging>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-commons-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-observability</artifactId>
     <name>Che Core :: Commons :: Tracing and Monitoring wrapper</name>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-commons-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-schedule</artifactId>
     <packaging>jar</packaging>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-commons-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-test</artifactId>
     <packaging>jar</packaging>

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

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-commons-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-core-commons-tracing</artifactId>
     <name>Che Core :: Commons :: Tracing</name>

core/commons/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-core-parent</artifactId>
         <groupId>org.eclipse.che.core</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>che-core-commons-parent</artifactId>

core/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-server</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.44.0-SNAPSHOT</version>
+        <version>7.45.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>org.eclipse.che.core</groupId>