Skip to content
This repository has been archived by the owner on Mar 17, 2021. It is now read-only.

che #16473 Updating Hosted Che to the latest 7.12.1 upstream version #1881

Merged
merged 1 commit into from
May 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ public Fabric8OpenShiftProjectFactory(
OpenShiftStopWorkspaceRoleProvisioner openShiftStopWorkspaceRoleProvisioner,
Fabric8WorkspaceEnvironmentProvider envProvider,
UserManager userManager,
KubernetesSharedPool sharedPool) {
KubernetesSharedPool sharedPool,
@Nullable @Named("che.infra.openshift.oauth_identity_provider")
String oAuthIdentityProvider) {
super(
projectName,
null,
Expand All @@ -55,7 +57,8 @@ public Fabric8OpenShiftProjectFactory(
new OpenShiftClientConfigFactory(),
openShiftStopWorkspaceRoleProvisioner,
userManager,
sharedPool);
sharedPool,
oAuthIdentityProvider);
this.clientFactory = clientFactory;
this.envProvider = envProvider;
}
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<artifactId>che-parent</artifactId>
<groupId>org.eclipse.che</groupId>
<version>7.12.0</version>
<version>7.12.1</version>
</parent>
<groupId>com.redhat.che</groupId>
<artifactId>fabric8-ide-parent</artifactId>
Expand All @@ -31,7 +31,7 @@
<module>functional-tests</module>
</modules>
<properties>
<che.version>7.12.0</che.version>
<che.version>7.12.1</che.version>
<keycloak.version>2.5.0.Final</keycloak.version>
<redhat.che.version>1.0.0-SNAPSHOT</redhat.che.version>
<rh.che.plugins.version>1.0.0-SNAPSHOT</rh.che.plugins.version>
Expand Down