From 5bbbf9c337a521832f895d2b743a8bc2096cacf6 Mon Sep 17 00:00:00 2001 From: Florent BENOIT Date: Thu, 3 Aug 2017 08:52:46 +0200 Subject: [PATCH 01/23] Create routes in openshift with the same pattern than the urls provided by naming strategy (#5879) * Create routes in openshift with the same pattern than the urls provided by the naming strategy. Also it will be able to handle service name described through labels on Docker image. It means that for one image 8080 port can be tomcat, but for another image it can be named "vertx" or default value if not specified Change-Id: Ie8e0a09d0be8f6d042f542a76c146e2bbe266fc7 Signed-off-by: Florent BENOIT --- .../openshift/client/CheServicePorts.java | 37 ------ .../openshift/client/OpenShiftConnector.java | 120 +++++++++++++++--- .../kubernetes/KubernetesContainer.java | 6 +- .../client/kubernetes/KubernetesService.java | 6 +- .../kubernetes/KubernetesContainerTest.java | 9 +- .../kubernetes/KubernetesServiceTest.java | 23 +++- 6 files changed, 133 insertions(+), 68 deletions(-) delete mode 100644 plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/CheServicePorts.java diff --git a/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/CheServicePorts.java b/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/CheServicePorts.java deleted file mode 100644 index 5fbbf8cee1..0000000000 --- a/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/CheServicePorts.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012-2017 Red Hat, Inc. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - *******************************************************************************/ -package org.eclipse.che.plugin.openshift.client; - -import com.google.common.collect.ImmutableMap; - -import java.util.Map; - -/** - * Provides mapping between port and Che service name that is using it - */ -public final class CheServicePorts { - private static final Map CHE_SERVICE_PORTS = ImmutableMap. builder(). - put(22, "sshd"). - put(4401, "wsagent"). - put(4403, "wsagent-jpda"). - put(4411, "terminal"). - put(4412, "exec-agent"). - put(8080, "tomcat"). - put(8000, "tomcat-jpda"). - put(9876, "codeserver").build(); - - private CheServicePorts() { - } - - public static Map get() { - return CHE_SERVICE_PORTS; - } -} diff --git a/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftConnector.java b/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftConnector.java index 97b67f9155..74fa728a1f 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftConnector.java +++ b/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftConnector.java @@ -55,6 +55,8 @@ import io.fabric8.openshift.client.DefaultOpenShiftClient; import io.fabric8.openshift.client.OpenShiftClient; import io.fabric8.openshift.client.dsl.DeployableScalableResource; +import com.google.common.collect.ImmutableSet; + import org.eclipse.che.api.core.notification.EventService; import org.eclipse.che.api.core.notification.EventSubscriber; import org.eclipse.che.api.workspace.server.event.ServerIdleEvent; @@ -77,6 +79,7 @@ import org.eclipse.che.plugin.docker.client.json.ContainerState; import org.eclipse.che.plugin.docker.client.json.Event; import org.eclipse.che.plugin.docker.client.json.Filters; import org.eclipse.che.plugin.docker.client.json.HostConfig; +import org.eclipse.che.plugin.docker.client.json.ImageConfig; import org.eclipse.che.plugin.docker.client.json.ImageInfo; import org.eclipse.che.plugin.docker.client.json.NetworkCreated; import org.eclipse.che.plugin.docker.client.json.NetworkSettings; @@ -134,7 +137,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -143,6 +145,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -188,6 +192,12 @@ public class OpenShiftConnector extends DockerConnector { private static final String IDLING_ALPHA_OPENSHIFT_IO_UNIDLE_TARGETS = "idling.alpha.openshift.io/unidle-targets"; private static final String ISO_8601_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ssX"; + /** + * Regexp to extract port (under the form 22/tcp or 4401/tcp, etc.) from label references + */ + public static final String LABEL_CHE_SERVER_REF_KEY = "^che:server:(.*):ref$"; + + private Map execMap = new HashMap<>(); private final String openShiftCheProjectName; @@ -301,6 +311,83 @@ public class OpenShiftConnector extends DockerConnector { } } + /** + * Gets exposed ports for both container and image. + * + * @param containerConfig + * the configuration of the container + * @param imageConfig + * the configuration of the image + * @return all exposed ports + */ + protected Set getExposedPorts(ContainerConfig containerConfig, ImageConfig imageConfig) { + + Set containerExposedPorts = containerConfig.getExposedPorts().keySet(); + Set imageExposedPorts = imageConfig.getExposedPorts().keySet(); + return ImmutableSet.builder().addAll(containerExposedPorts) + .addAll(imageExposedPorts) + .build(); + + } + + /** + * Gets labels for both container and image. + * + * @param containerConfig + * the configuration of the container + * @param imageConfig + * the configuration of the image + * @return all labels found + */ + protected Map getLabels(ContainerConfig containerConfig, ImageConfig imageConfig) { + + // first, get labels defined in the container configuration + Map containerLabels = containerConfig.getLabels(); + + // Also, get labels from the image itself + Map imageLabels = imageConfig.getLabels(); + + // Now merge all labels + final Map allLabels = new HashMap<>(containerLabels); + allLabels.putAll(imageLabels); + return allLabels; + } + + /** + * Gets the mapping between the port (with format 8080/tcp) and the associated label (if found) + * + * @param labels + * the mapping for known port labels + * @param exposedPorts + * the ports that are exposed + * @return a map that allow to get the service name for a given exposed port + */ + protected Map getPortsToRefName(Map labels, Set exposedPorts) { + + // Ports to known/unknown ref is map like : 8080/tcp <--> myCustomLabel + Pattern pattern = Pattern.compile(LABEL_CHE_SERVER_REF_KEY); + Map portsToKnownRefName = labels.entrySet().stream() + .filter(map -> pattern.matcher(map.getKey()).matches()) + .collect(Collectors.toMap(p -> { + Matcher matcher = pattern.matcher(p.getKey()); + matcher.matches(); + String val = matcher.group(1); + return val.contains("/") ? val : val.concat("/tcp"); + }, p -> p.getValue())); + + // add to this map only port without a known ref name + Map portsToUnkownRefName = + exposedPorts.stream().filter((port) -> !portsToKnownRefName.containsKey(port)) + .collect(Collectors.toMap(p -> p, p -> "server-" + p.replace('/', '-'))); + + // list of all ports with refName (known/unknown) + Map portsToRefName = new HashMap(portsToKnownRefName); + portsToRefName.putAll(portsToUnkownRefName); + + return portsToRefName; + + } + /** * @param createContainerParams * @return @@ -346,10 +433,12 @@ public class OpenShiftConnector extends DockerConnector { openShiftCheProjectName, imageStreamTagPullSpec); - Set containerExposedPorts = createContainerParams.getContainerConfig().getExposedPorts().keySet(); - Set imageExposedPorts = inspectImage(InspectImageParams.create(imageForDocker)) - .getConfig().getExposedPorts().keySet(); - Set exposedPorts = getExposedPorts(containerExposedPorts, imageExposedPorts); + ContainerConfig containerConfig = createContainerParams.getContainerConfig(); + ImageConfig imageConfig = inspectImage(InspectImageParams.create(imageForDocker)).getConfig(); + + final Set exposedPorts = getExposedPorts(containerConfig, imageConfig); + final Map labels = getLabels(containerConfig, imageConfig); + Map portsToRefName = getPortsToRefName(labels, exposedPorts); String[] envVariables = createContainerParams.getContainerConfig().getEnv(); String[] volumes = createContainerParams.getContainerConfig().getHostConfig().getBinds(); @@ -393,11 +482,12 @@ public class OpenShiftConnector extends DockerConnector { String containerID; OpenShiftClient openShiftClient = new DefaultOpenShiftClient(); try { - createOpenShiftService(deploymentName, serviceName, exposedPorts, additionalLabels, endpointAliases); + createOpenShiftService(deploymentName, serviceName, exposedPorts, portsToRefName, additionalLabels, endpointAliases); createOpenShiftDeployment(deploymentName, dockerPullSpec, containerName, exposedPorts, + portsToRefName, envVariables, volumes, resourceLimits, @@ -1082,10 +1172,11 @@ public class OpenShiftConnector extends DockerConnector { private void createOpenShiftService(String deploymentName, String serviceName, Set exposedPorts, + Map portsToRefName, Map additionalLabels, String[] endpointAliases) { Map selector = Collections.singletonMap(OPENSHIFT_DEPLOYMENT_LABEL, deploymentName); - List ports = KubernetesService.getServicePortsFrom(exposedPorts); + List ports = KubernetesService.getServicePortsFrom(exposedPorts, portsToRefName); try (OpenShiftClient openShiftClient = new DefaultOpenShiftClient()) { Service service = openShiftClient @@ -1127,6 +1218,7 @@ public class OpenShiftConnector extends DockerConnector { String imageName, String sanitizedContainerName, Set exposedPorts, + Map portsToRefName, String[] envVariables, String[] volumes, Map resourceLimits, @@ -1146,7 +1238,7 @@ public class OpenShiftConnector extends DockerConnector { .withName(sanitizedContainerName) .withImage(imageName) .withEnv(KubernetesEnvVar.getEnvFrom(envVariables)) - .withPorts(KubernetesContainer.getContainerPortsFrom(exposedPorts)) + .withPorts(KubernetesContainer.getContainerPortsFrom(exposedPorts, portsToRefName)) .withImagePullPolicy(OPENSHIFT_IMAGE_PULL_POLICY_IFNOTPRESENT) .withNewSecurityContext() .withPrivileged(false) @@ -1562,17 +1654,7 @@ public class OpenShiftConnector extends DockerConnector { return networkSettingsPorts; } - /** - * @param containerExposedPorts - * @param imageExposedPorts - * @return ports exposed by both image and container - */ - private Set getExposedPorts(Set containerExposedPorts, Set imageExposedPorts) { - Set exposedPorts = new HashSet<>(); - exposedPorts.addAll(containerExposedPorts); - exposedPorts.addAll(imageExposedPorts); - return exposedPorts; - } + /** * @param exposedPorts diff --git a/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesContainer.java b/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesContainer.java index 9168642f1c..d7a1700372 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesContainer.java +++ b/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesContainer.java @@ -15,10 +15,10 @@ import io.fabric8.kubernetes.api.model.ContainerPortBuilder; import org.eclipse.che.plugin.docker.client.json.ContainerConfig; import org.eclipse.che.plugin.docker.client.json.ImageConfig; -import org.eclipse.che.plugin.openshift.client.CheServicePorts; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Set; import static com.google.common.base.Strings.isNullOrEmpty; @@ -38,7 +38,7 @@ public final class KubernetesContainer { * @param exposedPorts * @return list of {@link ContainerPort} */ - public static List getContainerPortsFrom(Set exposedPorts) { + public static List getContainerPortsFrom(Set exposedPorts, Map portsToRefName) { List containerPorts = new ArrayList<>(exposedPorts.size()); for (String exposedPort : exposedPorts) { String[] portAndProtocol = exposedPort.split("/", 2); @@ -46,7 +46,7 @@ public final class KubernetesContainer { String protocol = portAndProtocol[1].toUpperCase(); int portNumber = Integer.parseInt(port); - String portName = CheServicePorts.get().get(portNumber); + String portName = portsToRefName.get(exposedPort); portName = isNullOrEmpty(portName) ? "server-" + exposedPort.replace("/", "-") : portName; ContainerPort containerPort = new ContainerPortBuilder().withName(portName).withProtocol(protocol) diff --git a/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesService.java b/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesService.java index 86da9d9279..55411d4926 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesService.java +++ b/plugins/plugin-docker/che-plugin-openshift-client/src/main/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesService.java @@ -15,10 +15,10 @@ import io.fabric8.kubernetes.api.model.ServicePort; import org.eclipse.che.plugin.docker.client.json.ContainerConfig; import org.eclipse.che.plugin.docker.client.json.ImageConfig; -import org.eclipse.che.plugin.openshift.client.CheServicePorts; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Set; import static com.google.common.base.Strings.isNullOrEmpty; @@ -38,7 +38,7 @@ public final class KubernetesService { * @param exposedPorts * @return list of {@link ServicePort} */ - public static List getServicePortsFrom(Set exposedPorts) { + public static List getServicePortsFrom(Set exposedPorts, Map portsToRefName) { List servicePorts = new ArrayList<>(exposedPorts.size()); for (String exposedPort : exposedPorts) { String[] portAndProtocol = exposedPort.split("/", 2); @@ -46,7 +46,7 @@ public final class KubernetesService { String protocol = portAndProtocol[1]; int portNumber = Integer.parseInt(port); - String portName = CheServicePorts.get().get(portNumber); + String portName = portsToRefName.get(exposedPort); portName = isNullOrEmpty(portName) ? "server-" + exposedPort.replace("/", "-") : portName; int targetPortNumber = portNumber; diff --git a/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesContainerTest.java b/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesContainerTest.java index 25314457f2..dff20844e2 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesContainerTest.java +++ b/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesContainerTest.java @@ -34,9 +34,12 @@ public class KubernetesContainerTest { exposedPorts.add("22/tcp"); exposedPorts.add("4401/tcp"); exposedPorts.add("4403/tcp"); + Map portsToRefName = new HashMap<>(); + portsToRefName.put("8080/tcp", "tomcat"); + // When - List containerPorts = KubernetesContainer.getContainerPortsFrom(exposedPorts); + List containerPorts = KubernetesContainer.getContainerPortsFrom(exposedPorts, portsToRefName); // Then List portsAndProtocols = containerPorts.stream(). @@ -51,9 +54,11 @@ public class KubernetesContainerTest { // Given Map imageExposedPorts = new HashMap<>(); imageExposedPorts.put("8080/tcp",new ExposedPort()); + Map portsToRefName = new HashMap<>(); + portsToRefName.put("8080/tcp", "tomcat"); // When - List containerPorts = KubernetesContainer.getContainerPortsFrom(imageExposedPorts.keySet()); + List containerPorts = KubernetesContainer.getContainerPortsFrom(imageExposedPorts.keySet(), portsToRefName); // Then List portsAndProtocols = containerPorts.stream(). diff --git a/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesServiceTest.java b/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesServiceTest.java index ebcc02a9cf..e9ead8d78d 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesServiceTest.java +++ b/plugins/plugin-docker/che-plugin-openshift-client/src/test/java/org/eclipse/che/plugin/openshift/client/kubernetes/KubernetesServiceTest.java @@ -31,9 +31,11 @@ public class KubernetesServiceTest { // Given Map imageExposedPorts = new HashMap<>(); imageExposedPorts.put("8080/TCP",new ExposedPort()); + Map portsToRefName = new HashMap<>(); + portsToRefName.put("8080/tcp", "tomcat"); // When - List servicePorts = KubernetesService.getServicePortsFrom(imageExposedPorts.keySet()); + List servicePorts = KubernetesService.getServicePortsFrom(imageExposedPorts.keySet(), portsToRefName); // Then List portsAndProtocols = servicePorts.stream(). @@ -51,9 +53,11 @@ public class KubernetesServiceTest { exposedPorts.put("22/TCP",null); exposedPorts.put("4401/TCP",null); exposedPorts.put("4403/TCP",null); + Map portsToRefName = new HashMap<>(); + portsToRefName.put("8080/tcp", "tomcat"); // When - List servicePorts = KubernetesService.getServicePortsFrom(exposedPorts.keySet()); + List servicePorts = KubernetesService.getServicePortsFrom(exposedPorts.keySet(), portsToRefName); // Then List portsAndProtocols = servicePorts.stream(). @@ -75,6 +79,15 @@ public class KubernetesServiceTest { exposedPorts.put("8080/tcp",null); exposedPorts.put("8000/tcp",null); exposedPorts.put("9876/tcp",null); + Map portsToRefName = new HashMap<>(); + portsToRefName.put("22/tcp", "sshd"); + portsToRefName.put("4401/tcp", "wsagent"); + portsToRefName.put("4403/tcp", "wsagent-jpda"); + portsToRefName.put("4411/tcp", "terminal"); + portsToRefName.put("4412/tcp", "exec-agent"); + portsToRefName.put("8080/tcp", "tomcat"); + portsToRefName.put("8000/tcp", "tomcat-jpda"); + portsToRefName.put("9876/tcp", "codeserver"); Set expectedPortNames = new HashSet<>(); expectedPortNames.add("sshd"); @@ -87,7 +100,7 @@ public class KubernetesServiceTest { expectedPortNames.add("codeserver"); // When - List servicePorts = KubernetesService.getServicePortsFrom(exposedPorts.keySet()); + List servicePorts = KubernetesService.getServicePortsFrom(exposedPorts.keySet(), portsToRefName); List actualPortNames = servicePorts.stream(). map(p -> p.getName()).collect(Collectors.toList()); @@ -100,12 +113,14 @@ public class KubernetesServiceTest { // Given Map> exposedPorts = new HashMap<>(); exposedPorts.put("55/tcp",null); + Map portsToRefName = new HashMap<>(); + portsToRefName.put("8080/tcp", "tomcat"); Set expectedPortNames = new HashSet<>(); expectedPortNames.add("server-55-tcp"); // When - List servicePorts = KubernetesService.getServicePortsFrom(exposedPorts.keySet()); + List servicePorts = KubernetesService.getServicePortsFrom(exposedPorts.keySet(), portsToRefName); List actualPortNames = servicePorts.stream(). map(p -> p.getName()).collect(Collectors.toList()); From 26111946c069d6e8acb469e5dda08a27ae70b248 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Tue, 1 Aug 2017 16:56:24 +0300 Subject: [PATCH 02/23] CHE-5415. Do not display importer in the categories list if no appropriate wizard was provided Signed-off-by: Roman Nikitenko --- .../wizard/mainpage/MainPagePresenter.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/mainpage/MainPagePresenter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/mainpage/MainPagePresenter.java index 1ff7677ae0..8dd0085122 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/mainpage/MainPagePresenter.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/projectimport/wizard/mainpage/MainPagePresenter.java @@ -14,13 +14,13 @@ import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; -import org.eclipse.che.ide.api.project.ProjectImportersServiceClient; import org.eclipse.che.api.project.shared.dto.ProjectImporterData; import org.eclipse.che.api.project.shared.dto.ProjectImporterDescriptor; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.project.MutableProjectConfig; +import org.eclipse.che.ide.api.project.ProjectImportersServiceClient; import org.eclipse.che.ide.api.project.wizard.ImportWizardRegistry; import org.eclipse.che.ide.api.wizard.AbstractWizardPage; import org.eclipse.che.ide.projectimport.wizard.presenter.ImportProjectWizardView; @@ -29,7 +29,7 @@ import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.rest.Unmarshallable; import org.eclipse.che.ide.util.NameUtils; -import java.util.Iterator; +import java.util.Comparator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -134,16 +134,7 @@ public class MainPagePresenter extends AbstractWizardPage protected void onSuccess(ProjectImporterData data) { List result = data.getImporters(); String defaultImporterId = data.getConfiguration().get(DEFAULT_PROJECT_IMPORTER); - Iterator itr = result.iterator(); - while (itr.hasNext()) { - ProjectImporterDescriptor importer = itr.next(); - if (importer.getId().equals(defaultImporterId)) { - Set importersSet = new LinkedHashSet<>(); - importersSet.add(importer); - importersByCategory.put(importer.getCategory(), importersSet); - itr.remove(); - } - } + result.sort(getProjectImporterComparator(defaultImporterId)); ProjectImporterDescriptor defaultImporter = null; for (ProjectImporterDescriptor importer : result) { @@ -190,6 +181,20 @@ public class MainPagePresenter extends AbstractWizardPage projectImportersService.getProjectImporters(appContext.getDevMachine(), callback); } + private Comparator getProjectImporterComparator(String defaultImporterId) { + return (o1, o2) -> { + if (o1.getId().equals(defaultImporterId)) { + return -1; + } + + if (o2.getId().equals(defaultImporterId)) { + return 1; + } + + return 0; + }; + } + /** {@inheritDoc} */ @Override public void onEnterClicked() { From 5661a37563551c108a4d071865d32d5c307067c5 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Thu, 3 Aug 2017 13:13:46 +0300 Subject: [PATCH 03/23] Avoid NPE at using MutableProjectConfig Signed-off-by: Roman Nikitenko --- .../ide/api/project/MutableProjectConfig.java | 56 ++++++------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/MutableProjectConfig.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/MutableProjectConfig.java index 5d870f2ea1..20c3d2578e 100644 --- a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/MutableProjectConfig.java +++ b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/MutableProjectConfig.java @@ -20,6 +20,7 @@ import org.eclipse.che.api.machine.shared.dto.CommandDto; import java.util.List; import java.util.Map; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; @@ -55,7 +56,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getName() { - return name; + return firstNonNull(name, ""); } public void setName(String name) { @@ -64,7 +65,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getPath() { - return path; + return firstNonNull(path, ""); } public void setPath(String path) { @@ -73,7 +74,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getDescription() { - return description; + return firstNonNull(description, ""); } public void setDescription(String description) { @@ -82,7 +83,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getType() { - return type; + return firstNonNull(type, ""); } public void setType(String type) { @@ -91,11 +92,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public List getMixins() { - if (mixins == null) { - mixins = newArrayList(); - } - - return mixins; + return firstNonNull(mixins, newArrayList()); } public void setMixins(List mixins) { @@ -104,11 +101,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public Map> getAttributes() { - if (attributes == null) { - attributes = newHashMap(); - } - - return attributes; + return firstNonNull(attributes, newHashMap()); } public void setAttributes(Map> attributes) { @@ -117,11 +110,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public MutableSourceStorage getSource() { - if (sourceStorage == null) { - sourceStorage = new MutableSourceStorage(); - } - - return sourceStorage; + return firstNonNull(sourceStorage, new MutableSourceStorage()); } public void setSource(SourceStorage sourceStorage) { @@ -129,23 +118,17 @@ public class MutableProjectConfig implements ProjectConfig { } public Map getOptions() { - if (options == null) { - options = newHashMap(); - } - return options; + return firstNonNull(options, newHashMap()); } public void setOptions(Map options) { this.options = options; } - + public List getCommands() { - if (commands == null) { - commands = newArrayList(); - } - return commands; + return firstNonNull(commands, newArrayList()); } - + public void setCommands(List commands) { this.commands = commands; } @@ -156,10 +139,7 @@ public class MutableProjectConfig implements ProjectConfig { * @return the list of {@link NewProjectConfig} to creating projects */ public List getProjects() { - if (projects == null) { - return newArrayList(); - } - return projects; + return firstNonNull(projects, newArrayList()); } /** @@ -188,7 +168,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getType() { - return type; + return firstNonNull(type, ""); } public void setType(String type) { @@ -197,7 +177,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getLocation() { - return location; + return firstNonNull(location, ""); } public void setLocation(String location) { @@ -206,11 +186,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public Map getParameters() { - if (parameters == null) { - parameters = newHashMap(); - } - - return parameters; + return firstNonNull(parameters, newHashMap()); } public void setParameters(Map parameters) { From 307491c349de2eca95014afa78f17beb1e1cf86e Mon Sep 17 00:00:00 2001 From: Mykola Morhun Date: Thu, 3 Aug 2017 16:17:25 +0300 Subject: [PATCH 04/23] CHE-5862: Set right handler on double click in Git Compare window (#5885) Set right handler on double click in Git Compare window --- .../changeslist/ChangesListPresenter.java | 1 + .../changespanel/ChangesPanelPresenter.java | 46 ++++++++++++------- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/changeslist/ChangesListPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/changeslist/ChangesListPresenter.java index 926135d231..37cdacad22 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/changeslist/ChangesListPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/changeslist/ChangesListPresenter.java @@ -60,6 +60,7 @@ public class ChangesListPresenter implements ChangesListView.ActionDelegate { this.view = view; this.notificationManager = notificationManager; this.changesPanelPresenter = changesPanelPresenter; + this.changesPanelPresenter.setFileNodeDoubleClickHandler((path, status) -> this.onCompareClicked()); this.view.setDelegate(this); SelectionChangedHandler handler = event -> { diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/changespanel/ChangesPanelPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/changespanel/ChangesPanelPresenter.java index c96d0444f2..f7afb4bef1 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/changespanel/ChangesPanelPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/compare/changespanel/ChangesPanelPresenter.java @@ -26,7 +26,7 @@ import static org.eclipse.che.ide.ext.git.client.compare.changespanel.ViewMode.L import static org.eclipse.che.ide.ext.git.client.compare.changespanel.ViewMode.TREE; /** - * Presenter for displaying list of changed files. + * Presenter for displaying window with list of changed files. * * @author Igor Vinokur * @author Vlad Zhukovskyi @@ -34,14 +34,13 @@ import static org.eclipse.che.ide.ext.git.client.compare.changespanel.ViewMode.T public class ChangesPanelPresenter implements ChangesPanelView.ActionDelegate { private final ChangesPanelView view; - private final AppContext appContext; - private final NotificationManager notificationManager; - private final ComparePresenter comparePresenter; private final GitLocalizationConstant locale; private Map changedFiles; private ViewMode viewMode; + private FileNodeDoubleClickHandler fileNodeDoubleClickHandler; + @Inject public ChangesPanelPresenter(GitLocalizationConstant locale, ChangesPanelView view, @@ -50,11 +49,21 @@ public class ChangesPanelPresenter implements ChangesPanelView.ActionDelegate { ComparePresenter comparePresenter) { this.locale = locale; this.view = view; - this.appContext = appContext; - this.notificationManager = notificationManager; - this.comparePresenter = comparePresenter; this.view.setDelegate(this); this.viewMode = TREE; + + this.fileNodeDoubleClickHandler = (path, status) -> { + appContext.getRootProject() + .getFile(path) + .then(file -> { + if (file.isPresent()) { + comparePresenter.showCompareWithLatest(file.get(), status, "HEAD"); + } + }) + .catchError(error -> { + notificationManager.notify(error.getMessage(), FAIL, NOT_EMERGE_MODE); + }); + }; } /** @@ -83,16 +92,7 @@ public class ChangesPanelPresenter implements ChangesPanelView.ActionDelegate { @Override public void onFileNodeDoubleClicked(String path, final Status status) { - appContext.getRootProject() - .getFile(path) - .then(file -> { - if (file.isPresent()) { - comparePresenter.showCompareWithLatest(file.get(), status, "HEAD"); - } - }) - .catchError(error -> { - notificationManager.notify(error.getMessage(), FAIL, NOT_EMERGE_MODE); - }); + fileNodeDoubleClickHandler.onFileNodeDoubleClicked(path, status); } @Override @@ -117,4 +117,16 @@ public class ChangesPanelPresenter implements ChangesPanelView.ActionDelegate { view.setTextToChangeViewModeButton(viewMode == TREE ? locale.changeListRowListViewButtonText() : locale.changeListGroupByDirectoryButtonText()); } + + public void setFileNodeDoubleClickHandler(FileNodeDoubleClickHandler fileNodeDoubleClickHandler) { + this.fileNodeDoubleClickHandler = fileNodeDoubleClickHandler; + } + + /** + * Describes behaviour on double click action on a selected path. + */ + public interface FileNodeDoubleClickHandler { + void onFileNodeDoubleClicked(String path, final Status status); + } + } From 8638ca905651d1de265f4d920e4510d5aa78ad93 Mon Sep 17 00:00:00 2001 From: Hanno Kolvenbach Date: Thu, 3 Aug 2017 15:50:13 +0200 Subject: [PATCH 05/23] Fixed typo in workspace-list.html Signed-off-by: Hanno Kolvenbach --- .../list-workspaces/workspace-item/workspace-item.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard/src/app/workspaces/list-workspaces/workspace-item/workspace-item.html b/dashboard/src/app/workspaces/list-workspaces/workspace-item/workspace-item.html index da05f5dcc7..f7de49adcd 100644 --- a/dashboard/src/app/workspaces/list-workspaces/workspace-item/workspace-item.html +++ b/dashboard/src/app/workspaces/list-workspaces/workspace-item/workspace-item.html @@ -39,7 +39,7 @@
RAM {{workspaceItemCtrl.getMemoryLimit(workspaceItemCtrl.workspace)}} From 3902db77d1de3cb9d1565aa66c014728c4a8789c Mon Sep 17 00:00:00 2001 From: Igor Vinokur Date: Fri, 4 Aug 2017 08:56:09 +0300 Subject: [PATCH 06/23] CHE-4678: Add all/local/remote filter in Git branches dialog (#5858) --- .../git/client/GitLocalizationConstant.java | 3 + .../git/client/branch/BranchPresenter.java | 9 ++- .../ide/ext/git/client/branch/BranchView.java | 12 +++- .../ext/git/client/branch/BranchViewImpl.java | 19 ++++++ .../git/client/branch/BranchViewImpl.ui.xml | 12 +++- .../client/GitLocalizationConstant.properties | 1 + .../client/branch/BranchPresenterTest.java | 60 ++++++++++++++++--- .../che/api/git/shared/BranchListMode.java | 15 ++++- 8 files changed, 119 insertions(+), 12 deletions(-) diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.java index edbb053662..6acc763c5b 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.java @@ -342,6 +342,9 @@ public interface GitLocalizationConstant extends Messages { @Key("view.branch.delete_ask") String branchDeleteAsk(String name); + @Key("view.branch.filter.label") + String branchFilterLabel(); + @Key("view.branch.title") String branchTitle(); diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java index 8a01cec59c..e1db63a363 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenter.java @@ -15,6 +15,7 @@ import com.google.inject.Singleton; import org.eclipse.che.api.core.ErrorCodes; import org.eclipse.che.api.git.shared.Branch; +import org.eclipse.che.api.git.shared.BranchListMode; import org.eclipse.che.api.git.shared.CheckoutRequest; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.dialogs.DialogFactory; @@ -29,7 +30,6 @@ import org.eclipse.che.ide.processes.panel.ProcessesPanelPresenter; import javax.validation.constraints.NotNull; -import static org.eclipse.che.api.git.shared.BranchListMode.LIST_ALL; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; import static org.eclipse.che.ide.util.ExceptionUtils.getErrorCode; @@ -170,7 +170,7 @@ public class BranchPresenter implements BranchView.ActionDelegate { /** Get the list of branches. */ private void getBranches() { - service.branchList(project.getLocation(), LIST_ALL) + service.branchList(project.getLocation(), BranchListMode.from(view.getFilterValue())) .then(branches -> { if (branches.isEmpty()) { dialogFactory.createMessageDialog(constant.branchTitle(), @@ -212,6 +212,11 @@ public class BranchPresenter implements BranchView.ActionDelegate { view.setEnableDeleteButton(false); } + @Override + public void onFilterValueChanged() { + getBranches(); + } + @Override public void onBranchSelected(@NotNull Branch branch) { selectedBranch = branch; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchView.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchView.java index 3836a3391c..fc7b5c2376 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchView.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchView.java @@ -40,7 +40,7 @@ public interface BranchView extends View { void onCreateClicked(); /** - * Performs any action in response to the user having select branch. + * Performs any action in response to the user having selected branch. * * @param branch * selected revision @@ -49,6 +49,11 @@ public interface BranchView extends View { /** Performs any action in response to the user do not have any selected branch. */ void onBranchUnselected(); + + /** + * Performs any action in response to the user having selected branch filter. + */ + void onFilterValueChanged(); } /** @@ -83,6 +88,11 @@ public interface BranchView extends View { */ void setEnableRenameButton(boolean enabled); + /** + * Returns selected branch filter. + */ + String getFilterValue(); + /** Close dialog. */ void close(); diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.java b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.java index 473168c815..aa2a650e87 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.java @@ -26,12 +26,15 @@ import org.eclipse.che.ide.util.dom.Elements; import org.vectomatic.dom.svg.ui.SVGResource; import com.google.gwt.core.client.GWT; +import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.UIObject; import com.google.gwt.user.client.ui.Widget; @@ -60,6 +63,8 @@ public class BranchViewImpl extends Window implements BranchView { Button btnCheckout; @UiField ScrollPanel branchesPanel; + @UiField + ListBox filter; @UiField(provided = true) final GitResources res; @UiField(provided = true) @@ -128,9 +133,18 @@ public class BranchViewImpl extends Window implements BranchView { .create((SimpleList.View)breakPointsElement, coreRes.defaultSimpleListCss(), listBranchesRenderer, listBranchesDelegate); this.branchesPanel.add(branches); + this.filter.addItem("All", "all"); + this.filter.addItem("Local", "local"); + this.filter.addItem("Remote", "remote"); + createButtons(); } + @UiHandler("filter") + public void onFilterChanged(ChangeEvent event) { + delegate.onFilterValueChanged(); + } + private void createButtons() { btnClose = createButton(locale.buttonClose(), "git-branches-close", new ClickHandler() { @@ -249,6 +263,11 @@ public class BranchViewImpl extends Window implements BranchView { btnRename.setEnabled(enabled); } + @Override + public String getFilterValue() { + return filter.getSelectedValue(); + } + /** {@inheritDoc} */ @Override public void close() { diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.ui.xml b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.ui.xml index 59f4afc10a..eb6a9b414b 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.ui.xml +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/java/org/eclipse/che/ide/ext/git/client/branch/BranchViewImpl.ui.xml @@ -19,8 +19,18 @@ .emptyBorder { margin: 6px; } + + .alignLeft { + float: left; + } - + + + + + + + diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.properties b/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.properties index 5ceb701e80..e3c29fdbcb 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.properties +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.properties @@ -125,6 +125,7 @@ view.branch.title_rename=Enter branch name view.branch.type_rename=Name: view.branch.delete=Delete branch view.branch.delete_ask=Are you sure you want to delete branch {0}? +view.branch.filter.label=Show branches: view.branch.title=Branches #Reset view.reset.files.title=Select files to reset diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java index 5e09f2eea9..1d10acb0dc 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java @@ -11,6 +11,7 @@ package org.eclipse.che.ide.ext.git.client.branch; import org.eclipse.che.api.git.shared.Branch; +import org.eclipse.che.api.git.shared.BranchListMode; import org.eclipse.che.api.git.shared.CheckoutRequest; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.workspace.shared.dto.ProjectConfigDto; @@ -55,24 +56,24 @@ import static org.mockito.Mockito.when; public class BranchPresenterTest extends BaseTest { @Captor - private ArgumentCaptor inputCallbackCaptor; + private ArgumentCaptor inputCallbackCaptor; @Captor - private ArgumentCaptor confirmCallbackCaptor; + private ArgumentCaptor confirmCallbackCaptor; public static final String BRANCH_NAME = "branchName"; public static final String REMOTE_BRANCH_NAME = "origin/branchName"; public static final boolean IS_REMOTE = true; public static final boolean IS_ACTIVE = true; @Mock - private BranchView view; + private BranchView view; @Mock - private Branch selectedBranch; + private Branch selectedBranch; @Mock - private DialogFactory dialogFactory; + private DialogFactory dialogFactory; @Mock - private DtoFactory dtoFactory; + private DtoFactory dtoFactory; @Mock - private CheckoutRequest checkoutRequest; + private CheckoutRequest checkoutRequest; private BranchPresenter presenter; @@ -98,6 +99,7 @@ public class BranchPresenterTest extends BaseTest { when(service.branchList(anyObject(), anyObject())).thenReturn(branchListPromise); when(branchListPromise.then(any(Operation.class))).thenReturn(branchListPromise); when(branchListPromise.catchError(any(Operation.class))).thenReturn(branchListPromise); + when(view.getFilterValue()).thenReturn("all"); } @Test @@ -120,6 +122,50 @@ public class BranchPresenterTest extends BaseTest { verify(constant, never()).branchesListFailed(); } + @Test + public void shouldShowLocalBranchesWheBranchesFilterIsSetToLocal() throws Exception { + //given + final List branches = Collections.singletonList(selectedBranch); + when(service.branchList(anyObject(), eq(BranchListMode.LIST_LOCAL))).thenReturn(branchListPromise); + when(branchListPromise.then(any(Operation.class))).thenReturn(branchListPromise); + when(branchListPromise.catchError(any(Operation.class))).thenReturn(branchListPromise); + when(view.getFilterValue()).thenReturn("local"); + + //when + presenter.showBranches(project); + verify(branchListPromise).then(branchListCaptor.capture()); + branchListCaptor.getValue().apply(branches); + + //then + verify(view).showDialogIfClosed(); + verify(view).setBranches(eq(branches)); + verify(console, never()).printError(anyString()); + verify(notificationManager, never()).notify(anyString(), any(ProjectConfigDto.class)); + verify(constant, never()).branchesListFailed(); + } + + @Test + public void shouldShowRemoteBranchesWheBranchesFilterIsSetToRemote() throws Exception { + //given + final List branches = Collections.singletonList(selectedBranch); + when(service.branchList(anyObject(), eq(BranchListMode.LIST_LOCAL))).thenReturn(branchListPromise); + when(branchListPromise.then(any(Operation.class))).thenReturn(branchListPromise); + when(branchListPromise.catchError(any(Operation.class))).thenReturn(branchListPromise); + when(view.getFilterValue()).thenReturn("remote"); + + //when + presenter.showBranches(project); + verify(branchListPromise).then(branchListCaptor.capture()); + branchListCaptor.getValue().apply(branches); + + //then + verify(view).showDialogIfClosed(); + verify(view).setBranches(eq(branches)); + verify(console, never()).printError(anyString()); + verify(notificationManager, never()).notify(anyString(), any(ProjectConfigDto.class)); + verify(constant, never()).branchesListFailed(); + } + @Test public void testOnCloseClicked() throws Exception { presenter.onCloseClicked(); diff --git a/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/BranchListMode.java b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/BranchListMode.java index 4981f48979..f52b10d71a 100644 --- a/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/BranchListMode.java +++ b/wsagent/che-core-api-git-shared/src/main/java/org/eclipse/che/api/git/shared/BranchListMode.java @@ -32,5 +32,18 @@ public enum BranchListMode { * Show only local branches.
* Corresponds to -l or empty option in console git. */ - LIST_LOCAL + LIST_LOCAL; + + public static BranchListMode from(String mode) { + switch (mode.toLowerCase()) { + case "all": + return LIST_ALL; + case "remote": + return LIST_REMOTE; + case "local": + return LIST_LOCAL; + default: + return null; + } + } } From b51a2b9fa181ada9679346c302658a9c013aa09f Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Fri, 4 Aug 2017 14:02:48 +0300 Subject: [PATCH 07/23] Revert Avoid NPE at using MutableProjectConfig Signed-off-by: Roman Nikitenko --- .../ide/api/project/MutableProjectConfig.java | 52 ++++++++++++++----- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/MutableProjectConfig.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/MutableProjectConfig.java index 20c3d2578e..312633f616 100644 --- a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/MutableProjectConfig.java +++ b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/project/MutableProjectConfig.java @@ -20,7 +20,6 @@ import org.eclipse.che.api.machine.shared.dto.CommandDto; import java.util.List; import java.util.Map; -import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; @@ -56,7 +55,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getName() { - return firstNonNull(name, ""); + return name; } public void setName(String name) { @@ -65,7 +64,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getPath() { - return firstNonNull(path, ""); + return path; } public void setPath(String path) { @@ -74,7 +73,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getDescription() { - return firstNonNull(description, ""); + return description; } public void setDescription(String description) { @@ -83,7 +82,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getType() { - return firstNonNull(type, ""); + return type; } public void setType(String type) { @@ -92,7 +91,11 @@ public class MutableProjectConfig implements ProjectConfig { @Override public List getMixins() { - return firstNonNull(mixins, newArrayList()); + if (mixins == null) { + mixins = newArrayList(); + } + + return mixins; } public void setMixins(List mixins) { @@ -101,7 +104,11 @@ public class MutableProjectConfig implements ProjectConfig { @Override public Map> getAttributes() { - return firstNonNull(attributes, newHashMap()); + if (attributes == null) { + attributes = newHashMap(); + } + + return attributes; } public void setAttributes(Map> attributes) { @@ -110,7 +117,11 @@ public class MutableProjectConfig implements ProjectConfig { @Override public MutableSourceStorage getSource() { - return firstNonNull(sourceStorage, new MutableSourceStorage()); + if (sourceStorage == null) { + sourceStorage = new MutableSourceStorage(); + } + + return sourceStorage; } public void setSource(SourceStorage sourceStorage) { @@ -118,7 +129,10 @@ public class MutableProjectConfig implements ProjectConfig { } public Map getOptions() { - return firstNonNull(options, newHashMap()); + if (options == null) { + options = newHashMap(); + } + return options; } public void setOptions(Map options) { @@ -126,7 +140,10 @@ public class MutableProjectConfig implements ProjectConfig { } public List getCommands() { - return firstNonNull(commands, newArrayList()); + if (commands == null) { + commands = newArrayList(); + } + return commands; } public void setCommands(List commands) { @@ -139,7 +156,10 @@ public class MutableProjectConfig implements ProjectConfig { * @return the list of {@link NewProjectConfig} to creating projects */ public List getProjects() { - return firstNonNull(projects, newArrayList()); + if (projects == null) { + return newArrayList(); + } + return projects; } /** @@ -168,7 +188,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getType() { - return firstNonNull(type, ""); + return type; } public void setType(String type) { @@ -177,7 +197,7 @@ public class MutableProjectConfig implements ProjectConfig { @Override public String getLocation() { - return firstNonNull(location, ""); + return location; } public void setLocation(String location) { @@ -186,7 +206,11 @@ public class MutableProjectConfig implements ProjectConfig { @Override public Map getParameters() { - return firstNonNull(parameters, newHashMap()); + if (parameters == null) { + parameters = newHashMap(); + } + + return parameters; } public void setParameters(Map parameters) { From 530aa4434e0896e38b1632f4ee80902a90a01b3e Mon Sep 17 00:00:00 2001 From: Vladyslav Zhukovskyi Date: Wed, 2 Aug 2017 17:50:55 +0300 Subject: [PATCH 08/23] Sequential restore of the persistence components Signed-off-by: Vladyslav Zhukovskyi --- .../che/ide/api/component/StateComponent.java | 59 +++++++- .../che/ide/editor/EditorAgentImpl.java | 43 ++++-- .../ProjectExplorerStateComponent.java | 140 +++++++++--------- .../ide/statepersistance/AppStateManager.java | 63 +++++--- .../PersistenceApiModule.java | 9 +- .../che/ide/workspace/WorkspacePresenter.java | 36 +++-- .../general/AbstractPerspective.java | 10 +- .../statepersistance/AppStateManagerTest.java | 43 ++++-- .../WorkspacePresenterPersistenceTest.java | 20 ++- 9 files changed, 276 insertions(+), 147 deletions(-) diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/component/StateComponent.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/component/StateComponent.java index 868b2d8b99..2647f86097 100644 --- a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/component/StateComponent.java +++ b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/component/StateComponent.java @@ -12,6 +12,8 @@ package org.eclipse.che.ide.api.component; import elemental.json.JsonObject; +import org.eclipse.che.api.promises.client.Promise; + import javax.validation.constraints.NotNull; /** @@ -20,14 +22,48 @@ import javax.validation.constraints.NotNull; * a multibinder in order to be picked-up on IDE start-up: *

* - * GinMapBinder stateComponents = GinMapBinder.newMapBinder(binder(), String.class, StateComponent.class); - * stateComponents.addBinding("foo").to(Foo.class); + * GinMultibinder stateComponents = GinMultibinder.newSetBinder(binder(), StateComponent.class); + * stateComponents.addBinding().to(Foo.class); * *

+ * * @author Evgen Vidolob + * @author Vlad Zhukovskyi */ public interface StateComponent { + /** + * The minimum priority that state component can have. + * + * @see #getPriority() + * @since 5.16.0 + */ + int MIN_PRIORITY = 1; + + /** + * The default priority that is assigned to a state component. + * + * @see #getPriority() + * @since 5.16.0 + */ + int DEFAULT_PRIORITY = 5; + + /** + * The maximum priority that state component can have. + * + * @see #getPriority() + * @since 5.16.0 + */ + int MAX_PRIORITY = 10; + + /** + * Identifier of the component which may have persistent state. Usually uses to identify from the raw json. + * + * @return component id, any string value, non-null and non-empty. If null occurred, then component is not take a part in serialization + * @since 5.16.0 + */ + String getId(); + /** * Called when component should store his state. * @@ -39,8 +75,23 @@ public interface StateComponent { /** * Called when component should restore his state. * - * @param state the component state object + * @param state + * the component state object */ - void loadState(@NotNull JsonObject state); + Promise loadState(@NotNull JsonObject state); + + /** + * Priority of the execution. Each component may be prioritized to execute one self. + * Values should be from 1 (the last one to execute) to 10 (should be executed as first). Default value is 5. + * + * @return priority for the interceptor in which it should be run + * @see #MIN_PRIORITY + * @see #DEFAULT_PRIORITY + * @see #MAX_PRIORITY + * @since 5.16.0 + */ + default int getPriority() { + return DEFAULT_PRIORITY; + } } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java index 2c8da3a57c..8e5535096e 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/EditorAgentImpl.java @@ -462,31 +462,32 @@ public class EditorAgentImpl implements EditorAgent, @Override @SuppressWarnings("unchecked") - public void loadState(@NotNull final JsonObject state) { + public Promise loadState(@NotNull final JsonObject state) { if (state.hasKey("FILES")) { JsonObject files = state.getObject("FILES"); EditorPartStack partStack = editorMultiPartStack.createRootPartStack(); final Map activeEditors = new HashMap<>(); List> restore = restore(files, partStack, activeEditors); Promise> promise = promiseProvider.all2(restore.toArray(new Promise[restore.size()])); - promise.then(new Operation() { - @Override - public void apply(Object arg) throws OperationException { - String activeFile = ""; - if (state.hasKey("ACTIVE_EDITOR")) { - activeFile = state.getString("ACTIVE_EDITOR"); - } - EditorPartPresenter activeEditorPart = null; - for (Map.Entry entry : activeEditors.entrySet()) { - entry.getValue().setActivePart(entry.getKey()); - if (activeFile.equals(entry.getKey().getEditorInput().getFile().getLocation().toString())) { - activeEditorPart = entry.getKey(); - } - } - workspaceAgent.setActivePart(activeEditorPart); + promise.then((Operation)ignored -> { + String activeFile = ""; + if (state.hasKey("ACTIVE_EDITOR")) { + activeFile = state.getString("ACTIVE_EDITOR"); } + EditorPartPresenter activeEditorPart = null; + for (Map.Entry entry : activeEditors.entrySet()) { + entry.getValue().setActivePart(entry.getKey()); + if (activeFile.equals(entry.getKey().getEditorInput().getFile().getLocation().toString())) { + activeEditorPart = entry.getKey(); + } + } + workspaceAgent.setActivePart(activeEditorPart); }); + + return promise.thenPromise(ignored -> promiseProvider.resolve(null)); } + + return promiseProvider.resolve(null); } private List> restore(JsonObject files, EditorPartStack editorPartStack, @@ -689,4 +690,14 @@ public class EditorAgentImpl implements EditorAgent, } } } + + @Override + public int getPriority() { + return MIN_PRIORITY; + } + + @Override + public String getId() { + return "editor"; + } } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerStateComponent.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerStateComponent.java index cd5f82503d..f2bb943ea4 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerStateComponent.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerStateComponent.java @@ -13,7 +13,10 @@ package org.eclipse.che.ide.part.explorer.project; import elemental.json.Json; import elemental.json.JsonArray; import elemental.json.JsonObject; -import org.eclipse.che.api.promises.client.*; + +import org.eclipse.che.api.promises.client.Promise; +import org.eclipse.che.api.promises.client.PromiseError; +import org.eclipse.che.api.promises.client.PromiseProvider; import org.eclipse.che.ide.api.component.StateComponent; import org.eclipse.che.ide.api.data.tree.Node; import org.eclipse.che.ide.resource.Path; @@ -25,58 +28,53 @@ import org.eclipse.che.ide.util.loging.Log; import javax.inject.Inject; import javax.inject.Singleton; import javax.validation.constraints.NotNull; -import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * Persists and restore state of the project explorer presenter, like expanded nodes and showing hidden files + * + * @author Vlad Zhukovskyi */ @Singleton public class ProjectExplorerStateComponent implements StateComponent { - private static final String PATH_PARAM_ID = "revealPath"; + private static final String PATH_PARAM_ID = "revealPath"; private static final String SHOW_HIDDEN_FILES = "showHiddenFiles"; private final ProjectExplorerPresenter projectExplorer; - private final TreeResourceRevealer revealer; - private final LoaderFactory loaderFactory; + private final TreeResourceRevealer revealer; + private final LoaderFactory loaderFactory; + private final PromiseProvider promises; @Inject - public ProjectExplorerStateComponent(ProjectExplorerPresenter projectExplorer, TreeResourceRevealer revealer, LoaderFactory loaderFactory) { + public ProjectExplorerStateComponent(ProjectExplorerPresenter projectExplorer, + TreeResourceRevealer revealer, + LoaderFactory loaderFactory, + PromiseProvider promises) { this.projectExplorer = projectExplorer; this.revealer = revealer; this.loaderFactory = loaderFactory; + this.promises = promises; } @Override public JsonObject getState() { - final List paths = new ArrayList<>(); - - /* - The main idea is to look up all expanded nodes in project tree and gather the last one's children. - Then check if child is resource, then we store the path in user preference. - */ - - outer: - for (Node node : projectExplorer.getTree().getNodeStorage().getAll()) { - if (projectExplorer.getTree().isExpanded(node) && node instanceof ResourceNode) { - - final List childrenToStore = projectExplorer.getTree().getNodeStorage().getChildren(node); - - for (Node children : childrenToStore) { - if (children instanceof ResourceNode) { - paths.add(((ResourceNode) children).getData().getLocation()); - continue outer; - } - } - } - } - JsonObject state = Json.createObject(); JsonArray array = Json.createArray(); state.put(PATH_PARAM_ID, array); + + List rawPaths = projectExplorer.getTree() + .getNodeStorage() + .getAll() + .stream() + .filter(node -> projectExplorer.getTree().isExpanded(node)) + .filter(node -> node instanceof ResourceNode) + .map(node -> ((ResourceNode)node).getData().getLocation().toString()) + .collect(Collectors.toList()); + int i = 0; - for (Path path : paths) { - array.set(i++, path.toString()); + for (String path : rawPaths) { + array.set(i++, path); } state.put(SHOW_HIDDEN_FILES, projectExplorer.isShowHiddenFiles()); @@ -85,7 +83,7 @@ public class ProjectExplorerStateComponent implements StateComponent { } @Override - public void loadState(@NotNull JsonObject state) { + public Promise loadState(@NotNull JsonObject state) { if (state.hasKey(SHOW_HIDDEN_FILES)) { projectExplorer.showHiddenFiles(state.getBoolean(SHOW_HIDDEN_FILES)); } @@ -93,61 +91,61 @@ public class ProjectExplorerStateComponent implements StateComponent { JsonArray paths = state.hasKey(PATH_PARAM_ID) ? state.getArray(PATH_PARAM_ID) : Json.createArray(); if (paths.length() == 0) { - return; + return promises.resolve(null); } Promise revealPromise = null; - final MessageLoader loader = loaderFactory.newLoader("Restoring project structure..."); + MessageLoader loader = loaderFactory.newLoader("Restoring project structure..."); loader.show(); for (int i = 0; i < paths.length(); i++) { - final String path = paths.getString(i); + String path = paths.getString(i); if (revealPromise == null) { - revealPromise = revealer.reveal(Path.valueOf(path), false).thenPromise(new Function>() { - @Override - public Promise apply(Node node) throws FunctionException { - if (node != null) { - projectExplorer.getTree().setExpanded(node, true, false); - } - - return revealer.reveal(Path.valueOf(path), false); - } - }); + revealPromise = revealer.reveal(Path.valueOf(path), false) + .thenPromise(this::doExpand); continue; } - revealPromise.thenPromise(new Function>() { - @Override - public Promise apply(Node node) throws FunctionException { - if (node != null) { - projectExplorer.getTree().setExpanded(node, true, false); - } - - return revealer.reveal(Path.valueOf(path), false); - } - }).catchError(new Function() { - @Override - public Node apply(PromiseError error) throws FunctionException { - Log.info(getClass(), error.getMessage()); - - return null; - } - }); + revealPromise.thenPromise(node -> revealer.reveal(Path.valueOf(path), false)) + .thenPromise(this::doExpand) + .catchError(this::logError); } if (revealPromise != null) { - revealPromise.then(new Operation() { - @Override - public void apply(Node node) throws OperationException { - loader.hide(); - } - }).catchError(new Operation() { - @Override - public void apply(PromiseError error) throws OperationException { - loader.hide(); - } + revealPromise.then(node -> { + loader.hide(); + }).catchError(error -> { + loader.hide(); }); } + + if (revealPromise == null) { + return promises.resolve(null); + } + + return revealPromise.thenPromise(ignored -> promises.resolve(null)); + } + + private Promise doExpand(Node node) { + projectExplorer.getTree().setExpanded(node, true); + + return promises.resolve(null); + } + + private Promise logError(PromiseError error) { + Log.info(getClass(), error.getMessage()); + + return promises.resolve(null); + } + + @Override + public int getPriority() { + return MAX_PRIORITY; + } + + @Override + public String getId() { + return "projectExplorer"; } } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/AppStateManager.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/AppStateManager.java index 85b0ab94c7..1a353981e2 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/AppStateManager.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/AppStateManager.java @@ -18,15 +18,18 @@ import elemental.json.JsonObject; import com.google.inject.Inject; import com.google.inject.Singleton; -import org.eclipse.che.api.promises.client.Operation; -import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; -import org.eclipse.che.api.promises.client.PromiseError; +import org.eclipse.che.api.promises.client.PromiseProvider; import org.eclipse.che.ide.api.component.StateComponent; import org.eclipse.che.ide.api.preferences.PreferencesManager; import org.eclipse.che.ide.util.loging.Log; -import java.util.Map; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +import static java.util.Comparator.comparingInt; +import static java.util.stream.Collectors.toList; /** * Responsible for persisting and restoring IDE state across sessions. @@ -34,6 +37,7 @@ import java.util.Map; * * @author Artem Zatsarynnyi * @author Yevhen Vydolob + * @author Vlad Zhukovskyi */ @Singleton public class AppStateManager { @@ -43,18 +47,27 @@ public class AppStateManager { private static final String WORKSPACE = "workspace"; - private final Map persistenceComponents; - private final PreferencesManager preferencesManager; - private final JsonFactory jsonFactory; - private JsonObject allWsState; + /** + * Sorted by execution priority list of persistence state components. + */ + private final List persistenceComponents; + + private final PreferencesManager preferencesManager; + private final JsonFactory jsonFactory; + private final PromiseProvider promises; + private JsonObject allWsState; @Inject - public AppStateManager(Map persistenceComponents, + public AppStateManager(Set persistenceComponents, PreferencesManager preferencesManager, - JsonFactory jsonFactory) { - this.persistenceComponents = persistenceComponents; + JsonFactory jsonFactory, + PromiseProvider promises) { + this.persistenceComponents = persistenceComponents.stream() + .sorted(comparingInt(StateComponent::getPriority).reversed()) + .collect(toList()); this.preferencesManager = preferencesManager; this.jsonFactory = jsonFactory; + this.promises = promises; readStateFromPreferences(); } @@ -82,10 +95,15 @@ public class AppStateManager { try { if (settings.hasKey(WORKSPACE)) { JsonObject workspace = settings.getObject(WORKSPACE); + Promise sequentialRestore = promises.resolve(null); for (String key : workspace.keys()) { - if (persistenceComponents.containsKey(key)) { - StateComponent component = persistenceComponents.get(key); - component.loadState(workspace.getObject(key)); + Optional stateComponent = persistenceComponents.stream() + .filter(component -> component.getId().equals(key)) + .findAny(); + if (stateComponent.isPresent()) { + StateComponent component = stateComponent.get(); + Log.debug(getClass(), "Restore state for the component ID: " + component.getId()); + sequentialRestore = sequentialRestore.thenPromise(ignored -> component.loadState(workspace.getObject(key))); } } } @@ -95,13 +113,14 @@ public class AppStateManager { } public Promise persistWorkspaceState(String wsId) { - final JsonObject settings = Json.createObject(); + JsonObject settings = Json.createObject(); JsonObject workspace = Json.createObject(); settings.put(WORKSPACE, workspace); - for (Map.Entry entry : persistenceComponents.entrySet()) { + + for (StateComponent entry : persistenceComponents) { try { - String key = entry.getKey(); - workspace.put(key, entry.getValue().getState()); + Log.debug(getClass(), "Persist state for the component ID: " + entry.getId()); + workspace.put(entry.getId(), entry.getState()); } catch (Exception e) { Log.error(getClass(), e); } @@ -113,14 +132,12 @@ public class AppStateManager { private Promise writeStateToPreferences(JsonObject state) { final String json = state.toJson(); preferencesManager.setValue(PREFERENCE_PROPERTY_NAME, json); - return preferencesManager.flushPreferences().catchError(new Operation() { - @Override - public void apply(PromiseError arg) throws OperationException { - Log.error(AppStateManager.class, "Failed to store app's state to user's preferences"); - } + return preferencesManager.flushPreferences().catchError(error -> { + Log.error(AppStateManager.class, "Failed to store app's state to user's preferences: " + error.getMessage()); }); } + @Deprecated public boolean hasStateForWorkspace(String wsId) { return allWsState.hasKey(wsId); } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/PersistenceApiModule.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/PersistenceApiModule.java index 9a63154412..d058dadd63 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/PersistenceApiModule.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/statepersistance/PersistenceApiModule.java @@ -12,6 +12,7 @@ package org.eclipse.che.ide.statepersistance; import com.google.gwt.inject.client.AbstractGinModule; import com.google.gwt.inject.client.multibindings.GinMapBinder; +import com.google.gwt.inject.client.multibindings.GinMultibinder; import org.eclipse.che.ide.api.component.StateComponent; import org.eclipse.che.ide.api.component.WsAgentComponent; @@ -33,9 +34,9 @@ public class PersistenceApiModule extends AbstractGinModule { .addBinding("ZZ Restore Workspace State") .to(WorkspaceStateRestorer.class); - GinMapBinder stateComponents = GinMapBinder.newMapBinder(binder(), String.class, StateComponent.class); - stateComponents.addBinding("workspace").to(WorkspacePresenter.class); - stateComponents.addBinding("editor").to(EditorAgentImpl.class); - stateComponents.addBinding("projectExplorer").to(ProjectExplorerStateComponent.class); + GinMultibinder stateComponents = GinMultibinder.newSetBinder(binder(), StateComponent.class); + stateComponents.addBinding().to(WorkspacePresenter.class); + stateComponents.addBinding().to(EditorAgentImpl.class); + stateComponents.addBinding().to(ProjectExplorerStateComponent.class); } } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspacePresenter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspacePresenter.java index b3f61c67b6..ce1ac8254a 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspacePresenter.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspacePresenter.java @@ -11,14 +11,19 @@ package org.eclipse.che.ide.workspace; import com.google.inject.Provider; + import elemental.json.Json; import elemental.json.JsonObject; +import elemental.util.ArrayOf; +import elemental.util.Collections; import com.google.gwt.user.client.ui.AcceptsOneWidget; import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.name.Named; +import org.eclipse.che.api.promises.client.Promise; +import org.eclipse.che.api.promises.client.PromiseProvider; import org.eclipse.che.ide.api.component.StateComponent; import org.eclipse.che.ide.api.constraints.Constraints; import org.eclipse.che.ide.api.mvp.Presenter; @@ -50,14 +55,15 @@ import java.util.Map; public class WorkspacePresenter implements Presenter, WorkspaceView.ActionDelegate, WorkspaceAgent, PerspectiveTypeListener, StateComponent { - private final WorkspaceView view; - private final String defaultPerspectiveId; - private final MainMenuPresenter mainMenu; - private final StatusPanelGroupPresenter bottomMenu; - private final ToolbarPresenter toolbarPresenter; - private final Provider perspectiveManagerProvider; + private final WorkspaceView view; + private final String defaultPerspectiveId; + private final PromiseProvider promises; + private final MainMenuPresenter mainMenu; + private final StatusPanelGroupPresenter bottomMenu; + private final ToolbarPresenter toolbarPresenter; + private final Provider perspectiveManagerProvider; - private Perspective activePerspective; + private Perspective activePerspective; @Inject public WorkspacePresenter(WorkspaceView view, @@ -65,9 +71,11 @@ public class WorkspacePresenter implements Presenter, WorkspaceView.ActionDelega MainMenuPresenter mainMenu, StatusPanelGroupPresenter bottomMenu, @MainToolbar ToolbarPresenter toolbarPresenter, - @Named("defaultPerspectiveId") String defaultPerspectiveId) { + @Named("defaultPerspectiveId") String defaultPerspectiveId, + PromiseProvider promises) { this.view = view; this.defaultPerspectiveId = defaultPerspectiveId; + this.promises = promises; this.view.setDelegate(this); this.toolbarPresenter = toolbarPresenter; @@ -163,16 +171,24 @@ public class WorkspacePresenter implements Presenter, WorkspaceView.ActionDelega } @Override - public void loadState(JsonObject state) { + public Promise loadState(JsonObject state) { if (state.hasKey("perspectives")) { JsonObject perspectives = state.getObject("perspectives"); Map perspectiveMap = perspectiveManagerProvider.get().getPerspectives(); + ArrayOf> perspectivePromises = Collections.arrayOf(); for (String key : perspectives.keys()) { if (perspectiveMap.containsKey(key)) { - perspectiveMap.get(key).loadState(perspectives.getObject(key)); + perspectivePromises.push(perspectiveMap.get(key).loadState(perspectives.getObject(key))); } } + return promises.all2(perspectivePromises).thenPromise(ignored -> promises.resolve(null)); } + + return promises.resolve(null); } + @Override + public String getId() { + return "workspace"; + } } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/perspectives/general/AbstractPerspective.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/perspectives/general/AbstractPerspective.java index e01efda914..db5b63e7d3 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/perspectives/general/AbstractPerspective.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/perspectives/general/AbstractPerspective.java @@ -17,6 +17,8 @@ import elemental.json.JsonObject; import com.google.inject.Provider; import com.google.web.bindery.event.shared.EventBus; +import org.eclipse.che.api.promises.client.Promise; +import org.eclipse.che.api.promises.client.js.Promises; import org.eclipse.che.commons.annotation.Nullable; import org.eclipse.che.ide.api.constraints.Constraints; import org.eclipse.che.ide.api.event.ActivePartChangedEvent; @@ -344,7 +346,7 @@ public abstract class AbstractPerspective implements Presenter, Perspective, } @Override - public void loadState(@NotNull JsonObject state) { + public Promise loadState(@NotNull JsonObject state) { if (state.hasKey("PART_STACKS")) { JsonObject partStacksState = state.getObject("PART_STACKS"); @@ -375,6 +377,8 @@ public abstract class AbstractPerspective implements Presenter, Perspective, setActivePart(provider.get()); } } + + return Promises.resolve(null); } /** @@ -460,4 +464,8 @@ public abstract class AbstractPerspective implements Presenter, Perspective, } } + @Override + public String getId() { + return null; + } } diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java index 8bf57f7cc2..cf6d37137b 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java @@ -16,7 +16,9 @@ import elemental.json.JsonObject; import com.google.gwtmockito.GwtMockitoTestRunner; +import org.eclipse.che.api.promises.client.Function; import org.eclipse.che.api.promises.client.Promise; +import org.eclipse.che.api.promises.client.PromiseProvider; import org.eclipse.che.ide.api.component.StateComponent; import org.eclipse.che.ide.api.preferences.PreferencesManager; import org.junit.Before; @@ -26,10 +28,11 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; -import java.util.HashMap; -import java.util.Map; +import java.util.HashSet; +import java.util.Set; import static org.fest.assertions.Assertions.assertThat; +import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; @@ -40,6 +43,7 @@ import static org.mockito.Mockito.when; * * @author Artem Zatsarynnyi * @author Dmitry Shnurenko + * @author Vlad Zhukovskyi */ @RunWith(GwtMockitoTestRunner.class) public class AppStateManagerTest { @@ -47,19 +51,25 @@ public class AppStateManagerTest { private static final String WS_ID = "ws_id"; @Mock - private StateComponent component1; + private StateComponent component1; @Mock - private StateComponent component2; + private StateComponent component2; @Mock - private Promise promise; - @Mock - private Promise contentPromise; + private Promise promise; @Mock private PreferencesManager preferencesManager; @Mock - private JsonFactory jsonFactory; + private JsonFactory jsonFactory; @Mock - private JsonObject pref; + private JsonObject pref; + @Mock + private PromiseProvider promiseProvider; + + @Mock + private Promise sequentialRestore; + + @Captor + private ArgumentCaptor>> sequentialRestoreThenFunction; @Captor private ArgumentCaptor preferenceArgumentCaptor; @@ -71,14 +81,16 @@ public class AppStateManagerTest { @Before public void setUp() { - Map components = new HashMap<>(); - components.put("component1", component1); - components.put("component2", component2); + Set components = new HashSet<>(); + components.add(component1); + components.add(component2); + when(component1.getId()).thenReturn("component1"); + when(component2.getId()).thenReturn("component2"); when(preferencesManager.flushPreferences()).thenReturn(promise); when(preferencesManager.getValue(AppStateManager.PREFERENCE_PROPERTY_NAME)).thenReturn(""); when(jsonFactory.parse(anyString())).thenReturn(pref = Json.createObject()); - appStateManager = new AppStateManager(components, preferencesManager, jsonFactory); + appStateManager = new AppStateManager(components, preferencesManager, jsonFactory, promiseProvider); } @Test @@ -144,8 +156,13 @@ public class AppStateManagerTest { workspace.put("component1", comp1); comp1.put("key1", "value1"); + when(promiseProvider.resolve(any(Void.class))).thenReturn(sequentialRestore); + appStateManager.restoreWorkspaceState(WS_ID); + verify(sequentialRestore).thenPromise(sequentialRestoreThenFunction.capture()); + sequentialRestoreThenFunction.getValue().apply(null); + ArgumentCaptor stateCaptor = ArgumentCaptor.forClass(JsonObject.class); verify(component1).loadState(stateCaptor.capture()); diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/state/WorkspacePresenterPersistenceTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/state/WorkspacePresenterPersistenceTest.java index 5aad8e0332..8f1f3f9ce7 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/state/WorkspacePresenterPersistenceTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/state/WorkspacePresenterPersistenceTest.java @@ -11,10 +11,13 @@ package org.eclipse.che.ide.workspace.state; import com.google.inject.Provider; + import elemental.json.Json; import elemental.json.JsonObject; +import elemental.util.ArrayOf; -import org.eclipse.che.ide.api.parts.PartPresenter; +import org.eclipse.che.api.promises.client.Promise; +import org.eclipse.che.api.promises.client.PromiseProvider; import org.eclipse.che.ide.api.parts.Perspective; import org.eclipse.che.ide.api.parts.PerspectiveManager; import org.eclipse.che.ide.menu.MainMenuPresenter; @@ -32,16 +35,20 @@ import java.util.HashMap; import java.util.Map; import static org.fest.assertions.Assertions.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** + * Unit tests for the {@link WorkspacePresenter}. + * * @author Evgen Vidolob + * @author Vlad Zhukovskyi */ @RunWith(MockitoJUnitRunner.class) public class WorkspacePresenterPersistenceTest { - @Mock private WorkspaceView workspaceView; @Mock @@ -55,12 +62,12 @@ public class WorkspacePresenterPersistenceTest { @Mock private ToolbarPresenter toolbarPresenter; @Mock - private PartPresenter part1; + private PromiseProvider promiseProvider; private WorkspacePresenter presenter; @Mock - private Provider perspectiveManagerProvider; + private Provider perspectiveManagerProvider; private PerspectiveManager perspectiveManager; @@ -78,7 +85,8 @@ public class WorkspacePresenterPersistenceTest { mainMenuPresenter, statusPanelGroupPresenter, toolbarPresenter, - "perspective1"); + "perspective1", + promiseProvider); } @@ -102,6 +110,8 @@ public class WorkspacePresenterPersistenceTest { JsonObject perspective1State = Json.createObject(); perspectives.put("perspective1", perspective1State); + when(promiseProvider.all2(any(ArrayOf.class))).thenReturn(mock(Promise.class)); + presenter.loadState(state); verify(perspective1).loadState(perspective1State); From 8fcd5dcb37adafc819379d04cdc8e31a8599215a Mon Sep 17 00:00:00 2001 From: Florent BENOIT Date: Mon, 7 Aug 2017 14:37:25 +0200 Subject: [PATCH 09/23] Use docker to build dashboard app. (as alternative) (#5848) * Use docker to build dashboard app. By using layer for package.json and bower.json file, it saves extra time to get npm or bower dependencies Also, if dashboard files are not modified, the build is faster. it targets as well 5127 By default : "$ mvn clean install" --> use docker "$ mvn clean install -Pnative" --> use native tools Change-Id: Ia65161b58e8ae70f7799500750a3d87687e34819 Signed-off-by: Florent BENOIT --- dashboard/.dockerignore | 27 ++++++ dashboard/Dockerfile | 22 +++++ dashboard/README.md | 24 +++-- dashboard/gulp/conf.js | 2 +- dashboard/pom.xml | 189 +++++++++++++++++++++++++++------------- 5 files changed, 196 insertions(+), 68 deletions(-) create mode 100644 dashboard/.dockerignore create mode 100644 dashboard/Dockerfile diff --git a/dashboard/.dockerignore b/dashboard/.dockerignore new file mode 100644 index 0000000000..c7a029b0d8 --- /dev/null +++ b/dashboard/.dockerignore @@ -0,0 +1,27 @@ +Dockerfile +node_modules +bower_components +target +pom.xml +./typings +./tmp +./codeverage + +# Eclipse # +################### + +*.launch +.classpath +.project +.settings/ +bin/ +test-output/ +maven-eclipse.xml + +# Idea # +################## +*.iml +*.ipr +*.iws +.idea/ + diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile new file mode 100644 index 0000000000..97f8543a76 --- /dev/null +++ b/dashboard/Dockerfile @@ -0,0 +1,22 @@ +# Copyright (c) 2012-2017 Red Hat, Inc +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html + +# This is a Dockerfile allowing to build dashboard by using a docker container. +# 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 mhart/alpine-node:6 + +RUN apk update && \ + apk add --no-cache git +COPY package.json /dashboard/ +RUN cd /dashboard && npm install +COPY bower.json /dashboard/ +RUN cd /dashboard && ./node_modules/.bin/bower install --allow-root +COPY . /dashboard/ +RUN cd /dashboard && npm run build && cd target/ && tar zcf /tmp/dashboard.tar.gz dist/ + +CMD zcat /tmp/dashboard.tar.gz diff --git a/dashboard/README.md b/dashboard/README.md index f0d0552104..bc0c9c7dea 100644 --- a/dashboard/README.md +++ b/dashboard/README.md @@ -4,20 +4,30 @@ Eclipse Che is a next generation Eclipse IDE and open source alternative to Inte Che Dashboard ============== -#Requirements -- Python `v2.7.x`(`v3.x.x`currently not supported) -- Node.js `v4.x.x` (`v5.x.x` / `v6.x.x` are currently not supported) -- npm +## Requirements +- Docker -Installation instructions for Node.js and npm can be found on the following [link](https://docs.npmjs.com/getting-started/installing-node). - -#Quick start +## Quick start ```sh cd che/dashboard mvn clean install ``` +note: by default it will build dashboard using a docker image. +If all required tools are installed locally, the native profile can be used instead of the docker build by following command: + +```sh +$ mvn -Pnative clean install +``` + +Required tools for native build: +- Python `v2.7.x`(`v3.x.x`currently not supported) +- Node.js `v4.x.x`, `v5.x.x` or `v6.x.x` +- npm + +Installation instructions for Node.js and npm can be found on the following [link](https://docs.npmjs.com/getting-started/installing-node). + ## Running In order to run the project, the serve command is used ```sh diff --git a/dashboard/gulp/conf.js b/dashboard/gulp/conf.js index 8fed831363..fbeabe263a 100644 --- a/dashboard/gulp/conf.js +++ b/dashboard/gulp/conf.js @@ -16,7 +16,7 @@ var gutil = require('gulp-util'); */ exports.paths = { src: 'src', - dist: 'dist', + dist: 'target/dist', tmp: '.tmp', e2e: 'e2e' }; diff --git a/dashboard/pom.xml b/dashboard/pom.xml index fd2ae48a84..97149112f5 100644 --- a/dashboard/pom.xml +++ b/dashboard/pom.xml @@ -35,72 +35,13 @@ dashboard-war - - maven-clean-plugin - - - - ${basedir}/bower_components - false - - - ${basedir}/node_modules - false - - - ${basedir}/dist - false - - - - - - maven-antrun-plugin - - - compile - compile - - run - - - - - - - - - - ]]> - ]]> - - - - - - compilation - test - - run - - - - - - - - - - - - org.apache.maven.plugins maven-war-plugin - dist + target/dist ${basedir}/src/webapp/WEB-INF/web.xml @@ -129,6 +70,134 @@ + + + docker + + true + + + + + maven-antrun-plugin + + + build-image + generate-sources + + run + + + + + + + + + + + + + + + unpack-docker-build + generate-sources + + run + + + + + + + + + + + + + update-href + prepare-package + + run + + + + + + ]]> + ]]> + + + + + + + + + + + native + + + + maven-clean-plugin + + + + ${basedir}/bower_components + false + + + ${basedir}/node_modules + false + + + + + + maven-antrun-plugin + + + build-dashboard + compile + + run + + + + + + + + + + ]]> + ]]> + + + + + + compilation + test + + run + + + + + + + + + + + + + + + qa From 2e6d797c0a379d1d9ce6d9714a1919c4b1cc7c8f Mon Sep 17 00:00:00 2001 From: David Festal Date: Mon, 7 Aug 2017 16:48:51 +0200 Subject: [PATCH 10/23] Ceylon stack (#5844) * Add a stack for Ceylon 1.3.2 with JVM, Javascript and Dart backends Signed-off-by: David Festal --- ide/che-core-ide-stacks/pom.xml | 1 + .../resources/stacks-images/type-ceylon.svg | 1439 +++++++++++++++++ .../src/main/resources/stacks.json | 156 +- .../src/main/resources/samples.json | 23 + 4 files changed, 1616 insertions(+), 3 deletions(-) create mode 100644 ide/che-core-ide-stacks/src/main/resources/stacks-images/type-ceylon.svg diff --git a/ide/che-core-ide-stacks/pom.xml b/ide/che-core-ide-stacks/pom.xml index 1bfe283a0c..07c8687305 100644 --- a/ide/che-core-ide-stacks/pom.xml +++ b/ide/che-core-ide-stacks/pom.xml @@ -29,6 +29,7 @@ license-maven-plugin + **/type-ceylon.svg **/type-bitnami.svg **/type-zend.svg diff --git a/ide/che-core-ide-stacks/src/main/resources/stacks-images/type-ceylon.svg b/ide/che-core-ide-stacks/src/main/resources/stacks-images/type-ceylon.svg new file mode 100644 index 0000000000..dcaf030dd0 --- /dev/null +++ b/ide/che-core-ide-stacks/src/main/resources/stacks-images/type-ceylon.svg @@ -0,0 +1,1439 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ide/che-core-ide-stacks/src/main/resources/stacks.json b/ide/che-core-ide-stacks/src/main/resources/stacks.json index 5bd3cbe986..e0dc8bf99e 100644 --- a/ide/che-core-ide-stacks/src/main/resources/stacks.json +++ b/ide/che-core-ide-stacks/src/main/resources/stacks.json @@ -2364,7 +2364,7 @@ "goal": "Build" } }, { - "commandLine": "scl enable rh-maven33 'mvn compile vertx:run -f ${current.project.path}'", + "commandLine": "cd ${current.project.path} && scl enable rh-maven33 'java -jar target/*-fat.jar'", "name": "run", "type": "custom", "attributes": { @@ -2441,7 +2441,7 @@ "type": "mvn" }, { - "commandLine": "scl enable rh-maven33 'mvn compile spring-boot:run -f ${current.project.path}'", + "commandLine": "java -jar ${current.project.path}/target/*.jar", "name": "run", "type": "custom", "attributes": { @@ -2772,5 +2772,155 @@ "name": "type-blank.svg", "mediaType": "image/svg+xml" } - } + }, + { + "description": "Ceylon stack with Java, JavaScript and Dart backends on CentOS.", + "creator": "ide", + "scope": "advanced", + "name": "Ceylon with Java JavaScript Dart on CentOS", + "id": "ceylon-java-javascript-dart-centos", + "source": { + "origin": "eclipse/centos_ceylon_nodejs_dart", + "type": "image" + }, + "components": [ + { + "version": "---", + "name": "CentOS" + }, + { + "version": "1.8.0_131", + "name": "JDK" + }, + { + "version": "3.3.9", + "name": "Maven" + }, + { + "version": "8.0.24", + "name": "Tomcat" + }, + { + "version": "1.3.2", + "name": "Ceylon" + }, + { + "version": "1.24.2", + "name": "Dart SDK" + }, + { + "version": "6.11.1", + "name": "NodeJS" + } + ], + "tags": [ + "Java", + "JDK", + "Maven", + "Tomcat", + "CentOS", + "Git", + "Ceylon", + "Dart" + ], + "workspaceConfig": { + "defaultEnv": "default", + "environments": { + "default": { + "machines": { + "dev-machine": { + "attributes": { + "memoryLimitBytes": "2147483648" + }, + "servers": {}, + "agents": [ + "org.eclipse.che.exec", + "org.eclipse.che.terminal", + "org.eclipse.che.ws-agent", + "org.eclipse.che.ssh", + "org.eclipse.che.ls.json", + "org.eclipse.che.ls.js-ts" + ] + } + }, + "recipe": { + "location": "eclipse/centos_ceylon_nodejs_dart", + "type": "dockerimage" + } + } + }, + "projects": [], + "name": "default", + "commands": [ + { + "commandLine": "rm -Rf ${current.project.path}/modules ", + "name": "clean modules", + "attributes": { + "goal": "Build", + "previewUrl": "" + }, + "type": "custom" + }, + { + "commandLine": "cd ${current.project.path} && ceylon compile", + "name": "compile for JVM", + "attributes": { + "goal": "Build", + "previewUrl": "" + }, + "type": "custom" + }, + { + "commandLine": "cd ${current.project.path} && ceylon compile-js", + "name": "compile for JS", + "attributes": { + "goal": "Build", + "previewUrl": "" + }, + "type": "custom" + }, + { + "commandLine": "cd ${current.project.path} && ceylon compile-dart", + "name": "compile for Dart", + "attributes": { + "goal": "Build", + "previewUrl": "" + }, + "type": "custom" + }, + { + "commandLine": "cd ${current.project.path} && ceylon run", + "name": "Run on JVM", + "attributes": { + "goal": "Run", + "previewUrl": "" + }, + "type": "custom" + }, + { + "commandLine": "cd ${current.project.path} && ceylon run-js", + "name": "Run on NodeJS", + "attributes": { + "goal": "Run", + "previewUrl": "" + }, + "type": "custom" + }, + { + "commandLine": "cd ${current.project.path} && ceylon run-dart $(ceylon config get runtool.module)", + "name": "Run on Dart", + "attributes": { + "goal": "Run", + "previewUrl": "" + }, + "type": "custom" + } + ], + "links": [] + }, + "stackIcon": { + "name": "type-ceylon.svg", + "mediaType": "image/svg+xml" + } + } ] diff --git a/ide/che-core-ide-templates/src/main/resources/samples.json b/ide/che-core-ide-templates/src/main/resources/samples.json index ba6a01b682..188481cd77 100644 --- a/ide/che-core-ide-templates/src/main/resources/samples.json +++ b/ide/che-core-ide-templates/src/main/resources/samples.json @@ -1564,5 +1564,28 @@ "tags": [ "TypeScript","ts" ] + }, + { + "name": "ceylon-hello-world", + "displayName": "ceylon-hello-world", + "path": "/ceylon-hello-world", + "description": "A Ceylon 'Hello World' project example that runs on all supported backends.", + "projectType": "blank", + "mixins": [], + "attributes": { + }, + "modules": [], + "problems": [], + "source": { + "type": "git", + "location": "https://github.com/che-samples/ceylon-hello-world", + "parameters": {} + }, + "commands": [], + "links": [], + "category": "Samples", + "tags": [ + "Ceylon" + ] } ] From a258f2fd11639dd3141c5f9a4d7785cec2cef00d Mon Sep 17 00:00:00 2001 From: Vitaliy Guliy Date: Tue, 8 Aug 2017 12:48:29 +0300 Subject: [PATCH 11/23] CHE-5718 Progress of the importing project is not displayed (#5934) * CHE-5718 Progress of the importing project is not displayed * CHE-5718 Progress of the importing project is not displayed * CHE-5718 Progress of the importing project is not displayed * CHE-5718 Progress of the importing project is not displayed * Remove batch project creation from dashboard Signed-off-by: Anna Shumilova * CHE-5718 Progress of the importing project is not displayed --- .../create-workspace.service.ts | 20 +--- .../factory/utils/InitialProjectImporter.java | 107 ++++++++++++++++++ .../workspace/DefaultWorkspaceComponent.java | 38 ++++++- .../workspace/FactoryWorkspaceComponent.java | 1 - .../che/ide/workspace/WorkspaceComponent.java | 2 - .../workspace/WorkspaceComponentProvider.java | 14 ++- 6 files changed, 159 insertions(+), 23 deletions(-) create mode 100644 ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/utils/InitialProjectImporter.java diff --git a/dashboard/src/app/workspaces/create-workspace/create-workspace.service.ts b/dashboard/src/app/workspaces/create-workspace/create-workspace.service.ts index 513c95f5a2..e2f67863ef 100644 --- a/dashboard/src/app/workspaces/create-workspace/create-workspace.service.ts +++ b/dashboard/src/app/workspaces/create-workspace/create-workspace.service.ts @@ -163,7 +163,7 @@ export class CreateWorkspaceSvc { createWorkspace(workspaceConfig: che.IWorkspaceConfig, attributes?: any): ng.IPromise { const namespaceId = this.namespaceSelectorSvc.getNamespaceId(), projectTemplates = this.projectSourceSelectorService.getProjectTemplates(); - + workspaceConfig.projects = projectTemplates; return this.checkEditingProgress().then(() => { return this.cheWorkspace.createWorkspaceFromConfig(namespaceId, workspaceConfig, attributes).then((workspace: che.IWorkspace) => { @@ -177,13 +177,9 @@ export class CreateWorkspaceSvc { }).then(() => { return this.cheWorkspace.fetchWorkspaceDetails(workspace.id); }).then(() => { - return this.createProjects(workspace.id, projectTemplates); - }).then(() => { - this.getIDE().ProjectExplorer.refresh(); - return this.importProjects(workspace.id, projectTemplates); + return this.addProjectCommands(workspace.id, projectTemplates); }).then(() => { let IDE = this.getIDE(); - IDE.ProjectExplorer.refresh(); IDE.CommandManager.refresh(); }); }, (error: any) => { @@ -242,20 +238,18 @@ export class CreateWorkspaceSvc { } /** - * Imports bunch of projects in row. - * Returns resolved promise if all project are imported properly, otherwise returns rejected promise with list of names of failed projects. + * Adds commands from the bunch of projects in row. + * Returns resolved promise if all commands are aded properly, otherwise returns rejected promise with list of names of failed projects. * * @param {string} workspaceId the workspace ID - * @param {Array} projectTemplates the list of project templates to import + * @param {Array} projectTemplates the list of project templates * @return {IPromise} */ - importProjects(workspaceId: string, projectTemplates: Array): ng.IPromise { + addProjectCommands(workspaceId: string, projectTemplates: Array): ng.IPromise { const defer = this.$q.defer(); defer.resolve(); let accumulatorPromise = defer.promise; - const projectTypeResolverService = this.cheWorkspace.getWorkspaceAgent(workspaceId).getProjectTypeResolver(); - const failedProjects = []; accumulatorPromise = projectTemplates.reduce((_accumulatorPromise: ng.IPromise, project: che.IProjectTemplate) => { @@ -263,8 +257,6 @@ export class CreateWorkspaceSvc { return this.addCommands(workspaceId, project.name, project.commands).catch(() => { // adding commands errors, ignore them here return this.$q.when(); - }).then(() => { - return projectTypeResolverService.resolveProjectType(project as any); }).catch((error: any) => { failedProjects.push(project.name); if (error && error.message) { diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/utils/InitialProjectImporter.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/utils/InitialProjectImporter.java new file mode 100644 index 0000000000..e83541b7ba --- /dev/null +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/utils/InitialProjectImporter.java @@ -0,0 +1,107 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.ide.factory.utils; + +import com.google.inject.Inject; +import com.google.inject.Singleton; +import org.eclipse.che.api.promises.client.*; +import org.eclipse.che.api.promises.client.js.Promises; +import org.eclipse.che.ide.CoreLocalizationConstant; +import org.eclipse.che.ide.api.app.AppContext; +import org.eclipse.che.ide.api.notification.NotificationManager; +import org.eclipse.che.ide.api.notification.StatusNotification; +import org.eclipse.che.ide.api.oauth.OAuth2AuthenticatorRegistry; +import org.eclipse.che.ide.api.project.wizard.ImportProjectNotificationSubscriberFactory; +import org.eclipse.che.ide.api.resources.Project; +import org.eclipse.che.ide.api.user.AskCredentialsDialog; +import org.eclipse.che.ide.part.explorer.project.ProjectExplorerPresenter; +import org.eclipse.che.ide.projectimport.wizard.ProjectImportOutputJsonRpcNotifier; +import org.eclipse.che.ide.projectimport.wizard.ProjectImporter; +import org.eclipse.che.ide.projectimport.wizard.ProjectResolver; +import java.util.*; + +import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE; +import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; +import static org.eclipse.che.ide.api.notification.StatusNotification.Status.PROGRESS; + +/** + * Imports projects on file system. + */ +@Singleton +public class InitialProjectImporter extends ProjectImporter { + + private final ProjectImportOutputJsonRpcNotifier subscriber; + private final NotificationManager notificationManager; + private final CoreLocalizationConstant locale; + + @Inject + public InitialProjectImporter(CoreLocalizationConstant localizationConstant, + ImportProjectNotificationSubscriberFactory subscriberFactory, + AppContext appContext, + ProjectResolver projectResolver, + AskCredentialsDialog credentialsDialog, + OAuth2AuthenticatorRegistry oAuth2AuthenticatorRegistry, + ProjectImportOutputJsonRpcNotifier subscriber, + NotificationManager notificationManager, + CoreLocalizationConstant locale, + ProjectExplorerPresenter projectExplorerPresenter) { + + super(localizationConstant, subscriberFactory, appContext, projectResolver, credentialsDialog, oAuth2AuthenticatorRegistry); + + this.subscriber = subscriber; + this.notificationManager = notificationManager; + this.locale = locale; + } + + /** + * Import source projects and if it's already exist in workspace + * then show warning notification + * + * @param projects + * list of projects that already exist in workspace and will be imported on file system + */ + public void importProjects(final List projects) { + if (projects.isEmpty()) { + return; + } + + final Project importProject = projects.remove(0); + final StatusNotification notification = notificationManager.notify(locale.cloningSource(importProject.getName()), null, PROGRESS, FLOAT_MODE); + subscriber.subscribe(importProject.getName(), notification); + + appContext.getWorkspaceRoot() + .importProject() + .withBody(importProject) + .send() + .then(new Operation() { + @Override + public void apply(Project project) throws OperationException { + subscriber.onSuccess(); + + appContext.getWorkspaceRoot().synchronize(); + + importProjects(projects); + } + }).catchErrorPromise( + new Function>() { + @Override + public Promise apply(PromiseError err) throws FunctionException { + subscriber.onFailure(err.getMessage()); + notification.setTitle(locale.cloningSourceFailedTitle(importProject.getName())); + notification.setStatus(FAIL); + + return Promises.resolve(null); + } + } + ); + } + +} diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java index 901e2d507a..6af7d83ab1 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/DefaultWorkspaceComponent.java @@ -11,6 +11,7 @@ package org.eclipse.che.ide.workspace; import com.google.gwt.core.client.Callback; +import com.google.gwt.core.client.Scheduler; import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.web.bindery.event.shared.EventBus; @@ -20,16 +21,22 @@ import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.component.Component; import org.eclipse.che.ide.api.dialogs.DialogFactory; +import org.eclipse.che.ide.api.machine.events.WsAgentStateEvent; import org.eclipse.che.ide.api.notification.NotificationManager; import org.eclipse.che.ide.api.preferences.PreferencesManager; +import org.eclipse.che.ide.api.resources.Project; import org.eclipse.che.ide.api.workspace.WorkspaceServiceClient; import org.eclipse.che.ide.context.BrowserAddress; import org.eclipse.che.ide.dto.DtoFactory; +import org.eclipse.che.ide.factory.utils.InitialProjectImporter; import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.ui.loaders.LoaderPresenter; import org.eclipse.che.ide.workspace.create.CreateWorkspacePresenter; import org.eclipse.che.ide.workspace.start.StartWorkspacePresenter; +import java.util.ArrayList; +import java.util.List; + /** * Performs default start of IDE - creates new or starts latest workspace. * Used when no {@code factory} specified. @@ -39,6 +46,8 @@ import org.eclipse.che.ide.workspace.start.StartWorkspacePresenter; @Singleton public class DefaultWorkspaceComponent extends WorkspaceComponent { + private InitialProjectImporter initialProjectImporter; + @Inject public DefaultWorkspaceComponent(WorkspaceServiceClient workspaceServiceClient, CreateWorkspacePresenter createWorkspacePresenter, @@ -54,6 +63,7 @@ public class DefaultWorkspaceComponent extends WorkspaceComponent { DtoFactory dtoFactory, LoaderPresenter loader, RequestTransmitter transmitter, + InitialProjectImporter initialProjectImporter, WorkspaceEventsHandler handler) { super(workspaceServiceClient, createWorkspacePresenter, @@ -69,6 +79,8 @@ public class DefaultWorkspaceComponent extends WorkspaceComponent { dtoFactory, loader, transmitter); + + this.initialProjectImporter = initialProjectImporter; } /** {@inheritDoc} */ @@ -88,6 +100,30 @@ public class DefaultWorkspaceComponent extends WorkspaceComponent { } @Override - public void tryStartWorkspace() { + public void onWsAgentStarted(WsAgentStateEvent event) { + super.onWsAgentStarted(event); + + Scheduler.get().scheduleDeferred(() -> { + importProjects(); + }); } + + /** + * Imports all projects described in workspace configuration but not existed on file system. + */ + private void importProjects() { + final Project[] projects = appContext.getProjects(); + + List importProjects = new ArrayList<>(); + for (Project project : projects) { + if (project.getSource() == null || project.getSource().getLocation() == null || project.exists()) { + continue; + } + + importProjects.add(project); + } + + initialProjectImporter.importProjects(importProjects); + } + } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java index 6177f2505b..9abd694108 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/FactoryWorkspaceComponent.java @@ -133,7 +133,6 @@ public class FactoryWorkspaceComponent extends WorkspaceComponent { } - @Override public void tryStartWorkspace() { if (this.workspaceId == null) { notificationManager.notify(locale.failedToLoadFactory(), locale.workspaceIdUndefined(), FAIL, FLOAT_MODE); diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java index 07e16133ce..51d77e3d24 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponent.java @@ -284,8 +284,6 @@ public abstract class WorkspaceComponent implements Component, WsAgentStateHandl }; } - abstract void tryStartWorkspace(); - private void startWorkspaceById(String workspaceId, String defaultEnvironment, Boolean restoreFromSnapshot) { loader.show(STARTING_WORKSPACE_RUNTIME); workspaceServiceClient.startById(workspaceId, defaultEnvironment, restoreFromSnapshot).catchError(new Operation() { diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponentProvider.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponentProvider.java index d1496a111b..656b86de59 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponentProvider.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/workspace/WorkspaceComponentProvider.java @@ -25,9 +25,9 @@ import org.eclipse.che.ide.context.QueryParameters; @Singleton public class WorkspaceComponentProvider implements Provider { - private final Provider workspaceComponentProvider; - private final Provider factoryComponentProvider; - private final QueryParameters queryParameters; + private final Provider workspaceComponentProvider; + private final Provider factoryComponentProvider; + private final QueryParameters queryParameters; @Inject public WorkspaceComponentProvider(Provider workspaceComponentProvider, @@ -40,7 +40,11 @@ public class WorkspaceComponentProvider implements Provider @Override public WorkspaceComponent get() { - final String factoryParams = queryParameters.getByName("factory"); - return factoryParams.isEmpty() ? workspaceComponentProvider.get() : factoryComponentProvider.get(); + if (!queryParameters.getByName("factory").isEmpty()) { + return factoryComponentProvider.get(); + } + + return workspaceComponentProvider.get(); } + } From c7a0fdc251062dc353eaf9eabf6f049e09ea7748 Mon Sep 17 00:00:00 2001 From: David Festal Date: Tue, 8 Aug 2017 12:01:26 +0200 Subject: [PATCH 12/23] Fix an erroneous change of vertx and spring boot stacks... ... in [this commit](https://github.com/eclipse/che/pull/5844/commits/cbc86776372c7557f7c5a62d4549a93466019c7c) Signed-off-by: David Festal --- ide/che-core-ide-stacks/src/main/resources/stacks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ide/che-core-ide-stacks/src/main/resources/stacks.json b/ide/che-core-ide-stacks/src/main/resources/stacks.json index e0dc8bf99e..7218550b6f 100644 --- a/ide/che-core-ide-stacks/src/main/resources/stacks.json +++ b/ide/che-core-ide-stacks/src/main/resources/stacks.json @@ -2364,7 +2364,7 @@ "goal": "Build" } }, { - "commandLine": "cd ${current.project.path} && scl enable rh-maven33 'java -jar target/*-fat.jar'", + "commandLine": "scl enable rh-maven33 'mvn compile vertx:run -f ${current.project.path}'", "name": "run", "type": "custom", "attributes": { @@ -2441,7 +2441,7 @@ "type": "mvn" }, { - "commandLine": "java -jar ${current.project.path}/target/*.jar", + "commandLine": "scl enable rh-maven33 'mvn compile spring-boot:run -f ${current.project.path}'", "name": "run", "type": "custom", "attributes": { From d50939fe7e3a0585e477add3ab4af967683b3167 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Tue, 8 Aug 2017 16:21:32 +0300 Subject: [PATCH 13/23] CHE-5334. Fix hover state Signed-off-by: Roman Nikitenko --- .../che/api/languageserver/service/TextDocumentService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wsagent/che-core-api-languageserver/src/main/java/org/eclipse/che/api/languageserver/service/TextDocumentService.java b/wsagent/che-core-api-languageserver/src/main/java/org/eclipse/che/api/languageserver/service/TextDocumentService.java index 5a7acf9686..9e625924af 100644 --- a/wsagent/che-core-api-languageserver/src/main/java/org/eclipse/che/api/languageserver/service/TextDocumentService.java +++ b/wsagent/che-core-api-languageserver/src/main/java/org/eclipse/che/api/languageserver/service/TextDocumentService.java @@ -363,7 +363,8 @@ public class TextDocumentService { @Override public boolean handleResult(InitializedLanguageServer element, Hover hover) { if (hover != null) { - result.getContents().addAll(hover.getContents()); + HoverDto hoverDto = new HoverDto(hover); + result.getContents().addAll(hoverDto.getContents()); } return true; } From 2f3e5f471c02298260a226c44440836d79d93c8e Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Mon, 7 Aug 2017 13:43:40 +0300 Subject: [PATCH 14/23] CHE-5840. Do not do extra updating of editor content Signed-off-by: Roman Nikitenko --- .../EditorGroupSynchronizationImpl.java | 7 +- .../EditorGroupSynchronizationImplTest.java | 91 ++++++++++++++++--- 2 files changed, 85 insertions(+), 13 deletions(-) diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImpl.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImpl.java index 2391fec6c6..278f034d84 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImpl.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImpl.java @@ -177,8 +177,11 @@ public class EditorGroupSynchronizationImpl implements EditorGroupSynchronizatio final Document document = documentHandle.getDocument(); final String oldContent = document.getContents(); - final TextPosition cursorPosition = document.getCursorPosition(); + if (Objects.equals(newContent, oldContent)) { + return; + } + final TextPosition cursorPosition = document.getCursorPosition(); if (!(virtualFile instanceof File)) { replaceContent(document, newContent, oldContent, cursorPosition); return; @@ -187,7 +190,7 @@ public class EditorGroupSynchronizationImpl implements EditorGroupSynchronizatio final File file = (File)virtualFile; final String currentStamp = file.getModificationStamp(); - if (eventModificationStamp == null && !Objects.equals(newContent, oldContent)) { + if (eventModificationStamp == null) { replaceContent(document, newContent, oldContent, cursorPosition); return; } diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImplTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImplTest.java index 62d880e324..810be8a301 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImplTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImplTest.java @@ -15,22 +15,33 @@ import com.google.web.bindery.event.shared.EventBus; import com.google.web.bindery.event.shared.HandlerRegistration; import org.eclipse.che.ide.api.editor.EditorAgent; +import org.eclipse.che.ide.api.editor.EditorInput; import org.eclipse.che.ide.api.editor.EditorPartPresenter; import org.eclipse.che.ide.api.editor.EditorWithAutoSave; import org.eclipse.che.ide.api.editor.document.Document; import org.eclipse.che.ide.api.editor.document.DocumentEventBus; import org.eclipse.che.ide.api.editor.document.DocumentHandle; import org.eclipse.che.ide.api.editor.document.DocumentStorage; +import org.eclipse.che.ide.api.editor.document.DocumentStorage.DocumentCallback; import org.eclipse.che.ide.api.editor.events.DocumentChangedEvent; import org.eclipse.che.ide.api.editor.texteditor.TextEditor; +import org.eclipse.che.ide.api.event.FileContentUpdateEvent; import org.eclipse.che.ide.api.notification.NotificationManager; +import org.eclipse.che.ide.api.notification.StatusNotification; +import org.eclipse.che.ide.api.resources.File; +import org.eclipse.che.ide.api.resources.VirtualFile; +import org.eclipse.che.ide.resource.Path; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; +import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.NOT_EMERGE_MODE; +import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; @@ -46,29 +57,39 @@ import static org.mockito.Mockito.withSettings; /** @author Roman Nikitenko */ @RunWith(MockitoJUnitRunner.class) public class EditorGroupSynchronizationImplTest { + private static final String FILE_CONTENT = "some content"; + private static final String FILE_NEW_CONTENT = "some content to update"; + private static final String FILE_LOCATION = "testProject/src/main/java/org/eclipse/che/examples/someFile"; @Mock - private EventBus eventBus; + private EventBus eventBus; @Mock - private EditorAgent editorAgent; + private EditorAgent editorAgent; @Mock - private Document document; + private Document document; @Mock - private DocumentHandle documentHandle; + private DocumentHandle documentHandle; @Mock - private DocumentEventBus documentEventBus; + private DocumentEventBus documentEventBus; @Mock - private DocumentStorage documentStorage; + private DocumentStorage documentStorage; @Mock - private NotificationManager notificationManager; + private NotificationManager notificationManager; @Mock - private HandlerRegistration handlerRegistration; + private HandlerRegistration handlerRegistration; @Mock - private DocumentChangedEvent documentChangeEvent; + private DocumentChangedEvent documentChangeEvent; + @Mock + private FileContentUpdateEvent fileContentUpdateEvent; + @Mock + private EditorInput editorInput; + @Captor + private ArgumentCaptor documentCallbackCaptor; private EditorPartPresenter activeEditor; private EditorPartPresenter openedEditor1; private EditorPartPresenter openedEditor2; + private VirtualFile virtualFile; private EditorGroupSynchronizationImpl editorGroupSynchronization; @Before @@ -76,6 +97,7 @@ public class EditorGroupSynchronizationImplTest { activeEditor = mock(EditorPartPresenter.class, withSettings().extraInterfaces(TextEditor.class, EditorWithAutoSave.class)); openedEditor1 = mock(EditorPartPresenter.class, withSettings().extraInterfaces(TextEditor.class, EditorWithAutoSave.class)); openedEditor2 = mock(EditorPartPresenter.class, withSettings().extraInterfaces(TextEditor.class, EditorWithAutoSave.class)); + virtualFile = mock(VirtualFile.class, withSettings().extraInterfaces(File.class)); when(((EditorWithAutoSave)openedEditor1).isAutoSaveEnabled()).thenReturn(true); when(((EditorWithAutoSave)openedEditor2).isAutoSaveEnabled()).thenReturn(true); @@ -89,13 +111,61 @@ public class EditorGroupSynchronizationImplTest { when(((TextEditor)openedEditor1).getDocument()).thenReturn(document); when(((TextEditor)openedEditor2).getDocument()).thenReturn(document); - when(document.getContents()).thenReturn("some content"); + when(document.getContents()).thenReturn(FILE_CONTENT); + when(openedEditor1.getEditorInput()).thenReturn(editorInput); + when(editorInput.getFile()).thenReturn(virtualFile); + when(virtualFile.getLocation()).thenReturn(new Path(FILE_LOCATION)); when(documentEventBus.addHandler((Event.Type)anyObject(), anyObject())).thenReturn(handlerRegistration); editorGroupSynchronization = new EditorGroupSynchronizationImpl(eventBus, documentStorage, notificationManager); } + @Test + public void shouldUpdateContentOnFileContentUpdateEvent() { + editorGroupSynchronization.addEditor(openedEditor1); + reset(documentEventBus); + when(fileContentUpdateEvent.getFilePath()).thenReturn(FILE_LOCATION); + + editorGroupSynchronization.onFileContentUpdate(fileContentUpdateEvent); + + verify(documentStorage).getDocument(anyObject(), documentCallbackCaptor.capture()); + documentCallbackCaptor.getValue().onDocumentReceived(FILE_NEW_CONTENT); + + verify(document).replace(anyInt(), anyInt(), eq(FILE_NEW_CONTENT)); + verify(notificationManager, never()).notify(anyString(), (StatusNotification.Status)anyObject(), anyObject()); + } + + @Test + public void shouldSkipUpdateContentOnFileContentUpdateEventWhenContentTheSame() { + editorGroupSynchronization.addEditor(openedEditor1); + reset(documentEventBus); + when(fileContentUpdateEvent.getFilePath()).thenReturn(FILE_LOCATION); + + editorGroupSynchronization.onFileContentUpdate(fileContentUpdateEvent); + + verify(documentStorage).getDocument(anyObject(), documentCallbackCaptor.capture()); + documentCallbackCaptor.getValue().onDocumentReceived(FILE_CONTENT); + + verify(document, never()).replace(anyInt(), anyInt(), anyString()); + verify(notificationManager, never()).notify(anyString(), (StatusNotification.Status)anyObject(), anyObject()); + } + + @Test + public void shouldNotifyAboutExternalOperationAtUpdateContentWhenStampIsDifferent() { + editorGroupSynchronization.addEditor(openedEditor1); + reset(documentEventBus); + when(fileContentUpdateEvent.getFilePath()).thenReturn(FILE_LOCATION); + when(fileContentUpdateEvent.getModificationStamp()).thenReturn("some stamp"); + + editorGroupSynchronization.onFileContentUpdate(fileContentUpdateEvent); + + verify(documentStorage).getDocument(anyObject(), documentCallbackCaptor.capture()); + documentCallbackCaptor.getValue().onDocumentReceived(FILE_NEW_CONTENT); + + verify(notificationManager).notify(anyString(), anyString(), eq(SUCCESS), eq(NOT_EMERGE_MODE)); + } + @Test public void shouldAddEditor() { reset(documentEventBus); @@ -109,7 +179,6 @@ public class EditorGroupSynchronizationImplTest { public void shouldUpdateContentAtAddingEditorWhenGroupHasUnsavedData() { editorGroupSynchronization.addEditor(openedEditor1); reset(documentEventBus); - when(((TextEditor)openedEditor1).getDocument()).thenReturn(document); when(((EditorWithAutoSave)openedEditor1).isAutoSaveEnabled()).thenReturn(false); editorGroupSynchronization.addEditor(activeEditor); From c2eb3188c1f4275daaabf66c57f44d74f77a7960 Mon Sep 17 00:00:00 2001 From: Roman Iuvshyn Date: Wed, 9 Aug 2017 11:17:20 +0300 Subject: [PATCH 15/23] RELEASE: Set next development version (#5949) --- agents/che-core-api-agent-shared/pom.xml | 2 +- agents/che-core-api-agent/pom.xml | 2 +- agents/exec/pom.xml | 2 +- agents/git-credentials/pom.xml | 2 +- agents/go-agents/pom.xml | 2 +- agents/ls-csharp/pom.xml | 2 +- agents/ls-json/pom.xml | 2 +- agents/ls-php/pom.xml | 2 +- agents/ls-python/pom.xml | 2 +- agents/ls-typescript/pom.xml | 2 +- agents/pom.xml | 4 ++-- agents/ssh/pom.xml | 2 +- agents/terminal/pom.xml | 2 +- agents/unison/pom.xml | 2 +- assembly/assembly-ide-war/pom.xml | 2 +- assembly/assembly-main/pom.xml | 2 +- assembly/assembly-wsagent-server/pom.xml | 2 +- assembly/assembly-wsagent-war/pom.xml | 2 +- assembly/assembly-wsmaster-war/pom.xml | 2 +- assembly/pom.xml | 4 ++-- core/che-core-api-core/pom.xml | 2 +- core/che-core-api-dto-maven-plugin/pom.xml | 2 +- core/che-core-api-dto/pom.xml | 2 +- core/che-core-api-model/pom.xml | 2 +- core/che-core-db-vendor-h2/pom.xml | 2 +- core/che-core-db-vendor-postgresql/pom.xml | 2 +- core/che-core-db/pom.xml | 2 +- .../pom.xml | 2 +- .../che-core-commons-annotations/pom.xml | 2 +- core/commons/che-core-commons-inject/pom.xml | 2 +- core/commons/che-core-commons-j2ee/pom.xml | 2 +- core/commons/che-core-commons-json/pom.xml | 2 +- core/commons/che-core-commons-lang/pom.xml | 2 +- .../commons/che-core-commons-schedule/pom.xml | 2 +- core/commons/che-core-commons-test/pom.xml | 2 +- core/commons/che-core-commons-xml/pom.xml | 2 +- core/commons/pom.xml | 2 +- core/pom.xml | 4 ++-- dashboard/pom.xml | 4 ++-- dockerfiles/cli/version/5.17.0/images | 4 ++++ dockerfiles/cli/version/5.17.0/images-stacks | 24 +++++++++++++++++++ dockerfiles/cli/version/latest.ver | 2 +- dockerfiles/lib/dto-pom.xml | 4 ++-- .../pom.xml | 2 +- ide/che-core-ide-api/pom.xml | 2 +- ide/che-core-ide-app/pom.xml | 2 +- ide/che-core-ide-generators/pom.xml | 2 +- ide/che-core-ide-stacks/pom.xml | 2 +- ide/che-core-ide-templates/pom.xml | 2 +- ide/che-core-ide-ui/pom.xml | 2 +- ide/che-core-orion-editor/pom.xml | 2 +- ide/che-ide-core/pom.xml | 2 +- ide/commons-gwt/pom.xml | 2 +- ide/gwt-logger/pom.xml | 2 +- ide/pom.xml | 2 +- .../che-plugin-composer-ide/pom.xml | 2 +- .../che-plugin-composer-server/pom.xml | 2 +- .../che-plugin-composer-shared/pom.xml | 2 +- plugins/plugin-composer/pom.xml | 2 +- .../che-plugin-cpp-lang-ide/pom.xml | 2 +- .../che-plugin-cpp-lang-server/pom.xml | 2 +- .../che-plugin-cpp-lang-shared/pom.xml | 2 +- plugins/plugin-cpp/pom.xml | 2 +- .../che-plugin-csharp-lang-ide/pom.xml | 2 +- .../che-plugin-csharp-lang-server/pom.xml | 2 +- .../che-plugin-csharp-lang-shared/pom.xml | 2 +- plugins/plugin-csharp/pom.xml | 2 +- .../che-plugin-ext-dashboard/pom.xml | 2 +- plugins/plugin-dashboard/pom.xml | 2 +- .../che-plugin-debugger-ide/pom.xml | 2 +- plugins/plugin-debugger/pom.xml | 2 +- .../che-plugin-docker-client/pom.xml | 2 +- .../che-plugin-docker-compose/pom.xml | 2 +- .../che-plugin-docker-machine/pom.xml | 2 +- .../che-plugin-openshift-client/pom.xml | 2 +- plugins/plugin-docker/pom.xml | 2 +- plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml | 2 +- .../plugin-gdb/che-plugin-gdb-server/pom.xml | 2 +- plugins/plugin-gdb/pom.xml | 2 +- .../plugin-git/che-plugin-git-ext-git/pom.xml | 2 +- plugins/plugin-git/pom.xml | 2 +- .../pom.xml | 2 +- .../che-plugin-github-ide/pom.xml | 2 +- .../che-plugin-github-oauth2/pom.xml | 2 +- .../che-plugin-github-provider-github/pom.xml | 2 +- .../che-plugin-github-pullrequest/pom.xml | 2 +- .../che-plugin-github-server/pom.xml | 2 +- .../che-plugin-github-shared/pom.xml | 2 +- plugins/plugin-github/pom.xml | 2 +- .../plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml | 2 +- plugins/plugin-gwt/pom.xml | 2 +- .../che-plugin-help-ext-client/pom.xml | 2 +- plugins/plugin-help/pom.xml | 2 +- .../che-plugin-java-debugger-ide/pom.xml | 2 +- .../che-plugin-java-debugger-server/pom.xml | 2 +- plugins/plugin-java-debugger/pom.xml | 2 +- .../org-eclipse-core-filebuffers/pom.xml | 2 +- .../org-eclipse-core-filesystem/pom.xml | 2 +- .../org-eclipse-core-resources/pom.xml | 2 +- .../org-eclipse-jdt-ui/pom.xml | 2 +- .../org-eclipse-jface-text/pom.xml | 2 +- .../org-eclipse-jface/pom.xml | 2 +- .../org-eclipse-ltk-core-refactoring/pom.xml | 2 +- .../org-eclipse-search/pom.xml | 2 +- .../org-eclipse-ui-ide/pom.xml | 2 +- .../che-plugin-java-ext-jdt/pom.xml | 2 +- .../che-plugin-java-ext-lang-client/pom.xml | 2 +- .../che-plugin-java-ext-lang-server/pom.xml | 2 +- .../che-plugin-java-ext-lang-shared/pom.xml | 2 +- .../che-plugin-java-plain-ide/pom.xml | 2 +- .../che-plugin-java-plain-server/pom.xml | 2 +- .../che-plugin-java-plain-shared/pom.xml | 2 +- .../plugin-java/che-plugin-java-plain/pom.xml | 2 +- plugins/plugin-java/pom.xml | 2 +- .../che-plugin-json-server/pom.xml | 2 +- plugins/plugin-json/pom.xml | 2 +- .../plugin-keybinding-eclipse-ide/pom.xml | 2 +- plugins/plugin-keybinding-eclipse/pom.xml | 2 +- .../che-plugin-languageserver-ide/pom.xml | 2 +- plugins/plugin-languageserver/pom.xml | 2 +- .../che-plugin-machine-ext-server/pom.xml | 2 +- .../che-plugin-machine-ssh-client/pom.xml | 2 +- plugins/plugin-machine/pom.xml | 2 +- .../pom.xml | 2 +- .../plugin-maven/che-plugin-maven-ide/pom.xml | 2 +- .../che-plugin-maven-server/pom.xml | 2 +- .../che-plugin-maven-shared/pom.xml | 2 +- .../che-plugin-maven-tools/pom.xml | 2 +- .../che-plugin-maven-wsmaster/pom.xml | 2 +- .../maven-server/maven-server-api/pom.xml | 2 +- .../maven-server/maven-server-impl/pom.xml | 2 +- plugins/plugin-maven/maven-server/pom.xml | 2 +- plugins/plugin-maven/pom.xml | 2 +- .../che-plugin-nodejs-debugger-ide/pom.xml | 2 +- .../che-plugin-nodejs-debugger-server/pom.xml | 2 +- plugins/plugin-nodejs-debugger/pom.xml | 2 +- .../che-plugin-nodejs-lang-ide/pom.xml | 2 +- .../che-plugin-nodejs-lang-server/pom.xml | 2 +- .../che-plugin-nodejs-lang-shared/pom.xml | 2 +- plugins/plugin-nodejs/pom.xml | 2 +- .../che-plugin-orion-compare/pom.xml | 2 +- .../che-plugin-orion-editor/pom.xml | 2 +- plugins/plugin-orion/pom.xml | 2 +- .../che-plugin-php-lang-ide/pom.xml | 2 +- .../che-plugin-php-lang-server/pom.xml | 2 +- .../che-plugin-php-lang-shared/pom.xml | 2 +- plugins/plugin-php/pom.xml | 2 +- plugins/plugin-product-info/pom.xml | 2 +- .../che-plugin-pullrequest-ide/pom.xml | 2 +- .../che-plugin-pullrequest-server/pom.xml | 2 +- .../che-plugin-pullrequest-shared/pom.xml | 2 +- plugins/plugin-pullrequest-parent/pom.xml | 2 +- .../che-plugin-python-lang-ide/pom.xml | 2 +- .../che-plugin-python-lang-server/pom.xml | 2 +- .../che-plugin-python-lang-shared/pom.xml | 2 +- plugins/plugin-python/pom.xml | 2 +- .../che-plugin-sdk-ext-plugins/pom.xml | 2 +- .../plugin-sdk/che-plugin-sdk-tools/pom.xml | 2 +- plugins/plugin-sdk/pom.xml | 2 +- plugins/plugin-ssh-machine/pom.xml | 2 +- .../plugin-svn/che-plugin-svn-ext-ide/pom.xml | 2 +- .../che-plugin-svn-ext-server/pom.xml | 2 +- .../che-plugin-svn-ext-shared/pom.xml | 2 +- plugins/plugin-svn/pom.xml | 2 +- .../plugin-testing-classpath/pom.xml | 2 +- .../che-plugin-testing-junit-ide/pom.xml | 2 +- .../che-plugin-testing-junit-runtime/pom.xml | 2 +- .../che-plugin-testing-junit-server/pom.xml | 2 +- .../plugin-testing-junit/pom.xml | 2 +- .../che-plugin-testing-testng-ide/pom.xml | 2 +- .../che-plugin-testing-testng-runtime/pom.xml | 2 +- .../che-plugin-testing-testng-server/pom.xml | 2 +- .../plugin-testing-testng/pom.xml | 2 +- plugins/plugin-testing-java/pom.xml | 2 +- .../che-plugin-testing-phpunit-ide/pom.xml | 2 +- .../che-plugin-testing-phpunit-server/pom.xml | 2 +- .../plugin-testing-phpunit/pom.xml | 2 +- plugins/plugin-testing-php/pom.xml | 2 +- .../che-plugin-testing-ide/pom.xml | 2 +- plugins/plugin-testing/pom.xml | 2 +- .../plugin-traefik-docker/pom.xml | 2 +- plugins/plugin-traefik/pom.xml | 2 +- plugins/plugin-urlfactory/pom.xml | 2 +- .../che-plugin-web-ext-server/pom.xml | 2 +- .../che-plugin-web-ext-shared/pom.xml | 2 +- .../plugin-web/che-plugin-web-ext-web/pom.xml | 2 +- plugins/plugin-web/pom.xml | 2 +- .../che-plugin-zend-debugger-ide/pom.xml | 2 +- .../che-plugin-zend-debugger-server/pom.xml | 2 +- plugins/plugin-zend-debugger/pom.xml | 2 +- plugins/pom.xml | 4 ++-- pom.xml | 10 ++++---- samples/pom.xml | 4 ++-- .../che-sample-plugin-actions-ide/pom.xml | 2 +- samples/sample-plugin-actions/pom.xml | 2 +- .../che-sample-plugin-embedjs-ide/pom.xml | 2 +- samples/sample-plugin-embedjs/pom.xml | 2 +- .../che-sample-plugin-filetype-ide/pom.xml | 2 +- samples/sample-plugin-filetype/pom.xml | 2 +- .../che-sample-plugin-json-ide/pom.xml | 2 +- .../che-sample-plugin-json-server/pom.xml | 2 +- .../che-sample-plugin-json-shared/pom.xml | 2 +- samples/sample-plugin-json/pom.xml | 2 +- .../pom.xml | 2 +- samples/sample-plugin-nativeaccess/pom.xml | 2 +- .../che-sample-plugin-parts-ide/pom.xml | 2 +- samples/sample-plugin-parts/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- samples/sample-plugin-serverservice/pom.xml | 2 +- .../che-sample-plugin-wizard-ide/pom.xml | 2 +- .../che-sample-plugin-wizard-server/pom.xml | 2 +- .../che-sample-plugin-wizard-shared/pom.xml | 2 +- samples/sample-plugin-wizard/pom.xml | 2 +- wsagent/activity/pom.xml | 2 +- wsagent/agent/pom.xml | 2 +- wsagent/che-core-api-debug-shared/pom.xml | 2 +- wsagent/che-core-api-debug/pom.xml | 2 +- wsagent/che-core-api-git-shared/pom.xml | 2 +- wsagent/che-core-api-git/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- wsagent/che-core-api-languageserver/pom.xml | 2 +- wsagent/che-core-api-oauth/pom.xml | 2 +- wsagent/che-core-api-project-shared/pom.xml | 2 +- wsagent/che-core-api-project/pom.xml | 4 ++-- wsagent/che-core-api-testing-shared/pom.xml | 2 +- wsagent/che-core-api-testing/pom.xml | 2 +- wsagent/che-core-git-impl-jgit/pom.xml | 2 +- wsagent/che-core-ssh-key-ide/pom.xml | 2 +- wsagent/che-core-ssh-key-server/pom.xml | 2 +- wsagent/che-wsagent-core/pom.xml | 2 +- wsagent/pom.xml | 4 ++-- wsagent/wsagent-local/pom.xml | 2 +- wsmaster/che-core-api-account/pom.xml | 2 +- wsmaster/che-core-api-auth-shared/pom.xml | 2 +- wsmaster/che-core-api-auth/pom.xml | 2 +- wsmaster/che-core-api-factory-shared/pom.xml | 2 +- wsmaster/che-core-api-factory/pom.xml | 2 +- wsmaster/che-core-api-machine-shared/pom.xml | 2 +- wsmaster/che-core-api-machine/pom.xml | 2 +- .../pom.xml | 2 +- .../che-core-api-project-templates/pom.xml | 2 +- wsmaster/che-core-api-ssh-shared/pom.xml | 2 +- wsmaster/che-core-api-ssh/pom.xml | 2 +- wsmaster/che-core-api-system-shared/pom.xml | 2 +- wsmaster/che-core-api-system/pom.xml | 2 +- wsmaster/che-core-api-user-shared/pom.xml | 2 +- wsmaster/che-core-api-user/pom.xml | 2 +- .../che-core-api-workspace-shared/pom.xml | 2 +- wsmaster/che-core-api-workspace/pom.xml | 2 +- wsmaster/che-core-sql-schema/pom.xml | 2 +- .../integration-tests/cascade-removal/pom.xml | 2 +- wsmaster/integration-tests/pom.xml | 2 +- .../integration-tests/postgresql-tck/pom.xml | 2 +- wsmaster/pom.xml | 4 ++-- wsmaster/wsmaster-local/pom.xml | 2 +- 257 files changed, 297 insertions(+), 269 deletions(-) create mode 100644 dockerfiles/cli/version/5.17.0/images create mode 100644 dockerfiles/cli/version/5.17.0/images-stacks diff --git a/agents/che-core-api-agent-shared/pom.xml b/agents/che-core-api-agent-shared/pom.xml index 6c57bf89ef..abc8408d3b 100644 --- a/agents/che-core-api-agent-shared/pom.xml +++ b/agents/che-core-api-agent-shared/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.core che-core-api-agent-shared diff --git a/agents/che-core-api-agent/pom.xml b/agents/che-core-api-agent/pom.xml index 05b1d7c50c..f78759d99d 100644 --- a/agents/che-core-api-agent/pom.xml +++ b/agents/che-core-api-agent/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.core che-core-api-agent diff --git a/agents/exec/pom.xml b/agents/exec/pom.xml index 4bde6c72be..87dcfc2595 100644 --- a/agents/exec/pom.xml +++ b/agents/exec/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT exec-agent Agent :: Exec diff --git a/agents/git-credentials/pom.xml b/agents/git-credentials/pom.xml index e9277daa24..839796d0c9 100644 --- a/agents/git-credentials/pom.xml +++ b/agents/git-credentials/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT git-credentials-agent Git Credentials Agent diff --git a/agents/go-agents/pom.xml b/agents/go-agents/pom.xml index 587922e4dc..4de36fb175 100644 --- a/agents/go-agents/pom.xml +++ b/agents/go-agents/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT go-agents Agent :: Golang agents diff --git a/agents/ls-csharp/pom.xml b/agents/ls-csharp/pom.xml index d343855ed3..f8a5977e10 100644 --- a/agents/ls-csharp/pom.xml +++ b/agents/ls-csharp/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ls-csharp-agent Language Server C# Agent diff --git a/agents/ls-json/pom.xml b/agents/ls-json/pom.xml index ac51ca3367..195b2ea613 100644 --- a/agents/ls-json/pom.xml +++ b/agents/ls-json/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ls-json-agent Language Server Json Agent diff --git a/agents/ls-php/pom.xml b/agents/ls-php/pom.xml index 08c991e909..e7eb5a8fb1 100644 --- a/agents/ls-php/pom.xml +++ b/agents/ls-php/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ls-php-agent Language Server PHP Agent diff --git a/agents/ls-python/pom.xml b/agents/ls-python/pom.xml index ed69af238c..a30118da73 100644 --- a/agents/ls-python/pom.xml +++ b/agents/ls-python/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ls-python-agent Language Server python Agent diff --git a/agents/ls-typescript/pom.xml b/agents/ls-typescript/pom.xml index feb07b6ed7..ff561ca5b4 100644 --- a/agents/ls-typescript/pom.xml +++ b/agents/ls-typescript/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ls-typescript-agent Language Server typescript Agent diff --git a/agents/pom.xml b/agents/pom.xml index 097c929b8b..e8fd0ba383 100644 --- a/agents/pom.xml +++ b/agents/pom.xml @@ -16,11 +16,11 @@ che-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-agents-parent - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT pom Che Agents Parent diff --git a/agents/ssh/pom.xml b/agents/ssh/pom.xml index 00abed2b47..232cc36df7 100644 --- a/agents/ssh/pom.xml +++ b/agents/ssh/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ssh-agent SSH Agent diff --git a/agents/terminal/pom.xml b/agents/terminal/pom.xml index 90ec9941a8..f43d70e1cf 100644 --- a/agents/terminal/pom.xml +++ b/agents/terminal/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT terminal-agent Agent :: Terminal diff --git a/agents/unison/pom.xml b/agents/unison/pom.xml index 667e059912..5f601ece56 100644 --- a/agents/unison/pom.xml +++ b/agents/unison/pom.xml @@ -16,7 +16,7 @@ che-agents-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT unison-agent Unison Agent diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index 8c5031f45e..a9e7205c54 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT assembly-ide-war war diff --git a/assembly/assembly-main/pom.xml b/assembly/assembly-main/pom.xml index c9a8fa7a74..1b6a3ca706 100644 --- a/assembly/assembly-main/pom.xml +++ b/assembly/assembly-main/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT assembly-main pom diff --git a/assembly/assembly-wsagent-server/pom.xml b/assembly/assembly-wsagent-server/pom.xml index f18d602b0d..f5ad7acd22 100644 --- a/assembly/assembly-wsagent-server/pom.xml +++ b/assembly/assembly-wsagent-server/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT assembly-wsagent-server pom diff --git a/assembly/assembly-wsagent-war/pom.xml b/assembly/assembly-wsagent-war/pom.xml index c5c4a2ce9d..2b7e7c3881 100644 --- a/assembly/assembly-wsagent-war/pom.xml +++ b/assembly/assembly-wsagent-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT assembly-wsagent-war war diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml index 8e1c3c38d6..562dc354d8 100644 --- a/assembly/assembly-wsmaster-war/pom.xml +++ b/assembly/assembly-wsmaster-war/pom.xml @@ -16,7 +16,7 @@ che-assembly-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT assembly-wsmaster-war war diff --git a/assembly/pom.xml b/assembly/pom.xml index f22644cc7a..b29cc42f50 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml org.eclipse.che che-assembly-parent - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT pom Che IDE :: Parent diff --git a/core/che-core-api-core/pom.xml b/core/che-core-api-core/pom.xml index fcf33d6e6b..cd0749b704 100644 --- a/core/che-core-api-core/pom.xml +++ b/core/che-core-api-core/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-core jar diff --git a/core/che-core-api-dto-maven-plugin/pom.xml b/core/che-core-api-dto-maven-plugin/pom.xml index 50408b6b52..9a2f8ef177 100644 --- a/core/che-core-api-dto-maven-plugin/pom.xml +++ b/core/che-core-api-dto-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-dto-maven-plugin maven-plugin diff --git a/core/che-core-api-dto/pom.xml b/core/che-core-api-dto/pom.xml index 51df3d27d2..edb08a0d06 100644 --- a/core/che-core-api-dto/pom.xml +++ b/core/che-core-api-dto/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-dto jar diff --git a/core/che-core-api-model/pom.xml b/core/che-core-api-model/pom.xml index 3a3fd91b48..638028d60d 100644 --- a/core/che-core-api-model/pom.xml +++ b/core/che-core-api-model/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-model jar diff --git a/core/che-core-db-vendor-h2/pom.xml b/core/che-core-db-vendor-h2/pom.xml index bdebb9f4af..ba4b5f94f2 100644 --- a/core/che-core-db-vendor-h2/pom.xml +++ b/core/che-core-db-vendor-h2/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-db-vendor-h2 Che Core :: DB :: Vendor H2 diff --git a/core/che-core-db-vendor-postgresql/pom.xml b/core/che-core-db-vendor-postgresql/pom.xml index 4d81599c19..a310103376 100644 --- a/core/che-core-db-vendor-postgresql/pom.xml +++ b/core/che-core-db-vendor-postgresql/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-db-vendor-postgresql Che Core :: DB :: Vendor PostgreSQL diff --git a/core/che-core-db/pom.xml b/core/che-core-db/pom.xml index ef20b5ce3e..599d480ef1 100644 --- a/core/che-core-db/pom.xml +++ b/core/che-core-db/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-db Che Core :: DB diff --git a/core/che-core-typescript-dto-maven-plugin/pom.xml b/core/che-core-typescript-dto-maven-plugin/pom.xml index 8a92a7de77..2d0a91c4c2 100644 --- a/core/che-core-typescript-dto-maven-plugin/pom.xml +++ b/core/che-core-typescript-dto-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.core che-core-typescript-dto-maven-plugin diff --git a/core/commons/che-core-commons-annotations/pom.xml b/core/commons/che-core-commons-annotations/pom.xml index 9da0bc0064..d3bdec8ef5 100644 --- a/core/commons/che-core-commons-annotations/pom.xml +++ b/core/commons/che-core-commons-annotations/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-commons-annotations jar diff --git a/core/commons/che-core-commons-inject/pom.xml b/core/commons/che-core-commons-inject/pom.xml index c6b563b0bc..7d914043ff 100644 --- a/core/commons/che-core-commons-inject/pom.xml +++ b/core/commons/che-core-commons-inject/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-commons-inject jar diff --git a/core/commons/che-core-commons-j2ee/pom.xml b/core/commons/che-core-commons-j2ee/pom.xml index a4e7974d99..7f8b68003d 100644 --- a/core/commons/che-core-commons-j2ee/pom.xml +++ b/core/commons/che-core-commons-j2ee/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-commons-j2ee jar diff --git a/core/commons/che-core-commons-json/pom.xml b/core/commons/che-core-commons-json/pom.xml index 45c3b92b9b..d176457053 100644 --- a/core/commons/che-core-commons-json/pom.xml +++ b/core/commons/che-core-commons-json/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-commons-json jar diff --git a/core/commons/che-core-commons-lang/pom.xml b/core/commons/che-core-commons-lang/pom.xml index 60328e61f2..89cbac4cb6 100644 --- a/core/commons/che-core-commons-lang/pom.xml +++ b/core/commons/che-core-commons-lang/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-commons-lang jar diff --git a/core/commons/che-core-commons-schedule/pom.xml b/core/commons/che-core-commons-schedule/pom.xml index 46e4d2483c..0cb9b45102 100644 --- a/core/commons/che-core-commons-schedule/pom.xml +++ b/core/commons/che-core-commons-schedule/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-commons-schedule jar diff --git a/core/commons/che-core-commons-test/pom.xml b/core/commons/che-core-commons-test/pom.xml index 82b69bdcd9..b643e7ca80 100644 --- a/core/commons/che-core-commons-test/pom.xml +++ b/core/commons/che-core-commons-test/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-commons-test jar diff --git a/core/commons/che-core-commons-xml/pom.xml b/core/commons/che-core-commons-xml/pom.xml index 30bfc2fcb0..e3f6f7193c 100644 --- a/core/commons/che-core-commons-xml/pom.xml +++ b/core/commons/che-core-commons-xml/pom.xml @@ -16,7 +16,7 @@ che-core-commons-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-commons-xml jar diff --git a/core/commons/pom.xml b/core/commons/pom.xml index cd252d61fb..782d4fcaad 100644 --- a/core/commons/pom.xml +++ b/core/commons/pom.xml @@ -16,7 +16,7 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-core-commons-parent diff --git a/core/pom.xml b/core/pom.xml index e363f0e801..332811c92e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml org.eclipse.che.core che-core-parent - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT pom Che Core Parent diff --git a/dashboard/pom.xml b/dashboard/pom.xml index 97149112f5..6274df8a4c 100644 --- a/dashboard/pom.xml +++ b/dashboard/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml org.eclipse.che.dashboard che-dashboard-war - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT war Che Dashboard :: Web App 2015 diff --git a/dockerfiles/cli/version/5.17.0/images b/dockerfiles/cli/version/5.17.0/images new file mode 100644 index 0000000000..16a83e5baf --- /dev/null +++ b/dockerfiles/cli/version/5.17.0/images @@ -0,0 +1,4 @@ +IMAGE_INIT=eclipse/che-init:5.17.0 +IMAGE_CHE=eclipse/che-server:5.17.0 +IMAGE_COMPOSE=docker/compose:1.8.1 +IMAGE_TRAEFIK=traefik:v1.3.0-rc3 diff --git a/dockerfiles/cli/version/5.17.0/images-stacks b/dockerfiles/cli/version/5.17.0/images-stacks new file mode 100644 index 0000000000..4630f02af6 --- /dev/null +++ b/dockerfiles/cli/version/5.17.0/images-stacks @@ -0,0 +1,24 @@ +eclipse/alpine_jdk8 +eclipse/aspnet +eclipse/centos_jdk8 +eclipse/cpp_gcc +eclipse/debian_jdk8 +eclipse/debian_jdk8_node +eclipse/debian_jre +eclipse/dotnet_core +eclipse/hadoop-dev +eclipse/meteor +eclipse/node +eclipse/php +eclipse/platformio +eclipse/ruby_rails +eclipse/selenium +eclipse/ubuntu_android +eclipse/ubuntu_go +eclipse/ubuntu_gradle +eclipse/ubuntu_jdk8 +eclipse/ubuntu_jre +eclipse/ubuntu_python +eclipse/ubuntu_wildfly8 +registry.centos.org/che-stacks/vertx + diff --git a/dockerfiles/cli/version/latest.ver b/dockerfiles/cli/version/latest.ver index e0cb00460a..6fc6275499 100644 --- a/dockerfiles/cli/version/latest.ver +++ b/dockerfiles/cli/version/latest.ver @@ -1 +1 @@ -5.15.0 \ No newline at end of file +5.16.0 \ No newline at end of file diff --git a/dockerfiles/lib/dto-pom.xml b/dockerfiles/lib/dto-pom.xml index 6f2917900d..83a32ddc59 100644 --- a/dockerfiles/lib/dto-pom.xml +++ b/dockerfiles/lib/dto-pom.xml @@ -17,13 +17,13 @@ maven-depmgt-pom org.eclipse.che.depmgt - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT dto-typescript pom Che TypeScript DTO - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT diff --git a/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml b/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml index c4549c7d0f..96e14dc876 100644 --- a/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml +++ b/ide/che-core-dyna-provider-generator-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-dyna-provider-generator-maven-plugin maven-plugin diff --git a/ide/che-core-ide-api/pom.xml b/ide/che-core-ide-api/pom.xml index ae7d4321fb..2c6bfc6984 100644 --- a/ide/che-core-ide-api/pom.xml +++ b/ide/che-core-ide-api/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.core che-core-ide-api diff --git a/ide/che-core-ide-app/pom.xml b/ide/che-core-ide-app/pom.xml index d3fd368311..cebde1666b 100644 --- a/ide/che-core-ide-app/pom.xml +++ b/ide/che-core-ide-app/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-ide-app jar diff --git a/ide/che-core-ide-generators/pom.xml b/ide/che-core-ide-generators/pom.xml index 37158b8d1e..6b5573d383 100644 --- a/ide/che-core-ide-generators/pom.xml +++ b/ide/che-core-ide-generators/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.core che-core-ide-generators diff --git a/ide/che-core-ide-stacks/pom.xml b/ide/che-core-ide-stacks/pom.xml index 07c8687305..213fee2ff8 100644 --- a/ide/che-core-ide-stacks/pom.xml +++ b/ide/che-core-ide-stacks/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.core che-core-ide-stacks diff --git a/ide/che-core-ide-templates/pom.xml b/ide/che-core-ide-templates/pom.xml index 5edc5c251d..f49d71a426 100644 --- a/ide/che-core-ide-templates/pom.xml +++ b/ide/che-core-ide-templates/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.core che-core-ide-templates diff --git a/ide/che-core-ide-ui/pom.xml b/ide/che-core-ide-ui/pom.xml index 62f97d5520..a0384aa45d 100644 --- a/ide/che-core-ide-ui/pom.xml +++ b/ide/che-core-ide-ui/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.core che-core-ide-ui diff --git a/ide/che-core-orion-editor/pom.xml b/ide/che-core-orion-editor/pom.xml index 52bc119146..f31af7cdaa 100644 --- a/ide/che-core-orion-editor/pom.xml +++ b/ide/che-core-orion-editor/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-orion-editor jar diff --git a/ide/che-ide-core/pom.xml b/ide/che-ide-core/pom.xml index 3c72cf5095..fc4ddddb5f 100644 --- a/ide/che-ide-core/pom.xml +++ b/ide/che-ide-core/pom.xml @@ -16,7 +16,7 @@ che-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../../pom.xml org.eclipse.che.core diff --git a/ide/commons-gwt/pom.xml b/ide/commons-gwt/pom.xml index 0f5535ba7d..b65fea53b5 100644 --- a/ide/commons-gwt/pom.xml +++ b/ide/commons-gwt/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-commons-gwt Che Core :: Commons :: GWT diff --git a/ide/gwt-logger/pom.xml b/ide/gwt-logger/pom.xml index b1783cce3e..57ede4a6a4 100644 --- a/ide/gwt-logger/pom.xml +++ b/ide/gwt-logger/pom.xml @@ -16,7 +16,7 @@ che-core-ide-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-gwt-logger Che Core :: Commons :: GWT Logger diff --git a/ide/pom.xml b/ide/pom.xml index 5070bf146a..c3af0995a2 100644 --- a/ide/pom.xml +++ b/ide/pom.xml @@ -16,7 +16,7 @@ che-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml org.eclipse.che.core diff --git a/plugins/plugin-composer/che-plugin-composer-ide/pom.xml b/plugins/plugin-composer/che-plugin-composer-ide/pom.xml index 873de1b541..d871e14fc9 100644 --- a/plugins/plugin-composer/che-plugin-composer-ide/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-composer-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-composer-ide jar diff --git a/plugins/plugin-composer/che-plugin-composer-server/pom.xml b/plugins/plugin-composer/che-plugin-composer-server/pom.xml index b67d61009f..0f273490b7 100644 --- a/plugins/plugin-composer/che-plugin-composer-server/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-composer-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-composer-server Che Plugin :: Composer :: Server diff --git a/plugins/plugin-composer/che-plugin-composer-shared/pom.xml b/plugins/plugin-composer/che-plugin-composer-shared/pom.xml index ca2ecd736b..93cf8ad6b8 100644 --- a/plugins/plugin-composer/che-plugin-composer-shared/pom.xml +++ b/plugins/plugin-composer/che-plugin-composer-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-composer-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-composer-shared Che Plugin :: Composer :: Shared diff --git a/plugins/plugin-composer/pom.xml b/plugins/plugin-composer/pom.xml index 9b9a5e83a9..57b2e6f69a 100644 --- a/plugins/plugin-composer/pom.xml +++ b/plugins/plugin-composer/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-composer-parent diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml index d6a4b97fd5..b0431c5db0 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-cpp-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-cpp-lang-ide jar diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml index 677ef3c228..bd37bdd0f6 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-cpp-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-cpp-lang-server Che Plugin :: C/C++ :: Extension Server diff --git a/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml b/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml index b39ff01264..87093baa06 100644 --- a/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml +++ b/plugins/plugin-cpp/che-plugin-cpp-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-cpp-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-cpp-lang-shared Che Plugin :: C/C++ :: Shared diff --git a/plugins/plugin-cpp/pom.xml b/plugins/plugin-cpp/pom.xml index 2fe4a239cb..84a33a318f 100644 --- a/plugins/plugin-cpp/pom.xml +++ b/plugins/plugin-cpp/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-cpp-parent diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml index 992df4fd65..7a539b9a04 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-csharp-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-csharp-lang-ide jar diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml index 531574eee6..e9167f753c 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-csharp-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-csharp-lang-server Che Plugin :: C# :: Extension Server diff --git a/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml b/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml index f619a6d510..3f0cfa2e7d 100644 --- a/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml +++ b/plugins/plugin-csharp/che-plugin-csharp-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-csharp-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-csharp-lang-shared Che Plugin :: C# :: Shared diff --git a/plugins/plugin-csharp/pom.xml b/plugins/plugin-csharp/pom.xml index a328f2ec1c..a198be1c36 100644 --- a/plugins/plugin-csharp/pom.xml +++ b/plugins/plugin-csharp/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-csharp-parent diff --git a/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml b/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml index 99cdc9e376..c15c21c9c9 100644 --- a/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml +++ b/plugins/plugin-dashboard/che-plugin-ext-dashboard/pom.xml @@ -16,7 +16,7 @@ che-plugin-dashboard-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-ext-dashboard-client jar diff --git a/plugins/plugin-dashboard/pom.xml b/plugins/plugin-dashboard/pom.xml index f35da51402..6b6968e478 100644 --- a/plugins/plugin-dashboard/pom.xml +++ b/plugins/plugin-dashboard/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-dashboard-parent diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml index a458c10a3f..4958393154 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-debugger-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-debugger-ide jar diff --git a/plugins/plugin-debugger/pom.xml b/plugins/plugin-debugger/pom.xml index 09458bbffe..d983314ddc 100644 --- a/plugins/plugin-debugger/pom.xml +++ b/plugins/plugin-debugger/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-debugger-parent diff --git a/plugins/plugin-docker/che-plugin-docker-client/pom.xml b/plugins/plugin-docker/che-plugin-docker-client/pom.xml index c68ab4a0a2..1ad1e0281b 100644 --- a/plugins/plugin-docker/che-plugin-docker-client/pom.xml +++ b/plugins/plugin-docker/che-plugin-docker-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-docker-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-docker-client jar diff --git a/plugins/plugin-docker/che-plugin-docker-compose/pom.xml b/plugins/plugin-docker/che-plugin-docker-compose/pom.xml index 9c8d070f79..f20c9abbc9 100644 --- a/plugins/plugin-docker/che-plugin-docker-compose/pom.xml +++ b/plugins/plugin-docker/che-plugin-docker-compose/pom.xml @@ -16,7 +16,7 @@ che-plugin-docker-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-docker-compose jar diff --git a/plugins/plugin-docker/che-plugin-docker-machine/pom.xml b/plugins/plugin-docker/che-plugin-docker-machine/pom.xml index 734b96ed37..be9354a9f7 100644 --- a/plugins/plugin-docker/che-plugin-docker-machine/pom.xml +++ b/plugins/plugin-docker/che-plugin-docker-machine/pom.xml @@ -16,7 +16,7 @@ che-plugin-docker-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-docker-machine jar diff --git a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml index 5830c3be11..c4e639951c 100644 --- a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml +++ b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-docker-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-openshift-client jar diff --git a/plugins/plugin-docker/pom.xml b/plugins/plugin-docker/pom.xml index d5e6dde9b2..49abbb6edc 100644 --- a/plugins/plugin-docker/pom.xml +++ b/plugins/plugin-docker/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-docker-parent diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml index af39199bc5..c6ab9054e2 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml +++ b/plugins/plugin-gdb/che-plugin-gdb-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-gdb-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-gdb-ide jar diff --git a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml index 23d2bd20e8..0ab5e8c416 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml +++ b/plugins/plugin-gdb/che-plugin-gdb-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-gdb-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-gdb-server jar diff --git a/plugins/plugin-gdb/pom.xml b/plugins/plugin-gdb/pom.xml index 08fde99839..414d77a443 100644 --- a/plugins/plugin-gdb/pom.xml +++ b/plugins/plugin-gdb/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-gdb-parent pom diff --git a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml index 0cc5a52495..b318e8a9e5 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/pom.xml +++ b/plugins/plugin-git/che-plugin-git-ext-git/pom.xml @@ -16,7 +16,7 @@ che-plugin-git-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-git-ext-git jar diff --git a/plugins/plugin-git/pom.xml b/plugins/plugin-git/pom.xml index cc886b9d3e..aee37fe7b9 100644 --- a/plugins/plugin-git/pom.xml +++ b/plugins/plugin-git/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-git-parent diff --git a/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml b/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml index ecfbd5a17a..8f11f2b2a4 100644 --- a/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml +++ b/plugins/plugin-github/che-plugin-github-factory-resolver/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-github-factory-resolver jar diff --git a/plugins/plugin-github/che-plugin-github-ide/pom.xml b/plugins/plugin-github/che-plugin-github-ide/pom.xml index df34e18b02..87c65e9798 100644 --- a/plugins/plugin-github/che-plugin-github-ide/pom.xml +++ b/plugins/plugin-github/che-plugin-github-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-github-ide jar diff --git a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml index cb0f468c20..ff4f0c97b8 100644 --- a/plugins/plugin-github/che-plugin-github-oauth2/pom.xml +++ b/plugins/plugin-github/che-plugin-github-oauth2/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-github-oauth2 jar diff --git a/plugins/plugin-github/che-plugin-github-provider-github/pom.xml b/plugins/plugin-github/che-plugin-github-provider-github/pom.xml index 31838a84b7..fca70d3f3f 100644 --- a/plugins/plugin-github/che-plugin-github-provider-github/pom.xml +++ b/plugins/plugin-github/che-plugin-github-provider-github/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-github-provider-github Che Plugin :: Github :: Credential provider diff --git a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml index 81c9928275..61062b3884 100644 --- a/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml +++ b/plugins/plugin-github/che-plugin-github-pullrequest/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-github-pullrequest Che Plugin :: Github :: Pull request diff --git a/plugins/plugin-github/che-plugin-github-server/pom.xml b/plugins/plugin-github/che-plugin-github-server/pom.xml index 89623b5573..9234c86543 100644 --- a/plugins/plugin-github/che-plugin-github-server/pom.xml +++ b/plugins/plugin-github/che-plugin-github-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-github-server jar diff --git a/plugins/plugin-github/che-plugin-github-shared/pom.xml b/plugins/plugin-github/che-plugin-github-shared/pom.xml index a800bc341c..115554f79f 100644 --- a/plugins/plugin-github/che-plugin-github-shared/pom.xml +++ b/plugins/plugin-github/che-plugin-github-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-github-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-github-shared Che Plugin :: Github :: Shared diff --git a/plugins/plugin-github/pom.xml b/plugins/plugin-github/pom.xml index 61a40e7e62..d210edf131 100644 --- a/plugins/plugin-github/pom.xml +++ b/plugins/plugin-github/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-github-parent diff --git a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml index b2cf809cda..762b229476 100644 --- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml +++ b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/pom.xml @@ -16,7 +16,7 @@ che-plugin-gwt-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-gwt-ext-gwt jar diff --git a/plugins/plugin-gwt/pom.xml b/plugins/plugin-gwt/pom.xml index 496761d7b0..b603c1c792 100644 --- a/plugins/plugin-gwt/pom.xml +++ b/plugins/plugin-gwt/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-gwt-parent diff --git a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml index 441a2388a6..1ea080836f 100644 --- a/plugins/plugin-help/che-plugin-help-ext-client/pom.xml +++ b/plugins/plugin-help/che-plugin-help-ext-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-help-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-help-ext-client jar diff --git a/plugins/plugin-help/pom.xml b/plugins/plugin-help/pom.xml index 9a12b7dba9..14b97d850d 100644 --- a/plugins/plugin-help/pom.xml +++ b/plugins/plugin-help/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-help-parent diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml index aaf00f5d8c..1c7c153cc5 100644 --- a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml +++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-debugger-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-debugger-ide jar diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml index e29b66bfd2..6da449beeb 100644 --- a/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml +++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-debugger-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-debugger-server jar diff --git a/plugins/plugin-java-debugger/pom.xml b/plugins/plugin-java-debugger/pom.xml index c483fa2fde..e295595270 100644 --- a/plugins/plugin-java-debugger/pom.xml +++ b/plugins/plugin-java-debugger/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-debugger-parent pom diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml index c84b5d4d41..b9b4aa7b74 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filebuffers/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.core.filebuffers jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml index d905f64327..e6ad96896b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-filesystem/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.core.filesystem jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml index fd7d696f5f..1a9bbf1f3a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-core-resources/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.core.resources jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml index bf24254f44..2e75075c1f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jdt-ui/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.jdt.ui jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml index b3136d2383..67fc54df22 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface-text/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.jface.text jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml index 774fc47db5..3fd9867711 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-jface/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.jface jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml index ee578d4a9c..aba2cb53a8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ltk-core-refactoring/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.ltk.core.refactoring jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml index bc944cf5bd..65b337ae3d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-search/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.search jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml index 6d0e8d5ebc..cea80557f8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/org-eclipse-ui-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-ext-jdt-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.ui.ide jar diff --git a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml index 7f430b4546..0a13235aaa 100644 --- a/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-jdt/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-ext-jdt-parent pom diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml index 155aea6666..d78d2ff2bf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-ext-lang-client jar diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml index 780562a06d..74f7a8c87a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-ext-lang-server Che Plugin :: Java :: Extension Java Server diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml index 32fde1d457..4829f17bf0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml +++ b/plugins/plugin-java/che-plugin-java-ext-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-ext-lang-shared Che Plugin :: Java :: Extension Java Shared diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml index 2a15954d16..bc009f84d3 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-plain org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-plain-ide jar diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml index 5b811b319f..353ea8dc62 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-plain org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-plain-server Che Plugin :: Java :: Plain :: Server diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml index 2954c62183..f02f9e648c 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-plain org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-plain-shared Che Plugin :: Java :: Plain :: Shared diff --git a/plugins/plugin-java/che-plugin-java-plain/pom.xml b/plugins/plugin-java/che-plugin-java-plain/pom.xml index f5adaa9cd6..251e39edc5 100644 --- a/plugins/plugin-java/che-plugin-java-plain/pom.xml +++ b/plugins/plugin-java/che-plugin-java-plain/pom.xml @@ -16,7 +16,7 @@ che-plugin-java-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-java-plain diff --git a/plugins/plugin-java/pom.xml b/plugins/plugin-java/pom.xml index 90e4bfd86e..521209d7db 100644 --- a/plugins/plugin-java/pom.xml +++ b/plugins/plugin-java/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-java-parent diff --git a/plugins/plugin-json/che-plugin-json-server/pom.xml b/plugins/plugin-json/che-plugin-json-server/pom.xml index 5770cf8487..a490806dab 100644 --- a/plugins/plugin-json/che-plugin-json-server/pom.xml +++ b/plugins/plugin-json/che-plugin-json-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-json-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-json-server Che Plugin :: JSON :: Extension Server diff --git a/plugins/plugin-json/pom.xml b/plugins/plugin-json/pom.xml index f048881abe..4c038f5430 100644 --- a/plugins/plugin-json/pom.xml +++ b/plugins/plugin-json/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-json-parent diff --git a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml index c32e14d46f..e37d87c86c 100644 --- a/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml +++ b/plugins/plugin-keybinding-eclipse/plugin-keybinding-eclipse-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-keybinding-eclipse-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-keybinding-eclipse-ide diff --git a/plugins/plugin-keybinding-eclipse/pom.xml b/plugins/plugin-keybinding-eclipse/pom.xml index 0f4b80e5f2..af871e53d4 100644 --- a/plugins/plugin-keybinding-eclipse/pom.xml +++ b/plugins/plugin-keybinding-eclipse/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-keybinding-eclipse-parent diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml index 6cb34c603b..fc046e0234 100644 --- a/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml +++ b/plugins/plugin-languageserver/che-plugin-languageserver-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-languageserver-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT .. che-plugin-languageserver-ide diff --git a/plugins/plugin-languageserver/pom.xml b/plugins/plugin-languageserver/pom.xml index 06b92060c8..c5212b11dc 100644 --- a/plugins/plugin-languageserver/pom.xml +++ b/plugins/plugin-languageserver/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-languageserver-parent diff --git a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml index 9238e8f633..923194ce6f 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ext-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-machine-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-machine-ext-server diff --git a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml index f0c6e16725..84aaba2860 100644 --- a/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml +++ b/plugins/plugin-machine/che-plugin-machine-ssh-client/pom.xml @@ -16,7 +16,7 @@ che-plugin-machine-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-machine-ssh-client jar diff --git a/plugins/plugin-machine/pom.xml b/plugins/plugin-machine/pom.xml index 32ce397240..5c4e13daaa 100644 --- a/plugins/plugin-machine/pom.xml +++ b/plugins/plugin-machine/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-machine-parent diff --git a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml index 4bd084b732..1f8a0a4e13 100644 --- a/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-generator-archetype/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-maven-generator-archetype jar diff --git a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml index d4fb0ab7fc..6e88dd076e 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-maven-ide Che Plugin :: Maven :: Extension Maven Client diff --git a/plugins/plugin-maven/che-plugin-maven-server/pom.xml b/plugins/plugin-maven/che-plugin-maven-server/pom.xml index 6a5c5f282b..60ec07f32b 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-maven-server jar diff --git a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml index d9a75bd01c..ae1ab67094 100644 --- a/plugins/plugin-maven/che-plugin-maven-shared/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-maven-shared Che Plugin :: Maven :: Extension Maven Shared diff --git a/plugins/plugin-maven/che-plugin-maven-tools/pom.xml b/plugins/plugin-maven/che-plugin-maven-tools/pom.xml index 06b8c3bece..c471c07101 100644 --- a/plugins/plugin-maven/che-plugin-maven-tools/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-tools/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-java-maven-tools jar diff --git a/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml b/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml index dc737a202f..d361290ff3 100644 --- a/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml +++ b/plugins/plugin-maven/che-plugin-maven-wsmaster/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-maven-wsmaster jar diff --git a/plugins/plugin-maven/maven-server/maven-server-api/pom.xml b/plugins/plugin-maven/maven-server/maven-server-api/pom.xml index 755bbf41cf..bc6ede2252 100644 --- a/plugins/plugin-maven/maven-server/maven-server-api/pom.xml +++ b/plugins/plugin-maven/maven-server/maven-server-api/pom.xml @@ -16,7 +16,7 @@ che-maven-server org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT maven-server-api jar diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml b/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml index b16284d22b..e0d9a8ba92 100644 --- a/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml +++ b/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml @@ -16,7 +16,7 @@ che-maven-server org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT maven-server-impl jar diff --git a/plugins/plugin-maven/maven-server/pom.xml b/plugins/plugin-maven/maven-server/pom.xml index e868706e99..c4b3beb18d 100644 --- a/plugins/plugin-maven/maven-server/pom.xml +++ b/plugins/plugin-maven/maven-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-maven-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-maven-server pom diff --git a/plugins/plugin-maven/pom.xml b/plugins/plugin-maven/pom.xml index 1a5eac66ed..ab9576bc28 100644 --- a/plugins/plugin-maven/pom.xml +++ b/plugins/plugin-maven/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-maven-parent diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml index 51a1fe024f..e6d10bb946 100644 --- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml +++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-debugger-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-nodejs-debugger-ide jar diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml index 9bf6ad7712..8c7b3f3ef2 100644 --- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml +++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-debugger-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-nodejs-debugger-server jar diff --git a/plugins/plugin-nodejs-debugger/pom.xml b/plugins/plugin-nodejs-debugger/pom.xml index 54ef0b8d2c..917a1307ea 100644 --- a/plugins/plugin-nodejs-debugger/pom.xml +++ b/plugins/plugin-nodejs-debugger/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-nodejs-debugger-parent pom diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml index b195ce1578..bd1ce56b42 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-nodejs-lang-ide jar diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml index a768936e26..e81ac14dcd 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-nodejs-lang-server Che Plugin :: NodeJs :: Extension Server diff --git a/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml b/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml index fd23f6c356..e19b3c5348 100644 --- a/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml +++ b/plugins/plugin-nodejs/che-plugin-nodejs-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-nodejs-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-nodejs-lang-shared Che Plugin :: NodeJs :: Extension Shared diff --git a/plugins/plugin-nodejs/pom.xml b/plugins/plugin-nodejs/pom.xml index fb5a6b566f..cb58cadf54 100644 --- a/plugins/plugin-nodejs/pom.xml +++ b/plugins/plugin-nodejs/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-nodejs-parent diff --git a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml index 3574870af4..ab366fe99a 100644 --- a/plugins/plugin-orion/che-plugin-orion-compare/pom.xml +++ b/plugins/plugin-orion/che-plugin-orion-compare/pom.xml @@ -16,7 +16,7 @@ che-plugin-orion-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-orion-compare jar diff --git a/plugins/plugin-orion/che-plugin-orion-editor/pom.xml b/plugins/plugin-orion/che-plugin-orion-editor/pom.xml index 052bf28bee..f7afbad989 100644 --- a/plugins/plugin-orion/che-plugin-orion-editor/pom.xml +++ b/plugins/plugin-orion/che-plugin-orion-editor/pom.xml @@ -16,7 +16,7 @@ che-plugin-orion-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-orion-editor diff --git a/plugins/plugin-orion/pom.xml b/plugins/plugin-orion/pom.xml index c5c7d3963d..a49a77eefb 100644 --- a/plugins/plugin-orion/pom.xml +++ b/plugins/plugin-orion/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-orion-parent diff --git a/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml b/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml index f0c36566d5..626f05a75b 100644 --- a/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-php-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-php-lang-ide jar diff --git a/plugins/plugin-php/che-plugin-php-lang-server/pom.xml b/plugins/plugin-php/che-plugin-php-lang-server/pom.xml index 9f2dfc54ee..5dcc593035 100644 --- a/plugins/plugin-php/che-plugin-php-lang-server/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-php-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-php-lang-server Che Plugin :: PHP :: Extension Server diff --git a/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml b/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml index ecf5c2f750..ee71b0c310 100644 --- a/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml +++ b/plugins/plugin-php/che-plugin-php-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-php-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-php-lang-shared Che Plugin :: PHP :: Shared diff --git a/plugins/plugin-php/pom.xml b/plugins/plugin-php/pom.xml index 1edb70625e..6804b0ba0f 100644 --- a/plugins/plugin-php/pom.xml +++ b/plugins/plugin-php/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-php-parent diff --git a/plugins/plugin-product-info/pom.xml b/plugins/plugin-product-info/pom.xml index 099e254f2a..c8cd75a645 100644 --- a/plugins/plugin-product-info/pom.xml +++ b/plugins/plugin-product-info/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-product-info diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml index 9fa3ed4280..36297f599f 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-pullrequest-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-pullrequest-ide Che Plugin :: Pull request :: IDE diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml index 9603313113..d8004a4242 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-pullrequest-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-pullrequest-server Che Plugin :: Pull request :: Server diff --git a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml index 960cb4b8eb..dadcaede60 100644 --- a/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml +++ b/plugins/plugin-pullrequest-parent/che-plugin-pullrequest-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-pullrequest-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-pullrequest-shared Che Plugin :: Pull request :: Shared diff --git a/plugins/plugin-pullrequest-parent/pom.xml b/plugins/plugin-pullrequest-parent/pom.xml index 5d56b441e3..b7b93e8d5a 100644 --- a/plugins/plugin-pullrequest-parent/pom.xml +++ b/plugins/plugin-pullrequest-parent/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-pullrequest-parent pom diff --git a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml index 65c5fcbd58..bfc0ff8395 100644 --- a/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-python-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-python-lang-ide jar diff --git a/plugins/plugin-python/che-plugin-python-lang-server/pom.xml b/plugins/plugin-python/che-plugin-python-lang-server/pom.xml index 0ce7a22b58..6e1d961e85 100644 --- a/plugins/plugin-python/che-plugin-python-lang-server/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-python-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-python-lang-server Che Plugin :: Python :: Extension Server diff --git a/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml b/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml index 281a91911c..7a43c7b0ff 100644 --- a/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml +++ b/plugins/plugin-python/che-plugin-python-lang-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-python-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-python-lang-shared che-plugin-python-lang-shared diff --git a/plugins/plugin-python/pom.xml b/plugins/plugin-python/pom.xml index 0ed186b056..7bd8b19839 100644 --- a/plugins/plugin-python/pom.xml +++ b/plugins/plugin-python/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-python-parent diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml index 3ea917b21b..97f8b7a65c 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/pom.xml @@ -16,7 +16,7 @@ che-plugin-sdk-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-sdk-ext-plugins jar diff --git a/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml b/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml index ba344a642e..d3ac4b8958 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml +++ b/plugins/plugin-sdk/che-plugin-sdk-tools/pom.xml @@ -16,7 +16,7 @@ che-plugin-sdk-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-sdk-tools jar diff --git a/plugins/plugin-sdk/pom.xml b/plugins/plugin-sdk/pom.xml index 725368bd80..a6b5e886e3 100644 --- a/plugins/plugin-sdk/pom.xml +++ b/plugins/plugin-sdk/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-sdk-parent diff --git a/plugins/plugin-ssh-machine/pom.xml b/plugins/plugin-ssh-machine/pom.xml index a166e30807..d3a90dc40d 100644 --- a/plugins/plugin-ssh-machine/pom.xml +++ b/plugins/plugin-ssh-machine/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-ssh-machine diff --git a/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml index 660c54e7ec..52335f3919 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-svn-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-svn-ext-ide jar diff --git a/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml index c2908acf9c..164da6062a 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-svn-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-svn-ext-server jar diff --git a/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml b/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml index c360fbf3f0..dac46ce025 100644 --- a/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml +++ b/plugins/plugin-svn/che-plugin-svn-ext-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-svn-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-svn-ext-shared jar diff --git a/plugins/plugin-svn/pom.xml b/plugins/plugin-svn/pom.xml index 45189b260e..e6b21e4f7d 100644 --- a/plugins/plugin-svn/pom.xml +++ b/plugins/plugin-svn/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-svn-parent diff --git a/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml b/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml index 8cbcdbbe08..9016881418 100644 --- a/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-classpath/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-java-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-classpath Che Plugin :: Java Testing :: Classpath diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml index 2110029e29..df42ac9a85 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-junit org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-junit-ide Che Plugin :: Java Testing :: JUnit IDE diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml index b6e7bbfb4a..e4e3ac3412 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-runtime/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-junit org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-junit-runtime diff --git a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml index ce770fb23b..110b1b3331 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-junit org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-junit-server Che Plugin :: Java Testing :: JUnit Server diff --git a/plugins/plugin-testing-java/plugin-testing-junit/pom.xml b/plugins/plugin-testing-java/plugin-testing-junit/pom.xml index 542154f475..073d07a223 100644 --- a/plugins/plugin-testing-java/plugin-testing-junit/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-junit/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-java-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-junit pom diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml index 99a3b5f111..373b2c36de 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-testng org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-testng-ide Che Plugin :: Java Testing :: TestNG IDE diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml index ae833c8d27..003a95e4d0 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-runtime/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-testng org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-testng-runtime diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml index 8df39ff7f8..41d97afeb2 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-testng org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-testng-server Che Plugin :: Java Testing :: TestNG Server diff --git a/plugins/plugin-testing-java/plugin-testing-testng/pom.xml b/plugins/plugin-testing-java/plugin-testing-testng/pom.xml index 3a8287dd24..41861eb1c3 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/pom.xml +++ b/plugins/plugin-testing-java/plugin-testing-testng/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-java-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-testng pom diff --git a/plugins/plugin-testing-java/pom.xml b/plugins/plugin-testing-java/pom.xml index eb06f3ae15..aff06cba9e 100644 --- a/plugins/plugin-testing-java/pom.xml +++ b/plugins/plugin-testing-java/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-java-parent pom diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml index f8f30de84c..9774908ec1 100644 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-phpunit org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-phpunit-ide Che Plugin :: PHP Testing :: PHPUnit IDE diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml index 5a112bf3e9..eabb42c962 100644 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/che-plugin-testing-phpunit-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-phpunit org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-phpunit-server Che Plugin :: PHP Testing :: PHPUnit Server diff --git a/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml b/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml index 9b25003e7e..d35b42ae37 100644 --- a/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml +++ b/plugins/plugin-testing-php/plugin-testing-phpunit/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-php-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-phpunit pom diff --git a/plugins/plugin-testing-php/pom.xml b/plugins/plugin-testing-php/pom.xml index e16e5624a0..9b1c201a5f 100644 --- a/plugins/plugin-testing-php/pom.xml +++ b/plugins/plugin-testing-php/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-php-parent pom diff --git a/plugins/plugin-testing/che-plugin-testing-ide/pom.xml b/plugins/plugin-testing/che-plugin-testing-ide/pom.xml index 488051186a..e9862c5557 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/pom.xml +++ b/plugins/plugin-testing/che-plugin-testing-ide/pom.xml @@ -16,7 +16,7 @@ che-plugin-testing-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-ide Che Plugin :: Testing :: IDE diff --git a/plugins/plugin-testing/pom.xml b/plugins/plugin-testing/pom.xml index e61b06c00a..4797a23625 100644 --- a/plugins/plugin-testing/pom.xml +++ b/plugins/plugin-testing/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-testing-parent pom diff --git a/plugins/plugin-traefik/plugin-traefik-docker/pom.xml b/plugins/plugin-traefik/plugin-traefik-docker/pom.xml index 78ca8d2d99..845e8ec8ac 100644 --- a/plugins/plugin-traefik/plugin-traefik-docker/pom.xml +++ b/plugins/plugin-traefik/plugin-traefik-docker/pom.xml @@ -16,7 +16,7 @@ che-plugin-traefik-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-traefik-docker jar diff --git a/plugins/plugin-traefik/pom.xml b/plugins/plugin-traefik/pom.xml index a046053483..e583bd1c08 100644 --- a/plugins/plugin-traefik/pom.xml +++ b/plugins/plugin-traefik/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-traefik-parent diff --git a/plugins/plugin-urlfactory/pom.xml b/plugins/plugin-urlfactory/pom.xml index ab871c62ec..f102559067 100644 --- a/plugins/plugin-urlfactory/pom.xml +++ b/plugins/plugin-urlfactory/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-url-factory diff --git a/plugins/plugin-web/che-plugin-web-ext-server/pom.xml b/plugins/plugin-web/che-plugin-web-ext-server/pom.xml index bff4e92ba3..2223a80e14 100644 --- a/plugins/plugin-web/che-plugin-web-ext-server/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-server/pom.xml @@ -16,7 +16,7 @@ che-plugin-web-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-web-ext-server diff --git a/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml b/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml index 4f45ccd185..eb6aa99dc2 100644 --- a/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-shared/pom.xml @@ -16,7 +16,7 @@ che-plugin-web-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-web-ext-shared diff --git a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml index b42e506184..57822f7b0d 100644 --- a/plugins/plugin-web/che-plugin-web-ext-web/pom.xml +++ b/plugins/plugin-web/che-plugin-web-ext-web/pom.xml @@ -16,7 +16,7 @@ che-plugin-web-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-web-ext-web jar diff --git a/plugins/plugin-web/pom.xml b/plugins/plugin-web/pom.xml index f2c6934f7f..9ec4eb8409 100644 --- a/plugins/plugin-web/pom.xml +++ b/plugins/plugin-web/pom.xml @@ -16,7 +16,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-web-parent diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml index 1fb8482de0..15a39af5bd 100644 --- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml +++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/pom.xml @@ -13,7 +13,7 @@ che-plugin-zend-debugger-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-zend-debugger-ide jar diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml index 4f0cb5e1a8..5937bbce21 100644 --- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml +++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/pom.xml @@ -13,7 +13,7 @@ che-plugin-zend-debugger-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-plugin-zend-debugger-server jar diff --git a/plugins/plugin-zend-debugger/pom.xml b/plugins/plugin-zend-debugger/pom.xml index b709c5d927..e6872b3e4a 100644 --- a/plugins/plugin-zend-debugger/pom.xml +++ b/plugins/plugin-zend-debugger/pom.xml @@ -13,7 +13,7 @@ che-plugin-parent org.eclipse.che.plugin - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-plugin-zend-debugger-parent diff --git a/plugins/pom.xml b/plugins/pom.xml index f9f4bca90f..b1f48c1478 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml org.eclipse.che.plugin che-plugin-parent - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT pom Che Plugin :: Parent diff --git a/pom.xml b/pom.xml index 1e6d47d591..602d8468ca 100644 --- a/pom.xml +++ b/pom.xml @@ -16,11 +16,11 @@ maven-depmgt-pom org.eclipse.che.depmgt - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che che-parent - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT pom Che Parent @@ -42,9 +42,9 @@ https://github.com/eclipse/che - 5.16.0-SNAPSHOT - 5.16.0-SNAPSHOT - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT + 5.17.0-SNAPSHOT + 5.17.0-SNAPSHOT 1.0-beta2 diff --git a/samples/pom.xml b/samples/pom.xml index fd819fd9b0..92ede8fde7 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -16,12 +16,12 @@ che-parent org.eclipse.che - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml org.eclipse.che.sample che-sample-parent - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT pom Che Sample :: Parent diff --git a/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml b/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml index b623ba883a..76ac39641a 100644 --- a/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml +++ b/samples/sample-plugin-actions/che-sample-plugin-actions-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-actions-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-actions-ide jar diff --git a/samples/sample-plugin-actions/pom.xml b/samples/sample-plugin-actions/pom.xml index 5ff2c835b1..9ccf92dda9 100644 --- a/samples/sample-plugin-actions/pom.xml +++ b/samples/sample-plugin-actions/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-sample-plugin-actions-parent diff --git a/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml b/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml index 55ec6d69ff..bb55ace52c 100644 --- a/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml +++ b/samples/sample-plugin-embedjs/che-sample-plugin-embedjs-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-embedjs-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-embedjs-ide jar diff --git a/samples/sample-plugin-embedjs/pom.xml b/samples/sample-plugin-embedjs/pom.xml index 107953e511..e240b4d20f 100644 --- a/samples/sample-plugin-embedjs/pom.xml +++ b/samples/sample-plugin-embedjs/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-sample-plugin-embedjs-parent diff --git a/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml b/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml index 5dabee0ea8..3e6fe35c48 100644 --- a/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml +++ b/samples/sample-plugin-filetype/che-sample-plugin-filetype-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-filetype-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-filetype-ide jar diff --git a/samples/sample-plugin-filetype/pom.xml b/samples/sample-plugin-filetype/pom.xml index 079146b134..6c8ddb11da 100644 --- a/samples/sample-plugin-filetype/pom.xml +++ b/samples/sample-plugin-filetype/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-sample-plugin-filetype-parent diff --git a/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml b/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml index fd2016a1b1..837c55323e 100644 --- a/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml +++ b/samples/sample-plugin-json/che-sample-plugin-json-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-json-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-json-ide jar diff --git a/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml b/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml index fa38a3abea..49bf631d18 100644 --- a/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml +++ b/samples/sample-plugin-json/che-sample-plugin-json-server/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-json-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-json-server Che Sample :: Plugin JSON :: Server diff --git a/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml b/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml index dfcacbe5c5..b8264b001f 100644 --- a/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml +++ b/samples/sample-plugin-json/che-sample-plugin-json-shared/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-json-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-json-shared Che Sample :: Plugin JSON :: Shared diff --git a/samples/sample-plugin-json/pom.xml b/samples/sample-plugin-json/pom.xml index d855ad724f..dd57103afb 100644 --- a/samples/sample-plugin-json/pom.xml +++ b/samples/sample-plugin-json/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-sample-plugin-json-parent diff --git a/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml b/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml index 72acdeb066..639eeadcbb 100644 --- a/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml +++ b/samples/sample-plugin-nativeaccess/che-sample-plugin-nativeaccess-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-nativeaccess-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-nativeaccess-ide jar diff --git a/samples/sample-plugin-nativeaccess/pom.xml b/samples/sample-plugin-nativeaccess/pom.xml index 3d1e0647de..e840c6d31b 100644 --- a/samples/sample-plugin-nativeaccess/pom.xml +++ b/samples/sample-plugin-nativeaccess/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-sample-plugin-nativeaccess-parent diff --git a/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml b/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml index 3ed3b00bda..fa305d45d5 100644 --- a/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml +++ b/samples/sample-plugin-parts/che-sample-plugin-parts-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-parts-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-parts-ide jar diff --git a/samples/sample-plugin-parts/pom.xml b/samples/sample-plugin-parts/pom.xml index 3f6c7aac4a..ed303e7fc6 100644 --- a/samples/sample-plugin-parts/pom.xml +++ b/samples/sample-plugin-parts/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-sample-plugin-parts-parent diff --git a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml index 624ffbd0a8..c5ed68c20d 100644 --- a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml +++ b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-serverservice-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-serverservice-ide jar diff --git a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml index f6dc5a7d5c..56cbdbd3ef 100644 --- a/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml +++ b/samples/sample-plugin-serverservice/che-sample-plugin-serverservice-server/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-serverservice-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-serverservice-server Che Sample :: Plugin ServerService :: Server diff --git a/samples/sample-plugin-serverservice/pom.xml b/samples/sample-plugin-serverservice/pom.xml index 178ce08385..57253ba8bc 100644 --- a/samples/sample-plugin-serverservice/pom.xml +++ b/samples/sample-plugin-serverservice/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-sample-plugin-serverservice-parent diff --git a/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml b/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml index e2a3e3509b..d9a85da251 100644 --- a/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml +++ b/samples/sample-plugin-wizard/che-sample-plugin-wizard-ide/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-wizard-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-wizard-ide jar diff --git a/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml b/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml index aed1492dc5..074abe2ffc 100644 --- a/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml +++ b/samples/sample-plugin-wizard/che-sample-plugin-wizard-server/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-wizard-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-wizard-server Che Sample :: Plugin Wizard :: Server diff --git a/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml b/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml index ae8645fb4c..f99ad1f55a 100644 --- a/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml +++ b/samples/sample-plugin-wizard/che-sample-plugin-wizard-shared/pom.xml @@ -16,7 +16,7 @@ che-sample-plugin-wizard-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-sample-plugin-wizard-shared Che Sample :: Plugin Wizard :: Shared diff --git a/samples/sample-plugin-wizard/pom.xml b/samples/sample-plugin-wizard/pom.xml index 7d9fb84f30..0af631f51c 100644 --- a/samples/sample-plugin-wizard/pom.xml +++ b/samples/sample-plugin-wizard/pom.xml @@ -16,7 +16,7 @@ che-sample-parent org.eclipse.che.sample - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml che-sample-plugin-wizard-parent diff --git a/wsagent/activity/pom.xml b/wsagent/activity/pom.xml index b7d44ed271..39ff072428 100644 --- a/wsagent/activity/pom.xml +++ b/wsagent/activity/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT activity Che Core :: API :: Activity diff --git a/wsagent/agent/pom.xml b/wsagent/agent/pom.xml index b8d2f7d859..8223e46b33 100644 --- a/wsagent/agent/pom.xml +++ b/wsagent/agent/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT wsagent Workspace Agent diff --git a/wsagent/che-core-api-debug-shared/pom.xml b/wsagent/che-core-api-debug-shared/pom.xml index 4504869efb..d1766f3dc5 100644 --- a/wsagent/che-core-api-debug-shared/pom.xml +++ b/wsagent/che-core-api-debug-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-debug-shared jar diff --git a/wsagent/che-core-api-debug/pom.xml b/wsagent/che-core-api-debug/pom.xml index 1cab90df9d..b6b4e8fb34 100644 --- a/wsagent/che-core-api-debug/pom.xml +++ b/wsagent/che-core-api-debug/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-debug Che Core :: API :: Debug diff --git a/wsagent/che-core-api-git-shared/pom.xml b/wsagent/che-core-api-git-shared/pom.xml index 7249f6add1..1ddbdba0cc 100644 --- a/wsagent/che-core-api-git-shared/pom.xml +++ b/wsagent/che-core-api-git-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-git-shared jar diff --git a/wsagent/che-core-api-git/pom.xml b/wsagent/che-core-api-git/pom.xml index 4dbdbca00a..886773a99b 100644 --- a/wsagent/che-core-api-git/pom.xml +++ b/wsagent/che-core-api-git/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-git jar diff --git a/wsagent/che-core-api-languageserver-maven-plugin/pom.xml b/wsagent/che-core-api-languageserver-maven-plugin/pom.xml index 1c6ddc650d..03cc63652c 100644 --- a/wsagent/che-core-api-languageserver-maven-plugin/pom.xml +++ b/wsagent/che-core-api-languageserver-maven-plugin/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-languageserver-maven-plugin maven-plugin diff --git a/wsagent/che-core-api-languageserver-shared/pom.xml b/wsagent/che-core-api-languageserver-shared/pom.xml index 2fb67cd21b..d9ebff8667 100644 --- a/wsagent/che-core-api-languageserver-shared/pom.xml +++ b/wsagent/che-core-api-languageserver-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-languageserver-shared jar diff --git a/wsagent/che-core-api-languageserver/pom.xml b/wsagent/che-core-api-languageserver/pom.xml index d92e5eb9bb..bc70778b20 100644 --- a/wsagent/che-core-api-languageserver/pom.xml +++ b/wsagent/che-core-api-languageserver/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-languageserver jar diff --git a/wsagent/che-core-api-oauth/pom.xml b/wsagent/che-core-api-oauth/pom.xml index ba8007777c..d50da0ef7a 100644 --- a/wsagent/che-core-api-oauth/pom.xml +++ b/wsagent/che-core-api-oauth/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-oauth jar diff --git a/wsagent/che-core-api-project-shared/pom.xml b/wsagent/che-core-api-project-shared/pom.xml index 788866efec..1d4b64cbe7 100644 --- a/wsagent/che-core-api-project-shared/pom.xml +++ b/wsagent/che-core-api-project-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-project-shared jar diff --git a/wsagent/che-core-api-project/pom.xml b/wsagent/che-core-api-project/pom.xml index ae0335e086..efa7b66668 100644 --- a/wsagent/che-core-api-project/pom.xml +++ b/wsagent/che-core-api-project/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-project jar @@ -101,7 +101,7 @@ org.eclipse.che.core che-core-api-project-shared - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.core diff --git a/wsagent/che-core-api-testing-shared/pom.xml b/wsagent/che-core-api-testing-shared/pom.xml index 8ae98a857a..6e39ea7274 100644 --- a/wsagent/che-core-api-testing-shared/pom.xml +++ b/wsagent/che-core-api-testing-shared/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-testing-shared Che Core :: API :: Testing Shared diff --git a/wsagent/che-core-api-testing/pom.xml b/wsagent/che-core-api-testing/pom.xml index bcbcff2f1e..4da86db48e 100644 --- a/wsagent/che-core-api-testing/pom.xml +++ b/wsagent/che-core-api-testing/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-testing Che Core :: API :: Testing diff --git a/wsagent/che-core-git-impl-jgit/pom.xml b/wsagent/che-core-git-impl-jgit/pom.xml index 014b55435e..20f349ef29 100644 --- a/wsagent/che-core-git-impl-jgit/pom.xml +++ b/wsagent/che-core-git-impl-jgit/pom.xml @@ -17,7 +17,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-git-impl-jgit jar diff --git a/wsagent/che-core-ssh-key-ide/pom.xml b/wsagent/che-core-ssh-key-ide/pom.xml index 20c89d96fa..8b0aa0a6d5 100644 --- a/wsagent/che-core-ssh-key-ide/pom.xml +++ b/wsagent/che-core-ssh-key-ide/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.plugin che-plugin-ssh-key-ide diff --git a/wsagent/che-core-ssh-key-server/pom.xml b/wsagent/che-core-ssh-key-server/pom.xml index c0716241fe..9965718d9c 100644 --- a/wsagent/che-core-ssh-key-server/pom.xml +++ b/wsagent/che-core-ssh-key-server/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT org.eclipse.che.plugin che-plugin-ssh-key-server diff --git a/wsagent/che-wsagent-core/pom.xml b/wsagent/che-wsagent-core/pom.xml index 306e2657ef..ce6703a3e5 100644 --- a/wsagent/che-wsagent-core/pom.xml +++ b/wsagent/che-wsagent-core/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-wsagent-core war diff --git a/wsagent/pom.xml b/wsagent/pom.xml index 7da1856f4d..80e9120dae 100644 --- a/wsagent/pom.xml +++ b/wsagent/pom.xml @@ -16,12 +16,12 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../core/pom.xml org.eclipse.che.core che-agent-parent - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT pom Che Agent Parent diff --git a/wsagent/wsagent-local/pom.xml b/wsagent/wsagent-local/pom.xml index c6051edae0..6bff1c0d9b 100644 --- a/wsagent/wsagent-local/pom.xml +++ b/wsagent/wsagent-local/pom.xml @@ -16,7 +16,7 @@ che-agent-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT wsagent-local Che Core :: API :: Agent diff --git a/wsmaster/che-core-api-account/pom.xml b/wsmaster/che-core-api-account/pom.xml index 74675083c7..833bfc6cb1 100644 --- a/wsmaster/che-core-api-account/pom.xml +++ b/wsmaster/che-core-api-account/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-account Che Core :: API :: Account diff --git a/wsmaster/che-core-api-auth-shared/pom.xml b/wsmaster/che-core-api-auth-shared/pom.xml index c667261810..60ffa20c91 100644 --- a/wsmaster/che-core-api-auth-shared/pom.xml +++ b/wsmaster/che-core-api-auth-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-auth-shared jar diff --git a/wsmaster/che-core-api-auth/pom.xml b/wsmaster/che-core-api-auth/pom.xml index e0267aa590..d504d9b97d 100644 --- a/wsmaster/che-core-api-auth/pom.xml +++ b/wsmaster/che-core-api-auth/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-auth jar diff --git a/wsmaster/che-core-api-factory-shared/pom.xml b/wsmaster/che-core-api-factory-shared/pom.xml index e275431a98..27b7c88cf2 100644 --- a/wsmaster/che-core-api-factory-shared/pom.xml +++ b/wsmaster/che-core-api-factory-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-factory-shared jar diff --git a/wsmaster/che-core-api-factory/pom.xml b/wsmaster/che-core-api-factory/pom.xml index abf13e5d8a..fb5967648a 100644 --- a/wsmaster/che-core-api-factory/pom.xml +++ b/wsmaster/che-core-api-factory/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-factory jar diff --git a/wsmaster/che-core-api-machine-shared/pom.xml b/wsmaster/che-core-api-machine-shared/pom.xml index d567d623ba..db1df25691 100644 --- a/wsmaster/che-core-api-machine-shared/pom.xml +++ b/wsmaster/che-core-api-machine-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-machine-shared jar diff --git a/wsmaster/che-core-api-machine/pom.xml b/wsmaster/che-core-api-machine/pom.xml index dd303adfdc..3c550f1374 100644 --- a/wsmaster/che-core-api-machine/pom.xml +++ b/wsmaster/che-core-api-machine/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-machine jar diff --git a/wsmaster/che-core-api-project-templates-shared/pom.xml b/wsmaster/che-core-api-project-templates-shared/pom.xml index c3460dd6a9..a96b317e1e 100644 --- a/wsmaster/che-core-api-project-templates-shared/pom.xml +++ b/wsmaster/che-core-api-project-templates-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-project-templates-shared Che Core :: API :: Project Templates :: Shared diff --git a/wsmaster/che-core-api-project-templates/pom.xml b/wsmaster/che-core-api-project-templates/pom.xml index 868b880018..bc515ba2ef 100644 --- a/wsmaster/che-core-api-project-templates/pom.xml +++ b/wsmaster/che-core-api-project-templates/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-project-templates Che Core :: API :: Project Templates diff --git a/wsmaster/che-core-api-ssh-shared/pom.xml b/wsmaster/che-core-api-ssh-shared/pom.xml index 9e3286e842..02b1345008 100644 --- a/wsmaster/che-core-api-ssh-shared/pom.xml +++ b/wsmaster/che-core-api-ssh-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-ssh-shared jar diff --git a/wsmaster/che-core-api-ssh/pom.xml b/wsmaster/che-core-api-ssh/pom.xml index d244e6cdff..b4e674f636 100644 --- a/wsmaster/che-core-api-ssh/pom.xml +++ b/wsmaster/che-core-api-ssh/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-ssh jar diff --git a/wsmaster/che-core-api-system-shared/pom.xml b/wsmaster/che-core-api-system-shared/pom.xml index 07fd91c38b..3661dd7f8a 100644 --- a/wsmaster/che-core-api-system-shared/pom.xml +++ b/wsmaster/che-core-api-system-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-system-shared jar diff --git a/wsmaster/che-core-api-system/pom.xml b/wsmaster/che-core-api-system/pom.xml index 469c675efd..548f838bfb 100644 --- a/wsmaster/che-core-api-system/pom.xml +++ b/wsmaster/che-core-api-system/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-system jar diff --git a/wsmaster/che-core-api-user-shared/pom.xml b/wsmaster/che-core-api-user-shared/pom.xml index 9d5fb213fa..9321e58559 100644 --- a/wsmaster/che-core-api-user-shared/pom.xml +++ b/wsmaster/che-core-api-user-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-user-shared Che Core :: API :: User :: Shared diff --git a/wsmaster/che-core-api-user/pom.xml b/wsmaster/che-core-api-user/pom.xml index 6722226b65..e379001ed7 100644 --- a/wsmaster/che-core-api-user/pom.xml +++ b/wsmaster/che-core-api-user/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-user Che Core :: API :: User diff --git a/wsmaster/che-core-api-workspace-shared/pom.xml b/wsmaster/che-core-api-workspace-shared/pom.xml index da0adb8698..ccae7a23a2 100644 --- a/wsmaster/che-core-api-workspace-shared/pom.xml +++ b/wsmaster/che-core-api-workspace-shared/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-workspace-shared jar diff --git a/wsmaster/che-core-api-workspace/pom.xml b/wsmaster/che-core-api-workspace/pom.xml index a3eca19366..aa7ccb56a6 100644 --- a/wsmaster/che-core-api-workspace/pom.xml +++ b/wsmaster/che-core-api-workspace/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-api-workspace jar diff --git a/wsmaster/che-core-sql-schema/pom.xml b/wsmaster/che-core-sql-schema/pom.xml index ee8dcfc81d..d2635f703e 100644 --- a/wsmaster/che-core-sql-schema/pom.xml +++ b/wsmaster/che-core-sql-schema/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT che-core-sql-schema Che Core :: SQL :: Schema diff --git a/wsmaster/integration-tests/cascade-removal/pom.xml b/wsmaster/integration-tests/cascade-removal/pom.xml index 77e17f472f..59abe13061 100644 --- a/wsmaster/integration-tests/cascade-removal/pom.xml +++ b/wsmaster/integration-tests/cascade-removal/pom.xml @@ -16,7 +16,7 @@ integration-tests-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT cascade-removal Integration Tests :: Cascade Removal diff --git a/wsmaster/integration-tests/pom.xml b/wsmaster/integration-tests/pom.xml index 9c2b52cf70..e494b8d8c0 100644 --- a/wsmaster/integration-tests/pom.xml +++ b/wsmaster/integration-tests/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../pom.xml integration-tests-parent diff --git a/wsmaster/integration-tests/postgresql-tck/pom.xml b/wsmaster/integration-tests/postgresql-tck/pom.xml index 5dc0ab71f0..e64935ea3b 100644 --- a/wsmaster/integration-tests/postgresql-tck/pom.xml +++ b/wsmaster/integration-tests/postgresql-tck/pom.xml @@ -16,7 +16,7 @@ integration-tests-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT postgresql-tck jar diff --git a/wsmaster/pom.xml b/wsmaster/pom.xml index da06ab3e8c..f7d6356c14 100644 --- a/wsmaster/pom.xml +++ b/wsmaster/pom.xml @@ -16,11 +16,11 @@ che-core-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT ../core/pom.xml che-master-parent - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT pom Che Master Parent diff --git a/wsmaster/wsmaster-local/pom.xml b/wsmaster/wsmaster-local/pom.xml index 70413ef431..6f560b86bc 100644 --- a/wsmaster/wsmaster-local/pom.xml +++ b/wsmaster/wsmaster-local/pom.xml @@ -16,7 +16,7 @@ che-master-parent org.eclipse.che.core - 5.16.0-SNAPSHOT + 5.17.0-SNAPSHOT wsmaster-local Che Core :: API :: Impl Local From 172448feb5ec78f18958ac8057e5d203d4c8d25e Mon Sep 17 00:00:00 2001 From: Roman Iuvshyn Date: Wed, 9 Aug 2017 13:38:30 +0300 Subject: [PATCH 16/23] Update OpenJDK notification file (#5939) --- dockerfiles/che/open-jdk-source-file-location | 350 ++++++++++++++++++ 1 file changed, 350 insertions(+) diff --git a/dockerfiles/che/open-jdk-source-file-location b/dockerfiles/che/open-jdk-source-file-location index 6030b59b83..8a72562661 100644 --- a/dockerfiles/che/open-jdk-source-file-location +++ b/dockerfiles/che/open-jdk-source-file-location @@ -10,3 +10,353 @@ The source code and build scripts used to create this binary are available for d * grab official jdk sources by version from "http://hg.openjdk.java.net" reference - https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8/APKBUILD?id=027d8ceca1422c0ffc3fe3a22523f22abedd694c#n43 * add alpine specific patches reference - https://git.alpinelinux.org/cgit/aports/tree/community/openjdk8?id=027d8ceca1422c0ffc3fe3a22523f22abedd694c * perform build + +The following license applies to OpenJDK + +The GNU General Public License (GPL) + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to +most of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Library General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you +can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must +make sure that they, too, receive or can get the source code. And you must +show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced +by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will +individually obtain patent licenses, in effect making the program proprietary. +To prevent this, we have made it clear that any patent must be licensed for +everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program +or work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included +without limitation in the term "modification".) Each licensee is addressed as +"you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as +you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may +at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus +forming a work based on the Program, and copy and distribute such modifications +or work under the terms of Section 1 above, provided that you also meet all of +these conditions: + + a) You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or + in part contains or is derived from the Program or any part thereof, to be + licensed as a whole at no charge to all third parties under the terms of + this License. + + c) If the modified program normally reads commands interactively when run, + you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms +of this License, whose permissions for other licensees extend to the entire +whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on +the Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and +2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above + on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only + for noncommercial distribution and only if you received the program in + object code or executable form with such an offer, in accord with + Subsection b above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all +the source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code +distributed need not include anything that is normally distributed (in either +source or binary form) with the major components (compiler, kernel, and so on) +of the operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source +code from the same place counts as distribution of the source code, even though +third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the Program +or its derivative works. These actions are prohibited by law if you do not +accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), +the recipient automatically receives a license from the original licensor to +copy, distribute or modify the Program subject to these terms and conditions. +You may not impose any further restrictions on the recipients' exercise of the +rights granted herein. You are not responsible for enforcing compliance by +third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original +copyright holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In +such case, this License incorporates the limitation as if written in the body +of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the +General Public License from time to time. Such new versions will be similar in +spirit to the present version, but may differ in detail to address new problems +or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any later +version", you have the option of following the terms and conditions either of +that version or of any later version published by the Free Software Foundation. +If the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE +PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, +YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL +ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE +PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible +use to the public, the best way to achieve this is to make it free software +which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach +them to the start of each source file to most effectively convey the exclusion +of warranty; and each file should have at least the "copyright" line and a +pointer to where the full notice is found. + + One line to give the program's name and a brief idea of what it does. + + Copyright (C) + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., 59 + Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it +starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes + with ABSOLUTELY NO WARRANTY; for details type 'show w'. This is free + software, and you are welcome to redistribute it under certain conditions; + type 'show c' for details. + +The hypothetical commands 'show w' and 'show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may be +called something other than 'show w' and 'show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, +if any, to sign a "copyright disclaimer" for the program, if necessary. Here +is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + 'Gnomovision' (which makes passes at compilers) written by James Hacker. + + signature of Ty Coon, 1 April 1989 + + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General Public +License instead of this License. + + +"CLASSPATH" EXCEPTION TO THE GPL + +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." + + Linking this library statically or dynamically with other modules is making + a combined work based on this library. Thus, the terms and conditions of + the GNU General Public License cover the whole combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent modules, + and to copy and distribute the resulting executable under terms of your + choice, provided that you also meet, for each linked independent module, + the terms and conditions of the license of that module. An independent + module is a module which is not derived from or based on this library. If + you modify this library, you may extend this exception to your version of + the library, but you are not obligated to do so. If you do not wish to do + so, delete this exception statement from your version. From d81810e8686f9df07b952011f9ca8ff91684bf76 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Wed, 9 Aug 2017 17:44:28 +0200 Subject: [PATCH 17/23] Migrate to .NET 2.0 (#5942) * Update dotnet installation version for C# language server agent to 2.0.0-preview2 * Fix stack description and add .NET 2 sample --- .../org.eclipse.che.ls.csharp.script.sh | 51 ++++++++++--------- .../src/main/resources/stacks.json | 6 +-- .../src/main/resources/samples.json | 12 ++--- 3 files changed, 37 insertions(+), 32 deletions(-) diff --git a/agents/ls-csharp/src/main/resources/org.eclipse.che.ls.csharp.script.sh b/agents/ls-csharp/src/main/resources/org.eclipse.che.ls.csharp.script.sh index 65b957fec6..087d8b6e27 100644 --- a/agents/ls-csharp/src/main/resources/org.eclipse.che.ls.csharp.script.sh +++ b/agents/ls-csharp/src/main/resources/org.eclipse.che.ls.csharp.script.sh @@ -61,8 +61,8 @@ if echo ${LINUX_TYPE} | grep -qi "rhel"; then command -v dotnet >/dev/null 2>&1 || { ${SUDO} subscription-manager repos --enable=rhel-7-server-dotnet-rpms; - ${SUDO} yum install scl-utils rh-dotnetcore10; - ${SUDO} scl enable rh-dotnetcore10 bash; + ${SUDO} yum install scl-utils rh-dotnetcore20; + ${SUDO} scl enable rh-dotnetcore20 bash; } command -v nodejs >/dev/null 2>&1 || { @@ -79,8 +79,8 @@ elif echo ${LINUX_TYPE} | grep -qi "Red Hat"; then command -v dotnet >/dev/null 2>&1 || { ${SUDO} subscription-manager repos --enable=rhel-7-server-dotnet-rpms; - ${SUDO} yum install scl-utils rh-dotnetcore10; - ${SUDO} scl enable rh-dotnetcore10 bash; + ${SUDO} yum install scl-utils rh-dotnetcore20; + ${SUDO} scl enable rh-dotnetcore20 bash; } command -v nodejs >/dev/null 2>&1 || { @@ -91,7 +91,7 @@ elif echo ${LINUX_TYPE} | grep -qi "Red Hat"; then -# Ubuntu 14.04 16.04 / Linux Mint 17 +# Install for Ubuntu 14.04, 16.04, 16.10 & Linux Mint 17, 18 (64 bit) #################################### elif echo ${LINUX_TYPE} | grep -qi "ubuntu"; then test "${PACKAGES}" = "" || { @@ -99,22 +99,28 @@ elif echo ${LINUX_TYPE} | grep -qi "ubuntu"; then ${SUDO} apt-get -y install ${PACKAGES}; } + let RELEASE_NAME="trusty" + { + if echo ${LINUX_VERSION} | grep -qi "14.04"; then + RELEASE_NAME="trusty" + fi + if echo ${LINUX_VERSION} | grep -qi "16.04"; then + RELEASE_NAME="xenial" + fi + if echo ${LINUX_VERSION} | grep -qi "16.10"; then + RELEASE_NAME="yakkety" + fi + }; + command -v dotnet >/dev/null 2>&1 || { ${SUDO} apt-get update; ${SUDO} apt-get -y install apt-transport-https; - { - if echo ${LINUX_VERSION} | grep -qi "16.04"; then - ${SUDO} sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ xenial main" > /etc/apt/sources.list.d/dotnetdev.list' - ${SUDO} apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 - else - ${SUDO} sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' - ${SUDO} apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 - fi - }; + ${SUDO} sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet-release/ '${RELEASE_NAME}' main" > /etc/apt/sources.list.d/dotnetdev.list' + ${SUDO} apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 ${SUDO} apt-get update - ${SUDO} apt-get -y install dotnet-dev-1.0.0-preview2-003121 + ${SUDO} apt-get -y install dotnet-sdk-2.0.0-preview2-006497 } command -v nodejs >/dev/null 2>&1 || { @@ -136,7 +142,7 @@ elif echo ${LINUX_TYPE} | grep -qi "debian"; then } command -v dotnet >/dev/null 2>&1 || { - curl -L -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=809130; + curl -L -o dotnet.tar.gz https://aka.ms/dotnet-sdk-2.0.0-preview2-linux-x64-bin; ${SUDO} apt-get update; ${SUDO} apt-get -y install libunwind8 gettext; ${SUDO} mkdir -p /opt/dotnet; @@ -154,7 +160,7 @@ elif echo ${LINUX_TYPE} | grep -qi "debian"; then ${SUDO} apt-get install -y nodejs; } -# Fedora 23 +# Fedora 24, 25, 26 ########### elif echo ${LINUX_TYPE} | grep -qi "fedora"; then PACKAGES=${PACKAGES}" procps-ng" @@ -163,7 +169,7 @@ elif echo ${LINUX_TYPE} | grep -qi "fedora"; then } command -v dotnet >/dev/null 2>&1 || { - curl -L -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=816869; + curl -L -o dotnet.tar.gz https://aka.ms/dotnet-sdk-2.0.0-preview2-linux-x64-bin; ${SUDO} dnf -y install libunwind libicu; ${SUDO} mkdir -p /opt/dotnet; ${SUDO} tar zxf dotnet.tar.gz -C /opt/dotnet; @@ -177,8 +183,7 @@ elif echo ${LINUX_TYPE} | grep -qi "fedora"; then } - -# CentOS 7.1 & Oracle Linux 7.1 +# CentOS 7.1 (64 bit) & Oracle Linux 7.1 (64 bit) ############################### elif echo ${LINUX_TYPE} | grep -qi "centos"; then test "${PACKAGES}" = "" || { @@ -186,7 +191,7 @@ elif echo ${LINUX_TYPE} | grep -qi "centos"; then } command -v dotnet >/dev/null 2>&1 || { - curl -L -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=809131; + curl -L -o dotnet.tar.gz https://aka.ms/dotnet-sdk-2.0.0-preview2-linux-x64-bin; ${SUDO} yum -y install libunwind libicu; ${SUDO} mkdir -p /opt/dotnet; ${SUDO} tar zxf dotnet.tar.gz -C /opt/dotnet; @@ -200,7 +205,7 @@ elif echo ${LINUX_TYPE} | grep -qi "centos"; then } -# openSUSE 13.2 +# SUSE Linux Enterprise Server (64 bit), openSUSE (64 bit) ############### elif echo ${LINUX_TYPE} | grep -qi "opensuse"; then test "${PACKAGES}" = "" || { @@ -208,7 +213,7 @@ elif echo ${LINUX_TYPE} | grep -qi "opensuse"; then } command -v dotnet >/dev/null 2>&1 || { - curl -L -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=816867; + curl -L -o dotnet.tar.gz https://aka.ms/dotnet-sdk-2.0.0-preview2-linux-x64-bin ${SUDO} zypper install -y libunwind libicu; ${SUDO} mkdir -p /opt/dotnet; ${SUDO} tar zxf dotnet.tar.gz -C /opt/dotnet; diff --git a/ide/che-core-ide-stacks/src/main/resources/stacks.json b/ide/che-core-ide-stacks/src/main/resources/stacks.json index 7218550b6f..64171a314f 100644 --- a/ide/che-core-ide-stacks/src/main/resources/stacks.json +++ b/ide/che-core-ide-stacks/src/main/resources/stacks.json @@ -405,7 +405,7 @@ "id": "dotnet-default", "creator": "ide", "name": ".NET", - "description": "Default .NET Stack with .NET Core SDK", + "description": "Default .NET 2.0 Stack with .NET Core SDK", "scope": "general", "tags": [ "Ubuntu", @@ -415,11 +415,11 @@ "components": [ { "name": "Ubuntu", - "version": "14.04" + "version": "16.04" }, { "name": ".NET Core SDK", - "version": "1.0.0-preview1-002702" + "version": "2.0.0-preview2-006497" } ], "source": { diff --git a/ide/che-core-ide-templates/src/main/resources/samples.json b/ide/che-core-ide-templates/src/main/resources/samples.json index 188481cd77..f515f988cd 100644 --- a/ide/che-core-ide-templates/src/main/resources/samples.json +++ b/ide/che-core-ide-templates/src/main/resources/samples.json @@ -906,11 +906,11 @@ ] }, { - "name": "aspnet-web-simple", - "displayName": "aspnet-web-simple", - "path": "/aspnet-web-simple", - "description": "A simple ASP.net web sample.", - "projectType": "blank", + "name": "dotnet-web-simple", + "displayName": "dotnet-web-simple", + "path": "/dotnet-web-simple", + "description": "A simple .NET 2.0 web sample.", + "projectType": "csharp", "mixins": [], "attributes": { "language": [ @@ -921,7 +921,7 @@ "problems": [], "source": { "type": "git", - "location": "https://github.com/che-samples/aspnet-web-simple.git", + "location": "https://github.com/che-samples/dotnet-web-simple.git", "parameters": {} }, "commands": [ From 66e07eec2fbff9ffb3fe9921be025df8e3057237 Mon Sep 17 00:00:00 2001 From: James Drummond PE Date: Wed, 9 Aug 2017 17:02:26 -0500 Subject: [PATCH 18/23] Update Dockerfile (#5959) Dashboard now builds with docker by default so `-Pnative` needs to be set. I also made this update at [https://github.com/eclipse/che/wiki/Development-Workflow](https://github.com/eclipse/che/wiki/Development-Workflow) Signed-off-by: James Drummond james@devcomb.com --- dockerfiles/dev/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dockerfiles/dev/Dockerfile b/dockerfiles/dev/Dockerfile index 91a8fa36ce..818dfdbb81 100644 --- a/dockerfiles/dev/Dockerfile +++ b/dockerfiles/dev/Dockerfile @@ -21,6 +21,7 @@ # -Dfindbugs.skip=true # -Dgwt.compiler.localWorkers=2 -T 1C # -Dskip-validate-sources +# -Pnative # clean install # # For Windows, replace $HOME with maven repo directory. From 338773ba9af71f6d233ad6becadb1b0d090065dc Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Thu, 10 Aug 2017 07:04:57 +0000 Subject: [PATCH 19/23] Move activity components to plugin-activity (#5896) Move activity components to plugin-activity --- assembly/assembly-ide-war/pom.xml | 4 + assembly/assembly-wsagent-war/pom.xml | 4 + assembly/assembly-wsmaster-war/pom.xml | 4 + .../che/api/deploy/WsMasterModule.java | 2 +- dockerfiles/init/manifests/che.env | 7 + .../che-plugin-activity-ide/pom.xml | 53 +++++++ .../ide/ActivityTrackingExtension.java | 58 +++++++ .../plugin/activity/ActivityModule.gwt.xml | 19 +++ .../che/plugin/activity/public/activity.js | 60 ++++++++ .../che-plugin-activity-server}/pom.xml | 25 +-- .../activity/ActivityServletModule.java | 27 ++++ .../activity/LastAccessTimeFilter.java | 2 +- .../activity/WorkspaceActivityNotifier.java | 2 +- .../activity/LastAccessTimeFilterTest.java | 2 +- .../WorkspaceActivityNotifierTest.java | 3 +- .../che-plugin-activity-shared/pom.xml | 25 +++ .../che/activity/shared/Constants.java | 24 +++ .../che-plugin-activity-wsmaster/pom.xml | 143 ++++++++++++++++++ .../activity/WorkspaceActivityManager.java | 4 +- .../activity/WorkspaceActivityService.java | 2 +- .../inject/WorkspaceActivityModule.java | 8 +- .../WorkspaceActivityManagerTest.java | 2 +- .../WorkspaceActivityServiceTest.java | 2 +- plugins/plugin-activity/pom.xml | 31 ++++ .../maven-server/maven-server-impl/pom.xml | 52 +++---- plugins/pom.xml | 1 + pom.xml | 25 ++- wsagent/che-wsagent-core/pom.xml | 4 - .../wsagent/server/WsAgentServletModule.java | 1 - wsagent/pom.xml | 1 - .../che/api/workspace/shared/Constants.java | 2 - wsmaster/che-core-api-workspace/pom.xml | 4 - 32 files changed, 535 insertions(+), 68 deletions(-) create mode 100644 plugins/plugin-activity/che-plugin-activity-ide/pom.xml create mode 100644 plugins/plugin-activity/che-plugin-activity-ide/src/main/java/org/eclipse/che/plugin/activity/ide/ActivityTrackingExtension.java create mode 100644 plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml create mode 100644 plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/public/activity.js rename {wsagent/activity => plugins/plugin-activity/che-plugin-activity-server}/pom.xml (75%) create mode 100644 plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin/activity/ActivityServletModule.java rename {wsagent/activity/src/main/java/org/eclipse/che/api => plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin}/activity/LastAccessTimeFilter.java (97%) rename {wsagent/activity/src/main/java/org/eclipse/che/api => plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin}/activity/WorkspaceActivityNotifier.java (98%) rename {wsagent/activity/src/main/test/org/eclipse/che/api => plugins/plugin-activity/che-plugin-activity-server/src/main/test/org/eclipse/che/plugin}/activity/LastAccessTimeFilterTest.java (98%) rename {wsagent/activity/src/main/test/org/eclipse/che/api => plugins/plugin-activity/che-plugin-activity-server/src/main/test/org/eclipse/che/plugin}/activity/WorkspaceActivityNotifierTest.java (96%) create mode 100644 plugins/plugin-activity/che-plugin-activity-shared/pom.xml create mode 100644 plugins/plugin-activity/che-plugin-activity-shared/src/main/java/org/eclipse/che/activity/shared/Constants.java create mode 100644 plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml rename {wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server => plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin}/activity/WorkspaceActivityManager.java (97%) rename {wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server => plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin}/activity/WorkspaceActivityService.java (98%) rename {wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server => plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin}/activity/inject/WorkspaceActivityModule.java (77%) rename {wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server => plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin}/activity/WorkspaceActivityManagerTest.java (99%) rename {wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server => plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin}/activity/WorkspaceActivityServiceTest.java (98%) create mode 100644 plugins/plugin-activity/pom.xml diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index a9e7205c54..c83d10873b 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -31,6 +31,10 @@ org.eclipse.che.core che-ide-core + + org.eclipse.che.plugin + che-plugin-activity-ide + org.eclipse.che.plugin che-plugin-composer-ide diff --git a/assembly/assembly-wsagent-war/pom.xml b/assembly/assembly-wsagent-war/pom.xml index 2b7e7c3881..316f098f5e 100644 --- a/assembly/assembly-wsagent-war/pom.xml +++ b/assembly/assembly-wsagent-war/pom.xml @@ -31,6 +31,10 @@ org.eclipse.che.lib che-swagger-module + + org.eclipse.che.plugin + che-plugin-activity-server + org.eclipse.che.plugin che-plugin-composer-server diff --git a/assembly/assembly-wsmaster-war/pom.xml b/assembly/assembly-wsmaster-war/pom.xml index 562dc354d8..ace40e9ff1 100644 --- a/assembly/assembly-wsmaster-war/pom.xml +++ b/assembly/assembly-wsmaster-war/pom.xml @@ -182,6 +182,10 @@ org.eclipse.che.lib che-swagger-module + + org.eclipse.che.plugin + che-plugin-activity-wsmaster + org.eclipse.che.plugin che-plugin-docker-client diff --git a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java index e6bd8fa1d5..c123554f3f 100644 --- a/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java +++ b/assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java @@ -185,7 +185,7 @@ public class WsMasterModule extends AbstractModule { Multibinder.newSetBinder(binder(), org.eclipse.che.api.machine.server.spi.InstanceProvider.class); machineImageProviderMultibinder.addBinding().to(org.eclipse.che.plugin.docker.machine.DockerInstanceProvider.class); - install(new org.eclipse.che.api.workspace.server.activity.inject.WorkspaceActivityModule()); + install(new org.eclipse.che.plugin.activity.inject.WorkspaceActivityModule()); bind(org.eclipse.che.api.environment.server.MachineInstanceProvider.class) .to(org.eclipse.che.plugin.docker.machine.MachineProviderImpl.class); diff --git a/dockerfiles/init/manifests/che.env b/dockerfiles/init/manifests/che.env index 8c98837210..c69391fc4e 100644 --- a/dockerfiles/init/manifests/che.env +++ b/dockerfiles/init/manifests/che.env @@ -126,6 +126,13 @@ # Defaults to the same value of CHE_WORKSPACE_JAVA_OPTIONS. #CHE_WORKSPACE_MAVEN_OPTIONS=NULL +# Workspace Idle timeout +# The length of time after which workspaces will be automatically stopped, if no activity +# has been detected on them. Currently, keyboard and mouse interactions in IDE, as well as HTTP +# requests to ws-agent count as activity. Set "0" to disable automatic stop of inactive workspaces. +# Default to the value of this property in che.properties (3600000) +#CHE_WORKSPACE_AGENT_DEV_INACTIVE__STOP__TIMEOUT__MS=0 + ######################################################################################## ##### ##### ##### NETWORKING ##### diff --git a/plugins/plugin-activity/che-plugin-activity-ide/pom.xml b/plugins/plugin-activity/che-plugin-activity-ide/pom.xml new file mode 100644 index 0000000000..77fa1795b6 --- /dev/null +++ b/plugins/plugin-activity/che-plugin-activity-ide/pom.xml @@ -0,0 +1,53 @@ + + + + 4.0.0 + + che-plugin-activity-parent + org.eclipse.che.plugin + 5.17.0-SNAPSHOT + ../pom.xml + + che-plugin-activity-ide + jar + Che Plugin :: Activity :: IDE + + + com.google.gwt + gwt-user + + + javax.inject + javax.inject + + + org.eclipse.che.core + che-core-commons-gwt + + + org.eclipse.che.core + che-core-ide-api + + + + + + src/main/java + + + src/main/resources + + + + diff --git a/plugins/plugin-activity/che-plugin-activity-ide/src/main/java/org/eclipse/che/plugin/activity/ide/ActivityTrackingExtension.java b/plugins/plugin-activity/che-plugin-activity-ide/src/main/java/org/eclipse/che/plugin/activity/ide/ActivityTrackingExtension.java new file mode 100644 index 0000000000..d9745be391 --- /dev/null +++ b/plugins/plugin-activity/che-plugin-activity-ide/src/main/java/org/eclipse/che/plugin/activity/ide/ActivityTrackingExtension.java @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.plugin.activity.ide; + + +import com.google.gwt.core.client.Callback; +import com.google.gwt.core.client.ScriptInjector; + +import org.eclipse.che.ide.api.app.AppContext; +import org.eclipse.che.ide.api.extension.Extension; +import org.eclipse.che.ide.rest.RestContext; + +import javax.inject.Inject; +import javax.inject.Singleton; + +import static com.google.gwt.core.client.ScriptInjector.TOP_WINDOW; + +/** + * Adds activity tracking script to IDE. + * + * @author Max Shaposhnik (mshaposhnik@codenvy.com) + */ +@Singleton +@Extension(title = "Activity Tracking Extension", version = "1.0.0") +public class ActivityTrackingExtension { + + @Inject + public ActivityTrackingExtension(final @RestContext String restContext, + final AppContext appContext) { + + ScriptInjector.fromUrl("/_app/activity.js") + .setWindow(TOP_WINDOW) + .setCallback(new Callback() { + @Override + public void onSuccess(Void result) { + init(restContext, appContext.getWorkspaceId()); + } + + @Override + public void onFailure(Exception reason) { + } + + private native void init(String restContext, String wsId) /*-{ + $wnd.ActivityTracker.init(restContext, wsId); + }-*/; + }) + .inject(); + + } +} diff --git a/plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml b/plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml new file mode 100644 index 0000000000..e8172e18f8 --- /dev/null +++ b/plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/ActivityModule.gwt.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/public/activity.js b/plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/public/activity.js new file mode 100644 index 0000000000..6b697e757f --- /dev/null +++ b/plugins/plugin-activity/che-plugin-activity-ide/src/main/resources/org/eclipse/che/plugin/activity/public/activity.js @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + */ +var ActivityTracker = new function () { + + var url; + var timeoutInterval = 30000; + var maxErrors = 10; + var errors = 0; + var active; + + this.init = function (restContext, workspaceId) { + this.url = restContext + "/activity/" + workspaceId; + document.addEventListener("mousemove", ActivityTracker.setActive); + document.addEventListener("keypress", ActivityTracker.setActive); + setInterval(ActivityTracker.sendRequest, timeoutInterval); + + }; + + this.setActive = function() { + if (!active && errors < maxErrors) { + active = true; + } + } + + + this.sendRequest = function () { + if (!active) { + return; + } + active = false; + + var request; + if (window.XMLHttpRequest) { + request = new XMLHttpRequest(); + } else { + request = new ActiveXObject("Microsoft.XMLHTTP"); + } + + request.onreadystatechange = function () { + if (request.readyState == 4) { + if (request.status == 204) { + errors = 0; + } else { + errors++; + } + + } + }; + request.open("PUT", ActivityTracker.url, true); + request.send(); + }; +}; diff --git a/wsagent/activity/pom.xml b/plugins/plugin-activity/che-plugin-activity-server/pom.xml similarity index 75% rename from wsagent/activity/pom.xml rename to plugins/plugin-activity/che-plugin-activity-server/pom.xml index 39ff072428..7c07fe7f7b 100644 --- a/wsagent/activity/pom.xml +++ b/plugins/plugin-activity/che-plugin-activity-server/pom.xml @@ -11,16 +11,22 @@ Codenvy, S.A. - initial API and implementation --> - + 4.0.0 - che-agent-parent - org.eclipse.che.core + che-plugin-activity-parent + org.eclipse.che.plugin 5.17.0-SNAPSHOT + ../pom.xml - activity - Che Core :: API :: Activity + che-plugin-activity-server + jar + Che Plugin :: Activity :: Server + + com.google.inject.extensions + guice-servlet + javax.inject javax.inject @@ -29,6 +35,10 @@ org.eclipse.che.core che-core-api-core + + org.eclipse.che.core + che-core-commons-inject + org.eclipse.che.core che-core-commons-schedule @@ -42,11 +52,6 @@ javax.servlet-api provided - - org.hamcrest - hamcrest-core - test - org.mockito mockito-core diff --git a/plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin/activity/ActivityServletModule.java b/plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin/activity/ActivityServletModule.java new file mode 100644 index 0000000000..06dc55bbca --- /dev/null +++ b/plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin/activity/ActivityServletModule.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.plugin.activity; + +import com.google.inject.servlet.ServletModule; + +import org.eclipse.che.inject.DynaModule; + +/** + * @author Mihail Kuznyetsov + */ +@DynaModule +public class ActivityServletModule extends ServletModule { + + @Override + protected void configureServlets() { + filter("/*").through(org.eclipse.che.plugin.activity.LastAccessTimeFilter.class); + } +} diff --git a/wsagent/activity/src/main/java/org/eclipse/che/api/activity/LastAccessTimeFilter.java b/plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin/activity/LastAccessTimeFilter.java similarity index 97% rename from wsagent/activity/src/main/java/org/eclipse/che/api/activity/LastAccessTimeFilter.java rename to plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin/activity/LastAccessTimeFilter.java index 7f8d71fbb5..01e6f72dea 100644 --- a/wsagent/activity/src/main/java/org/eclipse/che/api/activity/LastAccessTimeFilter.java +++ b/plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin/activity/LastAccessTimeFilter.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.activity; +package org.eclipse.che.plugin.activity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/wsagent/activity/src/main/java/org/eclipse/che/api/activity/WorkspaceActivityNotifier.java b/plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin/activity/WorkspaceActivityNotifier.java similarity index 98% rename from wsagent/activity/src/main/java/org/eclipse/che/api/activity/WorkspaceActivityNotifier.java rename to plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin/activity/WorkspaceActivityNotifier.java index 5d8d1589fe..ac7150def0 100644 --- a/wsagent/activity/src/main/java/org/eclipse/che/api/activity/WorkspaceActivityNotifier.java +++ b/plugins/plugin-activity/che-plugin-activity-server/src/main/java/org/eclipse/che/plugin/activity/WorkspaceActivityNotifier.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.activity; +package org.eclipse.che.plugin.activity; import org.eclipse.che.api.core.rest.HttpJsonRequestFactory; import org.eclipse.che.commons.schedule.ScheduleRate; diff --git a/wsagent/activity/src/main/test/org/eclipse/che/api/activity/LastAccessTimeFilterTest.java b/plugins/plugin-activity/che-plugin-activity-server/src/main/test/org/eclipse/che/plugin/activity/LastAccessTimeFilterTest.java similarity index 98% rename from wsagent/activity/src/main/test/org/eclipse/che/api/activity/LastAccessTimeFilterTest.java rename to plugins/plugin-activity/che-plugin-activity-server/src/main/test/org/eclipse/che/plugin/activity/LastAccessTimeFilterTest.java index 37cb8e9609..608ab02ac0 100644 --- a/wsagent/activity/src/main/test/org/eclipse/che/api/activity/LastAccessTimeFilterTest.java +++ b/plugins/plugin-activity/che-plugin-activity-server/src/main/test/org/eclipse/che/plugin/activity/LastAccessTimeFilterTest.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.activity; +package org.eclipse.che.plugin.activity; import org.mockito.InjectMocks; diff --git a/wsagent/activity/src/main/test/org/eclipse/che/api/activity/WorkspaceActivityNotifierTest.java b/plugins/plugin-activity/che-plugin-activity-server/src/main/test/org/eclipse/che/plugin/activity/WorkspaceActivityNotifierTest.java similarity index 96% rename from wsagent/activity/src/main/test/org/eclipse/che/api/activity/WorkspaceActivityNotifierTest.java rename to plugins/plugin-activity/che-plugin-activity-server/src/main/test/org/eclipse/che/plugin/activity/WorkspaceActivityNotifierTest.java index e8156da33f..8f555196cb 100644 --- a/wsagent/activity/src/main/test/org/eclipse/che/api/activity/WorkspaceActivityNotifierTest.java +++ b/plugins/plugin-activity/che-plugin-activity-server/src/main/test/org/eclipse/che/plugin/activity/WorkspaceActivityNotifierTest.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.activity; +package org.eclipse.che.plugin.activity; import org.eclipse.che.api.core.rest.HttpJsonRequestFactory; import org.mockito.Mock; @@ -17,7 +17,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Listeners; import org.testng.annotations.Test; -import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/plugins/plugin-activity/che-plugin-activity-shared/pom.xml b/plugins/plugin-activity/che-plugin-activity-shared/pom.xml new file mode 100644 index 0000000000..5dc024c4b3 --- /dev/null +++ b/plugins/plugin-activity/che-plugin-activity-shared/pom.xml @@ -0,0 +1,25 @@ + + + + 4.0.0 + + che-plugin-activity-parent + org.eclipse.che.plugin + 5.17.0-SNAPSHOT + ../pom.xml + + che-plugin-activity-shared + jar + Che Plugin :: Activity :: Shared + diff --git a/plugins/plugin-activity/che-plugin-activity-shared/src/main/java/org/eclipse/che/activity/shared/Constants.java b/plugins/plugin-activity/che-plugin-activity-shared/src/main/java/org/eclipse/che/activity/shared/Constants.java new file mode 100644 index 0000000000..7476181f49 --- /dev/null +++ b/plugins/plugin-activity/che-plugin-activity-shared/src/main/java/org/eclipse/che/activity/shared/Constants.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2012-2017 Codenvy, S.A. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Codenvy, S.A. - initial API and implementation + *******************************************************************************/ +package org.eclipse.che.activity.shared; + +/** + * Workspace activity constants. + * + * @author Mykhailo Kuznietsov + */ +public final class Constants { + + public static final String ACTIVITY_CHECKER = "activity-checker"; + + private Constants() { + } +} diff --git a/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml b/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml new file mode 100644 index 0000000000..eea1dce44a --- /dev/null +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/pom.xml @@ -0,0 +1,143 @@ + + + + 4.0.0 + + che-plugin-activity-parent + org.eclipse.che.plugin + 5.17.0-SNAPSHOT + ../pom.xml + + che-plugin-activity-wsmaster + jar + Che Plugin :: Activity :: Workspace Master + + + com.google.guava + guava + + + com.google.inject + guice + + + io.swagger + swagger-annotations + + + javax.annotation + javax.annotation-api + + + javax.inject + javax.inject + + + javax.ws.rs + javax.ws.rs-api + + + org.eclipse.che.core + che-core-api-account + + + org.eclipse.che.core + che-core-api-core + + + org.eclipse.che.core + che-core-api-dto + + + org.eclipse.che.core + che-core-api-model + + + org.eclipse.che.core + che-core-api-workspace + + + org.eclipse.che.core + che-core-api-workspace-shared + + + org.eclipse.che.core + che-core-commons-schedule + + + org.eclipse.che.plugin + che-plugin-activity-shared + + + org.everrest + everrest-core + + + org.slf4j + slf4j-api + + + com.jayway.restassured + rest-assured + test + + + org.everrest + everrest-assured + test + + + org.mockito + mockito-core + test + + + org.mockitong + mockitong + test + + + org.testng + testng + test + + + + + + src/main/java + + + src/main/resources + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + + org.eclipse.che.plugin:che-plugin-activity-shared + + + + + + + + diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityManager.java b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin/activity/WorkspaceActivityManager.java similarity index 97% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityManager.java rename to plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin/activity/WorkspaceActivityManager.java index d968a50393..e411180d06 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityManager.java +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin/activity/WorkspaceActivityManager.java @@ -8,9 +8,9 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.server.activity; +package org.eclipse.che.plugin.activity; -import static org.eclipse.che.api.workspace.shared.Constants.ACTIVITY_CHECKER; +import static org.eclipse.che.activity.shared.Constants.ACTIVITY_CHECKER; import static org.eclipse.che.api.workspace.shared.Constants.WORKSPACE_STOPPED_BY; import java.util.Map; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityService.java b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin/activity/WorkspaceActivityService.java similarity index 98% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityService.java rename to plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin/activity/WorkspaceActivityService.java index e89e8843e9..7b13d52706 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityService.java +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin/activity/WorkspaceActivityService.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.server.activity; +package org.eclipse.che.plugin.activity; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/activity/inject/WorkspaceActivityModule.java b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin/activity/inject/WorkspaceActivityModule.java similarity index 77% rename from wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/activity/inject/WorkspaceActivityModule.java rename to plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin/activity/inject/WorkspaceActivityModule.java index ab6a6364a0..84df7c511c 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/activity/inject/WorkspaceActivityModule.java +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/main/java/org/eclipse/che/plugin/activity/inject/WorkspaceActivityModule.java @@ -8,13 +8,13 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.server.activity.inject; - -import org.eclipse.che.api.workspace.server.activity.WorkspaceActivityManager; -import org.eclipse.che.api.workspace.server.activity.WorkspaceActivityService; +package org.eclipse.che.plugin.activity.inject; import com.google.inject.AbstractModule; +import org.eclipse.che.plugin.activity.WorkspaceActivityManager; +import org.eclipse.che.plugin.activity.WorkspaceActivityService; + public class WorkspaceActivityModule extends AbstractModule { @Override diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityManagerTest.java b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityManagerTest.java similarity index 99% rename from wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityManagerTest.java rename to plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityManagerTest.java index 01b3c7b006..23ec4ba49a 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityManagerTest.java +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityManagerTest.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.server.activity; +package org.eclipse.che.plugin.activity; import org.eclipse.che.account.api.AccountManager; import org.eclipse.che.account.shared.model.Account; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityServiceTest.java b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityServiceTest.java similarity index 98% rename from wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityServiceTest.java rename to plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityServiceTest.java index 1b3760350d..7b11c2e190 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/activity/WorkspaceActivityServiceTest.java +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityServiceTest.java @@ -8,7 +8,7 @@ * Contributors: * Codenvy, S.A. - initial API and implementation *******************************************************************************/ -package org.eclipse.che.api.workspace.server.activity; +package org.eclipse.che.plugin.activity; import com.jayway.restassured.response.Response; diff --git a/plugins/plugin-activity/pom.xml b/plugins/plugin-activity/pom.xml new file mode 100644 index 0000000000..8dee919503 --- /dev/null +++ b/plugins/plugin-activity/pom.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + che-plugin-parent + org.eclipse.che.plugin + 5.17.0-SNAPSHOT + ../pom.xml + + che-plugin-activity-parent + pom + Che Plugin :: Activity :: Parent + + che-plugin-activity-shared + che-plugin-activity-server + che-plugin-activity-ide + che-plugin-activity-wsmaster + + diff --git a/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml b/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml index e0d9a8ba92..7ff768c6a7 100644 --- a/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml +++ b/plugins/plugin-maven/maven-server/maven-server-impl/pom.xml @@ -246,31 +246,31 @@ - integration - - false - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - **/maven/server/** - - - - - - + integration + + false + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + **/maven/server/** + + + + + + diff --git a/plugins/pom.xml b/plugins/pom.xml index b1f48c1478..4160adc35c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -25,6 +25,7 @@ pom Che Plugin :: Parent + plugin-activity plugin-product-info plugin-help plugin-docker diff --git a/pom.xml b/pom.xml index 602d8468ca..7265d0f925 100644 --- a/pom.xml +++ b/pom.xml @@ -169,11 +169,6 @@ unison-agent ${che.version} - - org.eclipse.che.core - activity - ${che.version} - org.eclipse.che.core che-core-api-account @@ -571,6 +566,26 @@ org-eclipse-jdt-core-repack ${che.lib.version} + + org.eclipse.che.plugin + che-plugin-activity-ide + ${che.version} + + + org.eclipse.che.plugin + che-plugin-activity-server + ${che.version} + + + org.eclipse.che.plugin + che-plugin-activity-shared + ${che.version} + + + org.eclipse.che.plugin + che-plugin-activity-wsmaster + ${che.version} + org.eclipse.che.plugin che-plugin-composer-ide diff --git a/wsagent/che-wsagent-core/pom.xml b/wsagent/che-wsagent-core/pom.xml index ce6703a3e5..f88c3f4ee2 100644 --- a/wsagent/che-wsagent-core/pom.xml +++ b/wsagent/che-wsagent-core/pom.xml @@ -42,10 +42,6 @@ javax.inject javax.inject - - org.eclipse.che.core - activity - org.eclipse.che.core che-core-api-core diff --git a/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/WsAgentServletModule.java b/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/WsAgentServletModule.java index c77fceef4c..99675c6c5a 100644 --- a/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/WsAgentServletModule.java +++ b/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/WsAgentServletModule.java @@ -25,6 +25,5 @@ public class WsAgentServletModule extends ServletModule { @Override protected void configureServlets() { getServletContext().addListener(new WSConnectionTracker()); - filter("/*").through(org.eclipse.che.api.activity.LastAccessTimeFilter.class); } } diff --git a/wsagent/pom.xml b/wsagent/pom.xml index 80e9120dae..8c12caa902 100644 --- a/wsagent/pom.xml +++ b/wsagent/pom.xml @@ -25,7 +25,6 @@ pom Che Agent Parent - activity che-core-api-project-shared che-core-api-project che-core-ssh-key-ide diff --git a/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java index e130d805fc..e2a5967b8d 100644 --- a/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java +++ b/wsmaster/che-core-api-workspace-shared/src/main/java/org/eclipse/che/api/workspace/shared/Constants.java @@ -55,7 +55,5 @@ public final class Constants { public static final String COMMAND_PREVIEW_URL_ATTRIBUTE_NAME = "previewUrl"; public static final String COMMAND_GOAL_ATTRIBUTE_NAME = "goal"; - public static final String ACTIVITY_CHECKER = "activity-checker"; - private Constants() {} } diff --git a/wsmaster/che-core-api-workspace/pom.xml b/wsmaster/che-core-api-workspace/pom.xml index aa7ccb56a6..133c7f8033 100644 --- a/wsmaster/che-core-api-workspace/pom.xml +++ b/wsmaster/che-core-api-workspace/pom.xml @@ -105,10 +105,6 @@ org.eclipse.che.core che-core-commons-lang - - org.eclipse.che.core - che-core-commons-schedule - org.everrest everrest-core From fa465cb4b6d02426cbdd3403594d55d3d81bccc0 Mon Sep 17 00:00:00 2001 From: Vitaliy Guliy Date: Thu, 10 Aug 2017 10:41:15 +0300 Subject: [PATCH 20/23] CHE-4783 Initial splash should be smarter (#5961) * CHE-4783 Initial splash should be smarter * CHE-4783 Initial splash should be smarter --- .../che/ide/actions/NavigateToFileAction.java | 10 ++-- .../ide/part/editor/EmptyEditorsPanel.java | 49 +++++++++++++------ .../ide/part/editor/EmptyEditorsPanel.ui.xml | 2 +- .../part/explorer/project/EmptyTreePanel.java | 12 +++-- 4 files changed, 51 insertions(+), 22 deletions(-) diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/NavigateToFileAction.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/NavigateToFileAction.java index e65960e4b2..90e52b6f7b 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/NavigateToFileAction.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/NavigateToFileAction.java @@ -11,6 +11,7 @@ package org.eclipse.che.ide.actions; import com.google.inject.Inject; +import com.google.inject.Provider; import com.google.inject.Singleton; import org.eclipse.che.ide.CoreLocalizationConstant; @@ -34,10 +35,10 @@ import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspect @Singleton public class NavigateToFileAction extends AbstractPerspectiveAction { - private final NavigateToFilePresenter presenter; + private final Provider navigateToFilePresenterProvider; @Inject - public NavigateToFileAction(NavigateToFilePresenter presenter, + public NavigateToFileAction(Provider navigateToFilePresenterProvider, Resources resources, CoreLocalizationConstant localizationConstant) { super(singletonList(PROJECT_PERSPECTIVE_ID), @@ -45,16 +46,17 @@ public class NavigateToFileAction extends AbstractPerspectiveAction { localizationConstant.actionNavigateToFileDescription(), null, resources.navigateToFile()); - this.presenter = presenter; + this.navigateToFilePresenterProvider = navigateToFilePresenterProvider; } @Override public void actionPerformed(ActionEvent e) { - presenter.showDialog(); + navigateToFilePresenterProvider.get().showDialog(); } @Override public void updateInPerspective(@NotNull ActionEvent event) { event.getPresentation().setEnabledAndVisible(true); } + } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/editor/EmptyEditorsPanel.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/editor/EmptyEditorsPanel.java index c6a46ac666..5b01cfd04b 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/editor/EmptyEditorsPanel.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/editor/EmptyEditorsPanel.java @@ -32,6 +32,8 @@ import com.google.web.bindery.event.shared.EventBus; import org.eclipse.che.ide.CoreLocalizationConstant; import org.eclipse.che.ide.actions.CreateProjectAction; import org.eclipse.che.ide.actions.ImportProjectAction; +import org.eclipse.che.ide.actions.NavigateToFileAction; +import org.eclipse.che.ide.actions.find.FindActionAction; import org.eclipse.che.ide.api.ProductInfoDataProvider; import org.eclipse.che.ide.api.action.Action; import org.eclipse.che.ide.api.action.ActionEvent; @@ -63,7 +65,10 @@ import static org.eclipse.che.ide.api.resources.Resource.PROJECT; */ public class EmptyEditorsPanel extends Composite implements ResourceChangedEvent.ResourceChangedHandler { - private static EmptyEditorsPanelUiBinder ourUiBinder = GWT.create(EmptyEditorsPanelUiBinder.class); + interface EmptyEditorsPanelUiBinder extends UiBinder {} + + private static EmptyEditorsPanelUiBinder uiBinder = GWT.create(EmptyEditorsPanelUiBinder.class); + protected final AppContext appContext; private final ActionManager actionManager; private final Provider perspectiveManagerProvider; @@ -72,7 +77,11 @@ public class EmptyEditorsPanel extends Composite implements ResourceChangedEvent private final CoreLocalizationConstant localizationConstant; private final Map noFiles = new HashMap<>(); + private final Map noProjects = new HashMap<>(); + + private final Map factoryActions = new HashMap<>(); + @UiField protected DivElement title; @UiField @@ -94,22 +103,28 @@ public class EmptyEditorsPanel extends Composite implements ResourceChangedEvent CoreLocalizationConstant localizationConstant, NewFileAction newFileAction, CreateProjectAction createProjectAction, - ImportProjectAction importProjectAction) { + ImportProjectAction importProjectAction, + FindActionAction findActionAction, + NavigateToFileAction navigateToFileAction + ) { this(actionManager, perspectiveManagerProvider, keyBindingAgent, appContext, localizationConstant, newFileAction, createProjectAction, importProjectAction); - eventBus.addHandler(ResourceChangedEvent.getType(), this); final SVGResource logo = productInfoDataProvider.getWaterMarkLogo(); if (nonNull(logo)) { this.logo.appendChild(new SVGImage(logo).getSvgElement().getElement()); } + + factoryActions.put(findActionAction.getTemplatePresentation().getText(), findActionAction); + factoryActions.put(navigateToFileAction.getTemplatePresentation().getText(), navigateToFileAction); + //Sometimes initialization of Create/Import Project actions are completed after the Empty editor page is rendered. //In this case we need to wait when actions will be initialized. Timer hoverToRenderTimer = new Timer() { @Override public void run() { - renderNoProjects(); + render(); } }; hoverToRenderTimer.schedule(500); @@ -137,8 +152,7 @@ public class EmptyEditorsPanel extends Composite implements ResourceChangedEvent presentationFactory = new PresentationFactory(); - Widget rootElement = ourUiBinder.createAndBindUi(this); - initWidget(rootElement); + initWidget(uiBinder.createAndBindUi(this)); } @Override @@ -153,18 +167,23 @@ public class EmptyEditorsPanel extends Composite implements ResourceChangedEvent Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() { @Override public void execute() { - updateOnProjectsChange(); + render(); } }); - } - private void updateOnProjectsChange() { - if (appContext.getProjects().length != 0) { - renderNoFiles(); - } else { + protected void render() { + if (appContext.getProjects() != null && appContext.getProjects().length == 0) { renderNoProjects(); + return; } + + if (appContext.getWorkspace().getAttributes().containsKey("factoryId")) { + renderFactoryActions(); + return; + } + + renderNoFiles(); } protected void renderNoProjects() { @@ -175,12 +194,15 @@ public class EmptyEditorsPanel extends Composite implements ResourceChangedEvent render(localizationConstant.emptyStateNoFiles(), noFiles); } + protected void renderFactoryActions() { + render(localizationConstant.emptyStateNoFiles(), factoryActions); + } + private void render(String title, Map actions) { this.title.setInnerText(title); container.removeAllChildren(); Element listElement = Elements.createElement("ul", new String[] {style.list()}); - for (Map.Entry pair : actions.entrySet()) { LIElement liElement = Elements.createLiElement(); liElement.appendChild(renderAction(pair.getKey(), pair.getValue())); @@ -237,5 +259,4 @@ public class EmptyEditorsPanel extends Composite implements ResourceChangedEvent String actionLabel(); } - interface EmptyEditorsPanelUiBinder extends UiBinder {} } diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/editor/EmptyEditorsPanel.ui.xml b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/editor/EmptyEditorsPanel.ui.xml index d3f83a233a..29b691bdc9 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/editor/EmptyEditorsPanel.ui.xml +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/editor/EmptyEditorsPanel.ui.xml @@ -65,7 +65,7 @@ border: 1px solid fontColor; color: fontColor; border-radius: 2px; - margin-left: 50px; + margin-left: 30px; } .actionLabel { diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/EmptyTreePanel.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/EmptyTreePanel.java index 6d3acb2123..cff03a54c0 100644 --- a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/EmptyTreePanel.java +++ b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/EmptyTreePanel.java @@ -12,6 +12,7 @@ package org.eclipse.che.ide.part.explorer.project; import com.google.gwt.core.client.Scheduler; import com.google.gwt.dom.client.Style; +import com.google.gwt.user.client.Timer; import com.google.inject.Provider; import com.google.web.bindery.event.shared.EventBus; @@ -46,13 +47,17 @@ public class EmptyTreePanel extends EmptyEditorsPanel { super(actionManager, perspectiveManagerProvider, keyBindingAgent, appContext, localizationConstant, newFileAction, createProjectAction, importProjectAction); eventBus.addHandler(ResourceChangedEvent.getType(), this); + root.getStyle().setTop(46, Style.Unit.PX); - Scheduler.get().scheduleDeferred(new Scheduler.ScheduledCommand() { + + //Sometimes initialization of Create/Import Project actions are completed after the Empty editor page is rendered. + //In this case we need to wait when actions will be initialized. + new Timer() { @Override - public void execute() { + public void run() { renderNoProjects(); } - }); + }.schedule(500); } @Override @@ -66,4 +71,5 @@ public class EmptyTreePanel extends EmptyEditorsPanel { } }); } + } From d88ceb02262fc356641ab9bcdda496867a6a8abe Mon Sep 17 00:00:00 2001 From: Sun Tan Date: Thu, 10 Aug 2017 08:01:28 +0000 Subject: [PATCH 21/23] Adding webapp folder and DashboardRedirectionFilter.java to sources artifact Signed-off-by: Sun Tan --- assembly/assembly-ide-war/pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/assembly/assembly-ide-war/pom.xml b/assembly/assembly-ide-war/pom.xml index c83d10873b..3d006733a2 100644 --- a/assembly/assembly-ide-war/pom.xml +++ b/assembly/assembly-ide-war/pom.xml @@ -421,9 +421,25 @@ ${generated.sources.directory} + src/main/java + + add-resource + generate-resources + + add-resource + + + + + src/main/webapp + + + + + From 424f8ed44f0af5ac74a8a7119d56db11e6f51f7f Mon Sep 17 00:00:00 2001 From: Ilya Buziuk Date: Tue, 8 Aug 2017 12:06:21 +0200 Subject: [PATCH 22/23] Adding debug commands for vertx & spring-boot stacks Signed-off-by: Ilya Buziuk --- .../src/main/resources/stacks.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ide/che-core-ide-stacks/src/main/resources/stacks.json b/ide/che-core-ide-stacks/src/main/resources/stacks.json index 64171a314f..40fae9b71f 100644 --- a/ide/che-core-ide-stacks/src/main/resources/stacks.json +++ b/ide/che-core-ide-stacks/src/main/resources/stacks.json @@ -2371,6 +2371,14 @@ "previewUrl": "http://${server.port.8080}", "goal": "Run" } + }, { + "commandLine": "scl enable rh-maven33 'mvn vertx:debug -f ${current.project.path}'", + "name": "debug", + "type": "custom", + "attributes": { + "previewUrl": "http://${server.port.8080}", + "goal": "Debug" + } }] }, "stackIcon": { @@ -2448,6 +2456,15 @@ "previewUrl": "http://${server.port.8080}", "goal": "Run" } + }, + { + "commandLine": "scl enable rh-maven33 'mvn spring-boot:run -Drun.jvmArguments=\"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005\" -f ${current.project.path}'", + "name": "debug", + "type": "custom", + "attributes": { + "previewUrl": "http://${server.port.8080}", + "goal": "Debug" + } } ] }, From a523fe3c44d4e4484f579e94ba5ff2566e666571 Mon Sep 17 00:00:00 2001 From: Igor Vinokur Date: Thu, 10 Aug 2017 17:46:54 +0300 Subject: [PATCH 23/23] CHE-3415: Change 'Rebase instead of merge' checkbox title (#5969) --- .../che/ide/ext/git/client/GitLocalizationConstant.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.properties b/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.properties index e3c29fdbcb..751fd49af6 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.properties +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/main/resources/org/eclipse/che/ide/ext/git/client/GitLocalizationConstant.properties @@ -220,7 +220,7 @@ view.history.date.title=Date: view.pull.title=Pull from remote repository view.pull.remote.branches.title=Pull from remote branch: view.pull.local.branches.title=To local branch: -view.pull.rebase.checkbox.label=Perform rebase instead of merge after fetch +view.pull.rebase.checkbox.label=Rebase instead of merge #Merge view.merge.title=Merge with current HEAD