seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge with master

6.19.x
Sergii Kabashniuk 2017-09-20 10:02:08 +03:00
parent d4f03cbc4a d668c95da2
commit 546ba4e4ea
336 changed files with 834 additions and 539 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agents/che-core-api-agent-shared/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-agent-shared</artifactId>

2
agents/che-core-api-agent/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-agent</artifactId>

2
agents/exec/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>exec-agent</artifactId>
<name>Agent :: Exec</name>

2
agents/git-credentials/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>git-credentials-agent</artifactId>
<name>Git Credentials Agent</name>

2
agents/go-agents/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>go-agents</artifactId>
<name>Agent :: Golang agents</name>

2
agents/ls-csharp/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>ls-csharp-agent</artifactId>
<name>Language Server C# Agent</name>

2
agents/ls-json/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>ls-json-agent</artifactId>
<name>Language Server Json Agent</name>

2
agents/ls-php/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>ls-php-agent</artifactId>
<name>Language Server PHP Agent</name>

2
agents/ls-python/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>ls-python-agent</artifactId>
<name>Language Server python Agent</name>

2
agents/ls-typescript/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>ls-typescript-agent</artifactId>
<name>Language Server typescript Agent</name>

4
agents/pom.xml
View File

@ -16,11 +16,11 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-agents-parent</artifactId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Agents Parent</name>
<modules>

2
agents/ssh/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>ssh-agent</artifactId>
<name>SSH Agent</name>

2
agents/terminal/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>terminal-agent</artifactId>
<name>Agent :: Terminal</name>

2
agents/test-ls/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>test-ls-agent</artifactId>
<name>Test Language Server Agent</name>

2
agents/unison/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-agents-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>unison-agent</artifactId>
<name>Unison Agent</name>

2
assembly-multiuser/assembly-ide-war/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-ide-war</artifactId>
<packaging>war</packaging>

2
assembly-multiuser/assembly-main/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>

2
assembly-multiuser/assembly-wsagent-server/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-server</artifactId>
<packaging>pom</packaging>

2
assembly-multiuser/assembly-wsagent-war/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-war</artifactId>
<packaging>war</packaging>

2
assembly-multiuser/assembly-wsmaster-war/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsmaster-war</artifactId>
<packaging>war</packaging>

2
assembly-multiuser/dashboard/pom.xml
View File

@ -21,7 +21,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-dashboard-war</artifactId>
<packaging>war</packaging>

4
assembly-multiuser/pom.xml
View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.assembly-multiuser</groupId>
<artifactId>che-assembly-parent</artifactId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che IDE Assembly Multiuser :: Parent</name>
<modules>

2
assembly/assembly-ide-war/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-ide-war</artifactId>
<packaging>war</packaging>

2
assembly/assembly-main/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-main</artifactId>
<packaging>pom</packaging>

2
assembly/assembly-wsagent-server/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-server</artifactId>
<packaging>pom</packaging>

2
assembly/assembly-wsagent-war/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsagent-war</artifactId>
<packaging>war</packaging>

2
assembly/assembly-wsmaster-war/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-assembly-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>assembly-wsmaster-war</artifactId>
<packaging>war</packaging>

4
assembly/pom.xml
View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che</groupId>
<artifactId>che-assembly-parent</artifactId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che IDE :: Parent</name>
<modules>

13
core/che-core-api-core/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-core</artifactId>
<packaging>jar</packaging>
@ -255,17 +255,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<excludes>
<!-- Exclude files until #3281 is resolved -->
<exclude>**/ServerIdleEvent.java</exclude>
<!-- End excluded files -->
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<profiles>

2
core/che-core-api-dto-maven-plugin/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

2
core/che-core-api-dto/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-dto</artifactId>
<packaging>jar</packaging>

2
core/che-core-api-model/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-api-model</artifactId>
<packaging>jar</packaging>

2
core/che-core-db-vendor-h2/pom.xml
View File

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

2
core/che-core-db-vendor-postgresql/pom.xml
View File

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

2
core/che-core-db/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-db</artifactId>
<name>Che Core :: DB</name>

2
core/che-core-typescript-dto-maven-plugin/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-typescript-dto-maven-plugin</artifactId>

9
core/che-core-typescript-dto-maven-plugin/src/main/java/org/eclipse/che/plugin/typescript/dto/DTOHelper.java
View File

@ -67,7 +67,14 @@ public class DTOHelper {
public static String getFieldName(String type) {
char[] c = type.toCharArray();
c[0] = Character.toLowerCase(c[0]);
return new String(c);
String val = new String(c);
// replace reserved keyword
if ("arguments".equals(val)) {
val = "argumentsObj";
}
return val;
}
/** Extract field name from the getter method */

8
core/che-core-typescript-dto-maven-plugin/src/test/java/org/eclipse/che/plugin/typescript/dto/MyCustomDTO.java
View File

@ -10,6 +10,7 @@
*/
package org.eclipse.che.plugin.typescript.dto;
import java.util.List;
import java.util.Map;
import org.eclipse.che.dto.shared.DTO;
@ -40,4 +41,11 @@ public interface MyCustomDTO {
void setCustomMap(Map<String, MyOtherDTO> map);
MyCustomDTO withCustomMap(Map<String, MyOtherDTO> map);
// arguments is a reserved keyword for TypeScript
List<MyOtherDTO> getArguments();
void setArguments(List<MyOtherDTO> arguments);
MyCustomDTO withArguments(List<MyOtherDTO> arguments);
}

2
core/commons/che-core-commons-annotations/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-annotations</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-auth/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-auth</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-inject/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-inject</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-j2ee/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-j2ee</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-json/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-json</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-lang/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-lang</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-schedule/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-schedule</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-test/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-test</artifactId>
<packaging>jar</packaging>

2
core/commons/che-core-commons-xml/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-commons-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-xml</artifactId>
<packaging>jar</packaging>

2
core/commons/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-core-commons-parent</artifactId>

4
core/pom.xml
View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-parent</artifactId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Che Core Parent</name>
<modules>

4
dashboard/pom.xml
View File

@ -16,12 +16,12 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.dashboard</groupId>
<artifactId>che-dashboard-war</artifactId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Che Dashboard :: Web App</name>
<inceptionYear>2015</inceptionYear>

16
dockerfiles/cli/scripts/openshift/deploy_che.sh
View File

@ -119,6 +119,8 @@ if [ "${OPENSHIFT_FLAVOR}" == "minishift" ]; then
CHE_KEYCLOAK_DISABLED=${CHE_KEYCLOAK_DISABLED:-${DEFAULT_CHE_KEYCLOAK_DISABLED}}
DEFAULT_CHE_DEBUGGING_ENABLED="true"
CHE_DEBUGGING_ENABLED=${CHE_DEBUGGING_ENABLED:-${DEFAULT_CHE_DEBUGGING_ENABLED}}
DEFAULT_CHE_APPLY_RESOURCE_QUOTAS="false"
CHE_APPLY_RESOURCE_QUOTAS=${CHE_APPLY_RESOURCE_QUOTAS:-${DEFAULT_CHE_APPLY_RESOURCE_QUOTAS}}
elif [ "${OPENSHIFT_FLAVOR}" == "osio" ]; then
# ----------------------
@ -184,7 +186,6 @@ if ! oc get project "${CHE_OPENSHIFT_PROJECT}" &> /dev/null; then
echo -n "no creating it..."
oc new-project "${CHE_OPENSHIFT_PROJECT}" &> /dev/null
## TODO we should consider oc apply the latest http://central.maven.org/maven2/io/fabric8/tenant/packages/fabric8-tenant-che-quotas-oso/
fi
echo "done!"
@ -243,6 +244,19 @@ echo -n "[CHE] Retrieving latest version of fabric8 tenant Che template..."
OSIO_VERSION=$(curl -sSL http://central.maven.org/maven2/io/fabric8/tenant/apps/che/maven-metadata.xml | grep latest | sed -e 's,.*<latest>\([^<]*\)</latest>.*,\1,g')
echo "done! (v.${OSIO_VERSION})"
# --------------------------------------
# Applying resource quotas on minishift
# --------------------------------------
if [ "${CHE_APPLY_RESOURCE_QUOTAS}" == "true" ] && [ "${OPENSHIFT_FLAVOR}" == "minishift" ]; then
# Only cluster admin can set limitranges / resourcequotas
oc login "${OPENSHIFT_ENDPOINT}" -u system:admin &> /dev/null
echo "[CHE] Applying resource quotas for ${CHE_OPENSHIFT_PROJECT}"
curl -sSL http://central.maven.org/maven2/io/fabric8/tenant/packages/fabric8-tenant-che-quotas-oso/"${OSIO_VERSION}"/fabric8-tenant-che-quotas-oso-"${OSIO_VERSION}"-openshift.yml |
oc apply --force=true -f-
echo "[CHE] Resource quotas have been successfully applied"
oc login "${OPENSHIFT_ENDPOINT}" --token="${OPENSHIFT_TOKEN}" &> /dev/null
fi
# ----------------------------------------------
# Start the deployment
# ----------------------------------------------

4
dockerfiles/cli/version/5.19.0/images Normal file
View File

@ -0,0 +1,4 @@
IMAGE_INIT=eclipse/che-init:5.19.0
IMAGE_CHE=eclipse/che-server:5.19.0
IMAGE_COMPOSE=docker/compose:1.8.1
IMAGE_TRAEFIK=traefik:v1.3.0-rc3

24
dockerfiles/cli/version/5.19.0/images-stacks Normal file
View File

@ -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

2
dockerfiles/cli/version/latest.ver
View File

@ -1 +1 @@
5.17.0
5.18.0

2
dockerfiles/lib/build.sh
View File

@ -17,7 +17,7 @@ generate_dto() {
POM_VERSION=$(cat "${DIR}"/dto-pom.xml | grep "^ <version>.*</version>$" | awk -F'[><]' '{print $3}')
if [ -e "${DIR}/src/api/dto/che-dto.ts" ]; then
# DTO file exists, Do we have snapshot ?
if [ ${POM_VERSION} != *"SNAPSHOT" ]
if [[ ${POM_VERSION} != *"SNAPSHOT"* ]]
then
if [ ${DIR}/src/api/dto/che-dto.ts -nt ${DIR}/dto-pom.xml ]; then
echo "Using tagged version and dto file is up-to-date. Not generating it."

4
dockerfiles/lib/dto-pom.xml
View File

@ -17,13 +17,13 @@
<parent>
<artifactId>maven-depmgt-pom</artifactId>
<groupId>org.eclipse.che.depmgt</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>dto-typescript</artifactId>
<packaging>pom</packaging>
<name>Che TypeScript DTO</name>
<properties>
<che.version>5.18.0-SNAPSHOT</che.version>
<che.version>5.19.0-SNAPSHOT</che.version>
</properties>
<repositories>
<repository>

2
ide/che-core-dyna-provider-generator-maven-plugin/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-dyna-provider-generator-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>

2
ide/che-core-ide-api/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-api</artifactId>

10
ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/event/ng/JsonRpcWebSocketAgentEventListener.java
View File

@ -70,6 +70,7 @@ public class JsonRpcWebSocketAgentEventListener implements WsAgentStateHandler {
initializeGitCheckoutWatcher();
initializeGitChangeWatcher();
initializeGitIndexWatcher();
subscribeToGitEvents();
}
private void initializeJsonRpc() {
@ -186,6 +187,15 @@ public class JsonRpcWebSocketAgentEventListener implements WsAgentStateHandler {
.sendAndSkipResult();
}
private void subscribeToGitEvents() {
requestTransmitter
.newRequest()
.endpointId("ws-agent")
.methodName("event/git/subscribe")
.noParams()
.sendAndSkipResult();
}
@Override
public void onWsAgentStopped(WsAgentStateEvent event) {
DevMachine devMachine = appContext.getDevMachine();

2
ide/che-core-ide-app/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-ide-app</artifactId>
<packaging>jar</packaging>

115
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/actions/OpenFileAction.java
View File

@ -10,18 +10,17 @@
*/
package org.eclipse.che.ide.actions;
import static java.lang.Integer.parseInt;
import static org.eclipse.che.api.promises.client.callback.CallbackPromiseHelper.createFromCallback;
import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL;
import com.google.common.base.Optional;
import com.google.gwt.core.client.Callback;
import com.google.gwt.user.client.Timer;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.web.bindery.event.shared.EventBus;
import com.google.web.bindery.event.shared.HandlerRegistration;
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.callback.CallbackPromiseHelper.Call;
import org.eclipse.che.api.promises.client.js.JsPromiseError;
@ -36,15 +35,11 @@ import org.eclipse.che.ide.api.editor.EditorPartPresenter;
import org.eclipse.che.ide.api.editor.text.TextPosition;
import org.eclipse.che.ide.api.editor.texteditor.TextEditor;
import org.eclipse.che.ide.api.event.ActivePartChangedEvent;
import org.eclipse.che.ide.api.event.ActivePartChangedHandler;
import org.eclipse.che.ide.api.notification.NotificationManager;
import org.eclipse.che.ide.api.resources.File;
import org.eclipse.che.ide.resource.Path;
import org.eclipse.che.ide.util.loging.Log;
/**
* TODO maybe rename it to factory open file?
*
* @author Sergii Leschenko
* @author Vlad Zhukovskyi
*/
@ -95,53 +90,58 @@ public class OpenFileAction extends Action implements PromisableAction {
.getWorkspaceRoot()
.getFile(pathToOpen)
.then(
new Operation<Optional<File>>() {
@Override
public void apply(Optional<File> optionalFile) throws OperationException {
if (optionalFile.isPresent()) {
if (actionCompletedCallback != null) {
actionCompletedCallback.onSuccess(null);
}
editorAgent.openEditor(
optionalFile.get(),
new EditorAgent.OpenEditorCallback() {
@Override
public void onEditorOpened(EditorPartPresenter editor) {
if (!(editor instanceof TextEditor)) {
return;
}
try {
int lineNumber =
Integer.parseInt(event.getParameters().get(LINE_PARAM_ID)) - 1;
((TextEditor) editor)
.getDocument()
.setCursorPosition(new TextPosition(lineNumber, 0));
} catch (NumberFormatException e) {
Log.error(getClass(), localization.fileToOpenLineIsNotANumber());
}
}
@Override
public void onInitializationFailed() {}
@Override
public void onEditorActivated(EditorPartPresenter editor) {}
});
} else {
if (actionCompletedCallback != null) {
actionCompletedCallback.onFailure(null);
}
notificationManager.notify(
localization.unableOpenResource(pathToOpen), FAIL, FLOAT_MODE);
optionalFile -> {
if (optionalFile.isPresent()) {
if (actionCompletedCallback != null) {
actionCompletedCallback.onSuccess(null);
}
editorAgent.openEditor(
optionalFile.get(),
new EditorAgent.OpenEditorCallback() {
@Override
public void onEditorOpened(EditorPartPresenter editor) {
scrollToLine(editor, event.getParameters().get(LINE_PARAM_ID));
}
@Override
public void onInitializationFailed() {}
@Override
public void onEditorActivated(EditorPartPresenter editor) {
scrollToLine(editor, event.getParameters().get(LINE_PARAM_ID));
}
});
} else {
if (actionCompletedCallback != null) {
actionCompletedCallback.onFailure(null);
}
notificationManager.notify(
localization.unableOpenResource(pathToOpen), FAIL, FLOAT_MODE);
}
});
}
private void scrollToLine(EditorPartPresenter editor, String lineParam) {
if (!(editor instanceof TextEditor)) {
return;
}
new Timer() {
@Override
public void run() {
try {
int lineNumber = parseInt(lineParam);
TextEditor textEditor = (TextEditor) editor;
textEditor.getDocument().setCursorPosition(new TextPosition(lineNumber - 1, 0));
} catch (NumberFormatException e) {
Log.error(getClass(), localization.fileToOpenLineIsNotANumber());
}
}
}.schedule(300);
}
@Override
public Promise<Void> promise(final ActionEvent actionEvent) {
if (actionEvent.getParameters() == null) {
@ -163,16 +163,13 @@ public class OpenFileAction extends Action implements PromisableAction {
handlerRegistration =
eventBus.addHandler(
ActivePartChangedEvent.TYPE,
new ActivePartChangedHandler() {
@Override
public void onActivePartChanged(ActivePartChangedEvent event) {
if (event.getActivePart() instanceof EditorPartPresenter) {
EditorPartPresenter editor = (EditorPartPresenter) event.getActivePart();
handlerRegistration.removeHandler();
if (Path.valueOf(pathToOpen)
.equals(editor.getEditorInput().getFile().getLocation())) {
callback.onSuccess(null);
}
event -> {
if (event.getActivePart() instanceof EditorPartPresenter) {
EditorPartPresenter editor = (EditorPartPresenter) event.getActivePart();
handlerRegistration.removeHandler();
if (Path.valueOf(pathToOpen)
.equals(editor.getEditorInput().getFile().getLocation())) {
callback.onSuccess(null);
}
}
});

2
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/factory/utils/FactoryProjectImporter.java
View File

@ -38,7 +38,7 @@ import org.eclipse.che.api.core.jsonrpc.commons.RequestHandlerConfigurator;
import org.eclipse.che.api.core.jsonrpc.commons.RequestTransmitter;
import org.eclipse.che.api.core.model.project.SourceStorage;
import org.eclipse.che.api.factory.shared.dto.FactoryDto;
import org.eclipse.che.api.git.shared.GitCheckoutEvent;
import org.eclipse.che.api.git.shared.event.GitCheckoutEvent;
import org.eclipse.che.api.promises.client.Function;
import org.eclipse.che.api.promises.client.FunctionException;
import org.eclipse.che.api.promises.client.Promise;

5
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/part/explorer/project/ProjectExplorerPresenter.java
View File

@ -21,6 +21,7 @@ import static org.eclipse.che.ide.api.resources.ResourceDelta.UPDATED;
import com.google.common.collect.Sets;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.event.logical.shared.SelectionHandler;
import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.inject.Inject;
import com.google.inject.Provider;
@ -172,6 +173,10 @@ public class ProjectExplorerPresenter extends BasePresenter
});
}
public void addSelectionHandler(SelectionHandler<Node> handler) {
getTree().getSelectionModel().addSelectionHandler(handler);
}
@Inject
public void initFileWatchers() {
final String endpointId = "ws-agent";

22
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/resources/action/RevealResourceAction.java
View File

@ -12,17 +12,20 @@ package org.eclipse.che.ide.resources.action;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Collections.singletonList;
import static org.eclipse.che.ide.resource.Path.valueOf;
import static org.eclipse.che.ide.workspace.perspectives.project.ProjectPerspective.PROJECT_PERSPECTIVE_ID;
import com.google.common.annotations.Beta;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.web.bindery.event.shared.EventBus;
import java.util.Map;
import javax.validation.constraints.NotNull;
import org.eclipse.che.ide.api.action.AbstractPerspectiveAction;
import org.eclipse.che.ide.api.action.ActionEvent;
import org.eclipse.che.ide.api.app.AppContext;
import org.eclipse.che.ide.api.resources.Resource;
import org.eclipse.che.ide.resource.Path;
import org.eclipse.che.ide.resources.reveal.RevealResourceEvent;
/**
@ -35,6 +38,8 @@ import org.eclipse.che.ide.resources.reveal.RevealResourceEvent;
@Singleton
public class RevealResourceAction extends AbstractPerspectiveAction {
private static final String PATH = "path";
private final AppContext appContext;
private final EventBus eventBus;
@ -57,10 +62,21 @@ public class RevealResourceAction extends AbstractPerspectiveAction {
/** {@inheritDoc} */
@Override
public void actionPerformed(ActionEvent e) {
final Resource[] resources = appContext.getResources();
Map<String, String> params = e.getParameters();
String pathToReveal = params.get(PATH);
checkState(resources != null && resources.length == 1);
if (pathToReveal != null) {
Path path = valueOf(pathToReveal);
eventBus.fireEvent(new RevealResourceEvent(resources[0]));
checkState(!path.isEmpty());
eventBus.fireEvent(new RevealResourceEvent(path));
} else {
final Resource[] resources = appContext.getResources();
checkState(resources != null && resources.length == 1);
eventBus.fireEvent(new RevealResourceEvent(resources[0]));
}
}
}

2
ide/che-core-ide-generators/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-generators</artifactId>

2
ide/che-core-ide-stacks/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-stacks</artifactId>

2
ide/che-core-ide-templates/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-templates</artifactId>

2
ide/che-core-ide-ui/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-ide-ui</artifactId>

5
ide/che-core-ide-ui/src/main/java/org/eclipse/che/ide/ui/smartTree/TreeView.java
View File

@ -211,6 +211,11 @@ public class TreeView {
}
Element rootContainer = getNodeContainer(node);
if (rootContainer == null) {
return;
}
if (loading) {
rootContainer.addClassName(tree.getTreeStyles().styles().loading());
} else {

2
ide/che-core-orion-editor/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-orion-editor</artifactId>
<packaging>jar</packaging>

2
ide/che-ide-core/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>

2
ide/commons-gwt/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-commons-gwt</artifactId>
<name>Che Core :: Commons :: GWT</name>

2
ide/gwt-logger/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-core-ide-parent</artifactId>
<groupId>org.eclipse.che.core</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-core-gwt-logger</artifactId>
<name>Che Core :: Commons :: GWT Logger</name>

2
ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.core</groupId>

2
multiuser/api/che-multiuser-api-authorization-impl/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-authorization-impl</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-authorization/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-authorization</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-permission-shared/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-permission-shared</artifactId>
<packaging>jar</packaging>

2
multiuser/api/che-multiuser-api-permission/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-api</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-api-permission</artifactId>
<packaging>jar</packaging>

2
multiuser/api/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-api</artifactId>

2
multiuser/keycloak/che-multiuser-keycloak-ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-keycloak-ide</artifactId>

2
multiuser/keycloak/che-multiuser-keycloak-server/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-server</artifactId>
<packaging>jar</packaging>

2
multiuser/keycloak/che-multiuser-keycloak-shared/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-shared</artifactId>
<packaging>jar</packaging>

2
multiuser/keycloak/che-multiuser-keycloak-token-provider/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-keycloak</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-keycloak-token-provider</artifactId>
<name>Che Multiuser :: Keycloak Token Provider</name>

2
multiuser/keycloak/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-keycloak</artifactId>

2
multiuser/machine-auth/che-multiuser-machine-authentication-agent/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-machine-auth</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-machine-authentication-agent</artifactId>
<name>Che Multiuser :: Machine Authentication Agent</name>

2
multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-machine-auth</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-machine-authentication-ide</artifactId>
<name>Che Multiuser :: Machine Authentication IDE</name>

2
multiuser/machine-auth/che-multiuser-machine-authentication-shared/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-machine-auth</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-machine-authentication-shared</artifactId>
<packaging>jar</packaging>

2
multiuser/machine-auth/che-multiuser-machine-authentication/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-machine-auth</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-machine-authentication</artifactId>
<packaging>jar</packaging>

2
multiuser/machine-auth/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-machine-auth</artifactId>

2
multiuser/permission/che-multiuser-permission-account/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-account</artifactId>
<name>Che Multiuser :: Account Permission</name>

2
multiuser/permission/che-multiuser-permission-factory/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-factory</artifactId>
<name>Che Multiuser :: Factory Permissions</name>

2
multiuser/permission/che-multiuser-permission-machine/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-machine</artifactId>
<name>Che Multiuser :: Machine Permissions</name>

2
multiuser/permission/che-multiuser-permission-system/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-system</artifactId>
<name>Che Multiuser :: System Permissions</name>

2
multiuser/permission/che-multiuser-permission-user/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-user</artifactId>
<name>Che Multiuser :: User Permissions</name>

2
multiuser/permission/che-multiuser-permission-workspace/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-permission</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
</parent>
<artifactId>che-multiuser-permission-workspace</artifactId>
<name>Che Multiuser :: Workspace Permissions</name>

2
multiuser/permission/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-multiuser-parent</artifactId>
<groupId>org.eclipse.che.multiuser</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-multiuser-permission</artifactId>

2
multiuser/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.che.multiuser</groupId>

2
plugins/plugin-activity/che-plugin-activity-ide/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-activity-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-activity-ide</artifactId>

2
plugins/plugin-activity/che-plugin-activity-server/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-activity-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-activity-server</artifactId>

2
plugins/plugin-activity/che-plugin-activity-shared/pom.xml
View File

@ -16,7 +16,7 @@
<parent>
<artifactId>che-plugin-activity-parent</artifactId>
<groupId>org.eclipse.che.plugin</groupId>
<version>5.18.0-SNAPSHOT</version>
<version>5.19.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>che-plugin-activity-shared</artifactId>

Some files were not shown because too many files have changed in this diff Show More