From c8f798598b45e9aff4f1028a7f16fb1267fc0fc9 Mon Sep 17 00:00:00 2001
From: root <root@n21.dusty.ci.centos.org>
Date: Fri, 31 Jan 2020 02:09:04 +0000
Subject: [PATCH 1/3] Changing version of parent che to '7.9.0' upstream
 version

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 99b7b2d56..2fc797e5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <artifactId>che-parent</artifactId>
         <groupId>org.eclipse.che</groupId>
-        <version>7.8.0</version>
+        <version>7.9.0</version>
     </parent>
     <groupId>com.redhat.che</groupId>
     <artifactId>fabric8-ide-parent</artifactId>
@@ -31,7 +31,7 @@
         <module>functional-tests</module>
     </modules>
     <properties>
-        <che.version>7.8.0</che.version>
+        <che.version>7.9.0</che.version>
         <keycloak.version>2.5.0.Final</keycloak.version>
         <redhat.che.version>1.0.0-SNAPSHOT</redhat.che.version>
         <rh.che.plugins.version>1.0.0-SNAPSHOT</rh.che.plugins.version>

From 134071f42b5f4ec6f80fef22428d6939c87602af Mon Sep 17 00:00:00 2001
From: Ilya Buziuk <ibuziuk@redhat.com>
Date: Tue, 25 Feb 2020 16:37:16 +0100
Subject: [PATCH 2/3] che #16112: Providing hot-fix for jwt-proxy volume path
 issue

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
---
 openshift/rh-che.config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openshift/rh-che.config.yaml b/openshift/rh-che.config.yaml
index f3f375619..88a9df3d5 100644
--- a/openshift/rh-che.config.yaml
+++ b/openshift/rh-che.config.yaml
@@ -34,6 +34,7 @@ data:
   CHE_INFRA_KUBERNETES_PVC_PRECREATE__SUBPATHS: "true"
   CHE_INFRA_OPENSHIFT_TLS__ENABLED: "true"
   JAVA_OPTS: "-XX:MaxRAMFraction=2 -XX:+UseParallelGC -XX:MinHeapFreeRatio=25 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dsun.zip.disableMemoryMapping=true -Xms50m -Dfile.encoding=UTF8 -Djava.net.preferIPv4Stack=true"
+  CHE_SERVER_SECURE__EXPOSER_JWTPROXY_IMAGE: "quay.io/eclipse/che-jwtproxy:32eda93"
   CHE_SYSTEM_ADMIN__NAME: "admin"
   CHE_SYSTEM_SUPER__PRIVILEGED__MODE: "true"
   CHE_WEBSOCKET_ENDPOINT: "wss://che.prod-preview.openshift.io/api/websocket"

From a48e5b26cae13afc7465c044dc1ed9cf81660fed Mon Sep 17 00:00:00 2001
From: kkanova <kkanova@redhat.com>
Date: Wed, 26 Feb 2020 13:04:44 +0100
Subject: [PATCH 3/3] Change erroneous text for testing error highlighting.
 Remove LS initialization test.

---
 e2e-saas/mocha-all.opts                   |  6 +--
 e2e-saas/tests/devfiles/JavaMaven.spec.ts | 45 +++++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 e2e-saas/tests/devfiles/JavaMaven.spec.ts

diff --git a/e2e-saas/mocha-all.opts b/e2e-saas/mocha-all.opts
index dfa3e9a68..337c7fd42 100644
--- a/e2e-saas/mocha-all.opts
+++ b/e2e-saas/mocha-all.opts
@@ -1,6 +1,6 @@
 --timeout 120000
 --reporter 'node_modules/e2e/dist/driver/CheReporter.js'
 -u tdd
---spec ./dist/tests/login/Login.spec.js
---spec ./node_modules/e2e/dist/tests/devfiles/JavaVertx.spec.js
---spec ./node_modules/e2e/dist/tests/devfiles/JavaMaven.spec.js
+--spec ./dist/tests/login/Login.spec
+--spec ./dist/tests/devfiles/JavaMaven.spec
+--spec ./node_modules/e2e/dist/tests/devfiles/JavaVertx.spec
diff --git a/e2e-saas/tests/devfiles/JavaMaven.spec.ts b/e2e-saas/tests/devfiles/JavaMaven.spec.ts
new file mode 100644
index 000000000..dde31375d
--- /dev/null
+++ b/e2e-saas/tests/devfiles/JavaMaven.spec.ts
@@ -0,0 +1,45 @@
+/*********************************************************************
+ * Copyright (c) 2019 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ **********************************************************************/
+import 'reflect-metadata';
+import { NameGenerator} from 'e2e';
+import * as testLibrary from 'e2e';
+
+const workspaceName: string = NameGenerator.generate('wksp-test-', 5);
+const sampleName: string = 'console-java-simple';
+const fileFolderPath: string = `${sampleName}/src/main/java/org/eclipse/che/examples`;
+const tabTitle: string = 'HelloWorld.java';
+const codeNavigationClassName: string = 'String.class';
+const stack : string = 'Java Maven';
+const taskName: string = 'maven build';
+
+suite(`${stack} test`, async () => {
+    suite (`Create ${stack} workspace ${workspaceName}`, async () => {
+        testLibrary.createAndOpenWorkspace(workspaceName, stack);
+        testLibrary.waitWorkspaceReadiness(workspaceName, sampleName, 'src');
+    });
+
+    suite('Validation of workspace build and run', async () => {
+        testLibrary.runTask(taskName, 120_000);
+        testLibrary.closeTerminal(taskName);
+    });
+
+    suite('Language server validation', async () => {
+        testLibrary.openFile(fileFolderPath, tabTitle);
+        testLibrary.suggestionInvoking(tabTitle, 10, 20, 'append(char c) : PrintStream');
+        testLibrary.errorHighlighting(tabTitle, 'erroneous_text', 11);
+        testLibrary.autocomplete(tabTitle, 10, 11, 'System - java.lang');
+        testLibrary.codeNavigation(tabTitle, 9, 10, codeNavigationClassName);
+    });
+
+    suite ('Stop and remove workspace', async() => {
+        testLibrary.stopWorkspace(workspaceName);
+        testLibrary.removeWorkspace(workspaceName);
+    });
+});