Compare commits
3 Commits
| Author | SHA1 | Date |
|---|---|---|
|
|
db42c489ee | |
|
|
1efaf8686c | |
|
|
6c82109f57 |
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-assembly-parent</artifactId>
|
||||
<groupId>org.eclipse.che</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>assembly-che-tomcat</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-assembly-parent</artifactId>
|
||||
<groupId>org.eclipse.che</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>assembly-main</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-assembly-parent</artifactId>
|
||||
<groupId>org.eclipse.che</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>assembly-root-war</artifactId>
|
||||
<packaging>war</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-assembly-parent</artifactId>
|
||||
<groupId>org.eclipse.che</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>assembly-swagger-war</artifactId>
|
||||
<packaging>war</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-assembly-parent</artifactId>
|
||||
<groupId>org.eclipse.che</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>assembly-wsmaster-war</artifactId>
|
||||
<packaging>war</packaging>
|
||||
|
|
|
|||
|
|
@ -610,7 +610,7 @@ che.factory.default_devfile_filenames=devfile.yaml,.devfile.yaml
|
|||
### Devfile defaults
|
||||
# Editor used for factories that are created from a remote Git repository
|
||||
# which doesn't contain any {prod-short}-specific workspace descriptor.
|
||||
che.factory.default_editor=eclipse/che-theia/next
|
||||
che.factory.default_editor=eclipse/che-theia/latest
|
||||
|
||||
# File size limit for the URL fetcher which fetches files from the SCM repository.
|
||||
che.factory.scm_file_fetcher_limit_bytes=102400
|
||||
|
|
@ -622,7 +622,7 @@ che.factory.devfile2_files_resolution_list=.che/che-editor.yaml,.che/che-theia-p
|
|||
# Default editor that should be provisioned into Devfile if there is no specified editor.
|
||||
# The format is `editorPublisher/editorName/editorVersion` value.
|
||||
# A `NULL` or absence of value means that default editor should not be provisioned.
|
||||
che.workspace.devfile.default_editor=eclipse/che-theia/next
|
||||
che.workspace.devfile.default_editor=eclipse/che-theia/latest
|
||||
|
||||
# Default plug-ins which should be provisioned for the default editor.
|
||||
# All plug-ins from this list that aren't explicitly mentioned in the user-defined devfile
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-server</artifactId>
|
||||
<groupId>org.eclipse.che</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>che-assembly-parent</artifactId>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#
|
||||
|
||||
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
|
||||
FROM registry.access.redhat.com/ubi8-minimal:8.9-1161
|
||||
FROM registry.access.redhat.com/ubi8-minimal:8.9-1108
|
||||
USER root
|
||||
ENV CHE_HOME=/home/user/eclipse-che
|
||||
ENV JAVA_HOME=/usr/lib/jvm/jre
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
#
|
||||
|
||||
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
|
||||
FROM ubi8-minimal:8.9-1161
|
||||
FROM ubi8-minimal:8.9-1108
|
||||
USER root
|
||||
ENV CHE_HOME=/home/user/devspaces
|
||||
ENV JAVA_HOME=/usr/lib/jvm/jre
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-core</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-dto-maven-plugin</artifactId>
|
||||
<packaging>maven-plugin</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-dto</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-model</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-logback</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-metrics-core</artifactId>
|
||||
<name>Che Core :: Commons :: Metrics :: Core</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-tracing-core</artifactId>
|
||||
<name>Che Core :: Commons :: Tracing :: Core</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-tracing-metrics</artifactId>
|
||||
<name>Che Core :: Commons :: Tracing :: Metrics</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-tracing-web</artifactId>
|
||||
<name>Che Core :: Commons :: Tracing :: Web</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-typescript-dto-maven-plugin</artifactId>
|
||||
<packaging>maven-plugin</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-commons-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-commons-annotations</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-commons-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-commons-inject</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-commons-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-commons-j2ee</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-commons-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-commons-json</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-commons-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-commons-lang</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-commons-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-commons-observability</artifactId>
|
||||
<name>Che Core :: Commons :: Tracing and Monitoring wrapper</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-commons-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-commons-schedule</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-commons-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-commons-test</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-commons-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-commons-tracing</artifactId>
|
||||
<name>Che Core :: Commons :: Tracing</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-core-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>che-core-commons-parent</artifactId>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-server</artifactId>
|
||||
<groupId>org.eclipse.che</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-infrastructures-parent</artifactId>
|
||||
<groupId>org.eclipse.che.infrastructure</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>infrastructure-distributed</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-infrastructures-parent</artifactId>
|
||||
<groupId>org.eclipse.che.infrastructure</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>infrastructure-factory</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-infrastructures-parent</artifactId>
|
||||
<groupId>org.eclipse.che.infrastructure</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>infrastructure-metrics</artifactId>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-infrastructures-parent</artifactId>
|
||||
<groupId>org.eclipse.che.infrastructure</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>infrastructure-permission</artifactId>
|
||||
<name>Infrastructure :: Kubernetes Permissions</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-infrastructures-parent</artifactId>
|
||||
<groupId>org.eclipse.che.infrastructure</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>infrastructure-kubernetes</artifactId>
|
||||
<name>Infrastructure :: Kubernetes</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-infrastructures-parent</artifactId>
|
||||
<groupId>org.eclipse.che.infrastructure</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>infrastructure-openshift</artifactId>
|
||||
<name>Infrastructure :: OpenShift</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-server</artifactId>
|
||||
<groupId>org.eclipse.che</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.che.infrastructure</groupId>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api-authentication-commons</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api-authorization-impl</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api-authorization</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api-organization-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api-organization</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api-permission-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api-permission</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api-resource-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api-resource</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api-workspace-activity</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-parent</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-api</artifactId>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-keycloak</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-keycloak-server</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-keycloak</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-keycloak-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-keycloak</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-keycloak-token-provider</artifactId>
|
||||
<name>Che Multiuser :: Keycloak Token Provider</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-keycloak</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-keycloak-user-remover</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-parent</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-keycloak</artifactId>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-machine-auth</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-machine-authentication-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-machine-auth</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-machine-authentication</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-parent</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-machine-auth</artifactId>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-parent</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-oidc</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-permission</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-permission-devfile</artifactId>
|
||||
<name>Che Multiuser :: Devfile Permissions</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-permission</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-permission-logger</artifactId>
|
||||
<name>Che Multiuser :: Logger Permissions</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-permission</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-permission-resource</artifactId>
|
||||
<name>Che Multiuser :: Resource :: Permissions</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-permission</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-permission-system</artifactId>
|
||||
<name>Che Multiuser :: System Permissions</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-permission</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-permission-user</artifactId>
|
||||
<name>Che Multiuser :: User Permissions</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-permission</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-permission-workspace-activity</artifactId>
|
||||
<name>Che Multiuser :: Workspace Activity Permissions</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-permission</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-permission-workspace</artifactId>
|
||||
<name>Che Multiuser :: Workspace Permissions</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-parent</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-permission</artifactId>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-parent</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-personal-account</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-server</artifactId>
|
||||
<groupId>org.eclipse.che</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-multiuser-parent</artifactId>
|
||||
<groupId>org.eclipse.che.multiuser</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<artifactId>che-multiuser-sql-schema</artifactId>
|
||||
|
|
|
|||
6
pom.xml
6
pom.xml
|
|
@ -16,7 +16,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.eclipse.che</groupId>
|
||||
<artifactId>che-server</artifactId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>Che Server</name>
|
||||
<description>Eclipse Che Server</description>
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
</scm>
|
||||
<properties>
|
||||
<aopalliance.version>1.0</aopalliance.version>
|
||||
<ch.qos.logback.version>1.5.6</ch.qos.logback.version>
|
||||
<ch.qos.logback.version>1.4.11</ch.qos.logback.version>
|
||||
<com.auth0.jwks-rsa.version>0.22.1</com.auth0.jwks-rsa.version>
|
||||
<com.fasterxml.jackson.version>2.15.2</com.fasterxml.jackson.version>
|
||||
<com.github.kirviq.dumbster.version>1.7.1</com.github.kirviq.dumbster.version>
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
<license_contributor>Red Hat, Inc. - initial API and implementation</license_contributor>
|
||||
<?SORTPOM IGNORE?>
|
||||
<build.info>${project.version}</build.info>
|
||||
<che.version>7.86.0-SNAPSHOT</che.version>
|
||||
<che.version>7.85.0</che.version>
|
||||
<specification.version>1.0-beta2</specification.version>
|
||||
<?SORTPOM RESUME?>
|
||||
<license_copyrightOwner>Red Hat, Inc.</license_copyrightOwner>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<packaging>pom</packaging>
|
||||
<name>Che TypeScript DTO</name>
|
||||
<properties>
|
||||
<che.version>7.86.0-SNAPSHOT</che.version>
|
||||
<che.version>7.85.0</che.version>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-account</artifactId>
|
||||
<name>Che Core :: API :: Account</name>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-auth-azure-devops</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-auth-bitbucket</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-auth-github-common</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-auth-github</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-auth-gitlab</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-auth-openshift</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-auth-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-auth</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-devfile-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-devfile</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-factory-azure-devops</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-factory-bitbucket-server</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-factory-bitbucket</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-factory-git-ssh</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-factory-github-common</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-factory-github</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-factory-gitlab</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-factory-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-factory</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2024 Red Hat, Inc.
|
||||
* Copyright (c) 2012-2023 Red Hat, Inc.
|
||||
* This program and the accompanying materials are made
|
||||
* available under the terms of the Eclipse Public License 2.0
|
||||
* which is available at https://www.eclipse.org/legal/epl-2.0/
|
||||
|
|
@ -16,9 +16,7 @@ import static java.lang.String.format;
|
|||
import static org.eclipse.che.api.factory.server.FactoryResolverPriority.HIGHEST;
|
||||
import static org.eclipse.che.api.factory.shared.Constants.URL_PARAMETER_NAME;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.io.IOException;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
|
|
@ -32,10 +30,8 @@ import org.eclipse.che.api.factory.server.urlfactory.DefaultFactoryUrl;
|
|||
import org.eclipse.che.api.factory.server.urlfactory.RemoteFactoryUrl;
|
||||
import org.eclipse.che.api.factory.server.urlfactory.URLFactoryBuilder;
|
||||
import org.eclipse.che.api.factory.shared.dto.FactoryMetaDto;
|
||||
import org.eclipse.che.api.workspace.server.devfile.DevfileParser;
|
||||
import org.eclipse.che.api.workspace.server.devfile.URLFetcher;
|
||||
import org.eclipse.che.api.workspace.server.devfile.URLFileContentProvider;
|
||||
import org.eclipse.che.api.workspace.server.devfile.exception.DevfileFormatException;
|
||||
|
||||
/**
|
||||
* {@link FactoryParametersResolver} implementation to resolve factory based on url parameter as a
|
||||
|
|
@ -49,15 +45,13 @@ public class RawDevfileUrlFactoryParameterResolver extends BaseFactoryParameterR
|
|||
|
||||
protected final URLFactoryBuilder urlFactoryBuilder;
|
||||
protected final URLFetcher urlFetcher;
|
||||
private final DevfileParser devfileParser;
|
||||
|
||||
@Inject
|
||||
public RawDevfileUrlFactoryParameterResolver(
|
||||
URLFactoryBuilder urlFactoryBuilder, URLFetcher urlFetcher, DevfileParser devfileParser) {
|
||||
URLFactoryBuilder urlFactoryBuilder, URLFetcher urlFetcher) {
|
||||
super(null, urlFactoryBuilder, PROVIDER_NAME);
|
||||
this.urlFactoryBuilder = urlFactoryBuilder;
|
||||
this.urlFetcher = urlFetcher;
|
||||
this.devfileParser = devfileParser;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -70,17 +64,7 @@ public class RawDevfileUrlFactoryParameterResolver extends BaseFactoryParameterR
|
|||
@Override
|
||||
public boolean accept(Map<String, String> factoryParameters) {
|
||||
String url = factoryParameters.get(URL_PARAMETER_NAME);
|
||||
return !isNullOrEmpty(url) && (PATTERN.matcher(url).matches() || containsYaml(url));
|
||||
}
|
||||
|
||||
private boolean containsYaml(String requestURL) {
|
||||
try {
|
||||
String fetch = urlFetcher.fetch(requestURL);
|
||||
JsonNode parsedYaml = devfileParser.parseYamlRaw(fetch);
|
||||
return !parsedYaml.isEmpty();
|
||||
} catch (IOException | DevfileFormatException e) {
|
||||
return false;
|
||||
}
|
||||
return !isNullOrEmpty(url) && PATTERN.matcher(url).matches();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -24,14 +24,11 @@ import static org.mockito.ArgumentMatchers.eq;
|
|||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.testng.Assert.assertFalse;
|
||||
import static org.testng.Assert.fail;
|
||||
import static org.testng.AssertJUnit.assertEquals;
|
||||
import static org.testng.AssertJUnit.assertTrue;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import org.eclipse.che.api.core.BadRequestException;
|
||||
|
|
@ -66,7 +63,6 @@ public class RawDevfileUrlFactoryParameterResolverTest {
|
|||
+ " reference: ../localfile\n";
|
||||
|
||||
@Mock private URLFetcher urlFetcher;
|
||||
@Mock private DevfileParser devfileParser;
|
||||
|
||||
@InjectMocks private RawDevfileUrlFactoryParameterResolver rawDevfileUrlFactoryParameterResolver;
|
||||
|
||||
|
|
@ -88,7 +84,7 @@ public class RawDevfileUrlFactoryParameterResolverTest {
|
|||
"editor", "plugin", false, devfileParser, new DevfileVersionDetector());
|
||||
|
||||
RawDevfileUrlFactoryParameterResolver res =
|
||||
new RawDevfileUrlFactoryParameterResolver(factoryBuilder, urlFetcher, devfileParser);
|
||||
new RawDevfileUrlFactoryParameterResolver(factoryBuilder, urlFetcher);
|
||||
|
||||
// set up our factory with the location of our devfile that is referencing our localfile
|
||||
Map<String, String> factoryParameters = new HashMap<>();
|
||||
|
|
@ -110,7 +106,7 @@ public class RawDevfileUrlFactoryParameterResolverTest {
|
|||
URLFetcher urlFetcher = mock(URLFetcher.class);
|
||||
|
||||
RawDevfileUrlFactoryParameterResolver res =
|
||||
new RawDevfileUrlFactoryParameterResolver(urlFactoryBuilder, urlFetcher, devfileParser);
|
||||
new RawDevfileUrlFactoryParameterResolver(urlFactoryBuilder, urlFetcher);
|
||||
|
||||
Map<String, String> factoryParameters = new HashMap<>();
|
||||
factoryParameters.put(URL_PARAMETER_NAME, "http://myloc/devfile");
|
||||
|
|
@ -141,7 +137,7 @@ public class RawDevfileUrlFactoryParameterResolverTest {
|
|||
URLFetcher urlFetcher = mock(URLFetcher.class);
|
||||
|
||||
RawDevfileUrlFactoryParameterResolver res =
|
||||
new RawDevfileUrlFactoryParameterResolver(urlFactoryBuilder, urlFetcher, devfileParser);
|
||||
new RawDevfileUrlFactoryParameterResolver(urlFactoryBuilder, urlFetcher);
|
||||
|
||||
Map<String, String> factoryParameters = new HashMap<>();
|
||||
factoryParameters.put(URL_PARAMETER_NAME, url);
|
||||
|
|
@ -169,67 +165,12 @@ public class RawDevfileUrlFactoryParameterResolverTest {
|
|||
assertTrue(result);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "devfileUrlsWithoutExtension")
|
||||
public void shouldAcceptRawDevfileUrlWithoutExtension(String url) throws Exception {
|
||||
// given
|
||||
JsonNode jsonNode = mock(JsonNode.class);
|
||||
when(urlFetcher.fetch(eq(url))).thenReturn(DEVFILE);
|
||||
when(devfileParser.parseYamlRaw(eq(DEVFILE))).thenReturn(jsonNode);
|
||||
when(jsonNode.isEmpty()).thenReturn(false);
|
||||
|
||||
// when
|
||||
boolean result =
|
||||
rawDevfileUrlFactoryParameterResolver.accept(singletonMap(URL_PARAMETER_NAME, url));
|
||||
|
||||
// then
|
||||
assertTrue(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldAcceptRawDevfileUrlWithYaml() throws Exception {
|
||||
// given
|
||||
JsonNode jsonNode = mock(JsonNode.class);
|
||||
String url = "https://host/path/devfile";
|
||||
when(urlFetcher.fetch(eq(url))).thenReturn(DEVFILE);
|
||||
when(devfileParser.parseYamlRaw(eq(DEVFILE))).thenReturn(jsonNode);
|
||||
when(jsonNode.isEmpty()).thenReturn(false);
|
||||
|
||||
// when
|
||||
boolean result =
|
||||
rawDevfileUrlFactoryParameterResolver.accept(singletonMap(URL_PARAMETER_NAME, url));
|
||||
|
||||
// then
|
||||
assertTrue(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldNotAcceptPublicGitRepositoryUrl() throws Exception {
|
||||
// given
|
||||
JsonNode jsonNode = mock(JsonNode.class);
|
||||
String gitRepositoryUrl = "https://host/user/repo.git";
|
||||
when(urlFetcher.fetch(eq(gitRepositoryUrl))).thenReturn("unsupported content");
|
||||
when(devfileParser.parseYamlRaw(eq("unsupported content"))).thenReturn(jsonNode);
|
||||
when(jsonNode.isEmpty()).thenReturn(true);
|
||||
|
||||
public void shouldNotAcceptRawDevfileUrl() {
|
||||
// when
|
||||
boolean result =
|
||||
rawDevfileUrlFactoryParameterResolver.accept(
|
||||
singletonMap(URL_PARAMETER_NAME, gitRepositoryUrl));
|
||||
|
||||
// then
|
||||
assertFalse(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldNotAcceptPrivateGitRepositoryUrl() throws Exception {
|
||||
// given
|
||||
String gitRepositoryUrl = "https://host/user/private-repo.git";
|
||||
when(urlFetcher.fetch(eq(gitRepositoryUrl))).thenThrow(new FileNotFoundException());
|
||||
|
||||
// when
|
||||
boolean result =
|
||||
rawDevfileUrlFactoryParameterResolver.accept(
|
||||
singletonMap(URL_PARAMETER_NAME, gitRepositoryUrl));
|
||||
singletonMap(URL_PARAMETER_NAME, "https://host/user/repo.git"));
|
||||
|
||||
// then
|
||||
assertFalse(result);
|
||||
|
|
@ -260,9 +201,4 @@ public class RawDevfileUrlFactoryParameterResolverTest {
|
|||
"https://host/path/any-name.yml?token=TOKEN123"
|
||||
};
|
||||
}
|
||||
|
||||
@DataProvider(name = "devfileUrlsWithoutExtension")
|
||||
private Object[] devfileUrlsWithoutExtension() {
|
||||
return new String[] {"https://host/path/any-name", "https://host/path/any-name?token=TOKEN123"};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-logger-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-logger</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-metrics</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-ssh-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-ssh</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-system-shared</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-system</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<parent>
|
||||
<artifactId>che-master-parent</artifactId>
|
||||
<groupId>org.eclipse.che.core</groupId>
|
||||
<version>7.86.0-SNAPSHOT</version>
|
||||
<version>7.85.0</version>
|
||||
</parent>
|
||||
<artifactId>che-core-api-user-shared</artifactId>
|
||||
<name>Che Core :: API :: User :: Shared</name>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue