Updating to the 7.7.0 upstream version

assembly/assembly-wsmaster-war/pom.xml

@@ -88,6 +88,10 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-commons-inject</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.che.multiuser</groupId>
+            <artifactId>che-multiuser-api-authentication-commons</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.che.multiuser</groupId>
             <artifactId>che-multiuser-keycloak-server</artifactId>

assembly/assembly-wsmaster-war/src/main/java/com/redhat/che/wsmaster/deploy/DisableAuthenticationInterceptor.java

@@ -23,7 +23,8 @@
 
 /**
  * This interceptor must be bound for the {@code doFilter} method of the {@link
- * KeycloakEnvironmentInitalizationFilter} and {@link KeycloakAuthenticationFilter} classes.
+ * MultiUserEnvironmentInitializationFilter} and {@link KeycloakEnvironmentInitializationFilter}
+ * classes.
  *
  * @author David Festal
  */

assembly/assembly-wsmaster-war/src/main/java/com/redhat/che/wsmaster/deploy/Fabric8WsMasterModule.java

@@ -19,7 +19,7 @@
 import com.redhat.che.multitenant.Fabric8OAuthAPIProvider;
 import java.lang.reflect.Method;
 import org.eclipse.che.inject.DynaModule;
-import org.eclipse.che.multiuser.keycloak.server.AbstractKeycloakFilter;
+import org.eclipse.che.multiuser.api.authentication.commons.filter.MultiUserEnvironmentInitializationFilter;
 import org.eclipse.che.multiuser.keycloak.server.KeycloakServiceClient;
 import org.eclipse.che.multiuser.keycloak.server.deploy.OAuthAPIProvider;
 import org.eclipse.che.multiuser.keycloak.token.provider.oauth.OpenShiftGitHubOAuthAuthenticator;
@@ -40,7 +40,7 @@ protected void configure() {
         new DisableAuthenticationInterceptor();
     requestInjection(disableAuthenticationInterceptor);
     bindInterceptor(
-        Matchers.subclassesOf(AbstractKeycloakFilter.class),
+        Matchers.subclassesOf(MultiUserEnvironmentInitializationFilter.class),
         new AbstractMatcher<Method>() {
           @Override
           public boolean matches(Method m) {

assembly/fabric8-ide-dashboard-war/Dockerfile

@@ -12,7 +12,7 @@
 # Build step: $ docker build -t eclipse-che-dashboard .
 # It builds an archive file that can be used by doing later
 #  $ docker run --rm eclipse-che-dashboard | tar -C target/ -zxf -
-FROM node:8.15.1
+FROM node:8.16.0
 
 ARG SOURCES_DIR
 
@@ -22,13 +22,12 @@ RUN apt-get update && \
     && rm -rf /var/lib/apt/lists/*
 RUN yarn global upgrade yarn@1.13.0
 # Copy only necessary files and run yarn with them to allow caching in case dependencies hasn't changed
-COPY ["${SOURCES_DIR}/package.json", "${SOURCES_DIR}/typings.json", "/dashboard/"]
+COPY ["${SOURCES_DIR}/package.json", "${SOURCES_DIR}/yarn.lock", "/dashboard/"]
 WORKDIR /dashboard
 RUN yarn install --ignore-optional
 # Copy all the files (including previously copied) for simplicity of the Dockerfile
 COPY ${SOURCES_DIR} /dashboard/
-#RUN yarn build && yarn test
-RUN yarn build
+RUN yarn build && yarn test
 RUN cd /dashboard/target/ && tar zcf /tmp/dashboard.tar.gz dist/
 
 CMD zcat /tmp/dashboard.tar.gz

assembly/fabric8-ide-dashboard-war/index.d.ts

@@ -0,0 +1,8 @@
+// remove this declaration after upgrading typescript version > 3.5
+import * as _angular from 'angular';
+import * as _jsyaml from 'js-yaml';
+
+declare global {
+  const angular: typeof _angular;
+  const jsyaml: typeof _jsyaml;
+}

assembly/fabric8-ide-dashboard-war/pom.xml

@@ -87,6 +87,7 @@
                                 <copy overwrite="true" todir="${basedir}/target/sources/" verbose="true">
                                     <fileset dir="${basedir}">
                                         <include name="src/**" />
+                                        <include name="index.d.ts" />
                                     </fileset>
                                 </copy>
                             </target>