CHE-26: Cleanup after rebase - setting correct che-plugin-openshift-c…

…lient version, fixing io.fabric8 dependency management, copyright license year and tests Signed-off-by: Ilya Buziuk <[email protected]>
eclipse-che · Jan 18, 2017 · 686380f · 686380f
1 parent 1ba3dc0
commit 686380f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 deletions.
diff --git a/...er-client/src/main/java/org/eclipse/che/plugin/docker/client/DockerConnectorProvider.java b/...er-client/src/main/java/org/eclipse/che/plugin/docker/client/DockerConnectorProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012-2016 Codenvy, S.A.
+ * 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

diff --git a/...ocker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/DockerInstanceTest.java b/...ocker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/DockerInstanceTest.java
@@ -213,7 +213,7 @@ private DockerInstance getDockerInstance(Machine machine,
                                              boolean snapshotUseRegistry) throws MachineException {
         DockerMachineFactory machineFactory = mock(DockerMachineFactory.class);
         when(machineFactory.createMetadata(any(), any(), any())).thenReturn(mock(DockerInstanceRuntimeInfo.class));
-        return new DockerInstance(dockerConnectorMock,
+        return new DockerInstance(dockerConnectorProviderMock,
                                   registry,
                                   USERNAME,
                                   machineFactory,

diff --git a/plugins/plugin-docker/che-plugin-openshift-client/pom.xml b/plugins/plugin-docker/che-plugin-openshift-client/pom.xml
@@ -16,27 +16,16 @@
     <parent>
         <artifactId>che-plugin-docker-parent</artifactId>
         <groupId>org.eclipse.che.plugin</groupId>
-        <version>5.0.0</version>
+        <version>5.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>che-plugin-openshift-client</artifactId>
     <packaging>jar</packaging>
     <name>Che Plugin :: Docker :: OpenShift Client</name>
     <properties>
-        <findbugs.failonerror>false</findbugs.failonerror>
-        <io.fabric8.openshift-client.version>1.4.31</io.fabric8.openshift-client.version>
         <license_contributor>Red Hat, Inc. - initial API and implementation</license_contributor>
         <license_copyrightOwner>Red Hat, Inc.</license_copyrightOwner>
         <license_header>license-header.txt</license_header>
     </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.fabric8</groupId>
-                <artifactId>openshift-client</artifactId>
-                <version>${io.fabric8.openshift-client.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -49,12 +38,10 @@
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-client</artifactId>
-            <version>1.4.31</version>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-model</artifactId>
-            <version>1.0.65</version>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>

diff --git a/...ext-server/src/test/java/org/eclipse/che/ide/ext/machine/server/ssh/KeysInjectorTest.java b/...ext-server/src/test/java/org/eclipse/che/ide/ext/machine/server/ssh/KeysInjectorTest.java
@@ -122,8 +122,7 @@ public void setUp() throws Exception {
         keysInjector = new KeysInjector(eventService,
                                         new MockConnectorProvider(),
                                         sshManager,
-                                        environmentEngine,
-                                        userManager);
+                                        environmentEngine);
 
         keysInjector.start();
         verify(eventService).subscribe(subscriberCaptor.capture());