Merge branch 'master' into searchwithpossitions

eclipse-che · Jul 24, 2017 · d118846 · d118846
2 parents 6197edb + e307492
commit d118846
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+# Global Owners
+* @skabashnyuk @riuvshin
diff --git a/pom.xml b/pom.xml
@@ -16,12 +16,12 @@
     <parent>
         <artifactId>maven-parent-pom</artifactId>
         <groupId>org.eclipse.che.parent</groupId>
-        <version>5.12.0-SNAPSHOT</version>
+        <version>5.16.0-SNAPSHOT</version>
         <relativePath />
     </parent>
     <groupId>org.eclipse.che.depmgt</groupId>
     <artifactId>maven-depmgt-pom</artifactId>
-    <version>5.12.0-SNAPSHOT</version>
+    <version>5.16.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Che Dependency Management POM</name>
     <description>Provides version of third parties artifacts to use in Codenvy platform projects</description>
@@ -34,7 +34,7 @@
     <properties>
         <aopalliance.version>1.0</aopalliance.version>
         <ch.qos.logback.version>1.2.1</ch.qos.logback.version>
-        <com.fasterxml.jackson.core.version>2.5.0</com.fasterxml.jackson.core.version>
+        <com.fasterxml.jackson.core.version>2.7.7</com.fasterxml.jackson.core.version>
         <com.google.api-client.version>1.19.1</com.google.api-client.version>
         <com.google.code.guice.version>4.1.0</com.google.code.guice.version>
         <com.google.guava.version>20.0</com.google.guava.version>
@@ -45,14 +45,15 @@
         <com.googlecode.gson.version>2.3.1</com.googlecode.gson.version>
         <com.h2database.version>1.4.192</com.h2database.version>
         <com.jcraft.jsch.version>0.1.53</com.jcraft.jsch.version>
+        <com.squareup.okhttp3.version>3.6.0</com.squareup.okhttp3.version>
         <commons-codec.version>1.10</commons-codec.version>
         <commons-compress.version>1.9</commons-compress.version>
-        <commons-fileupload.version>1.3.2</commons-fileupload.version>
+        <commons-fileupload.version>1.3.3</commons-fileupload.version>
         <commons-io.version>2.4</commons-io.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <io.fabric8.kubernetes-client>1.4.31</io.fabric8.kubernetes-client>
-        <io.fabric8.kubernetes-model>1.0.65</io.fabric8.kubernetes-model>
-        <io.fabric8.openshift-client.version>1.4.31</io.fabric8.openshift-client.version>
+        <io.fabric8.kubernetes-client>2.2.8</io.fabric8.kubernetes-client>
+        <io.fabric8.kubernetes-model>1.0.67</io.fabric8.kubernetes-model>
+        <io.fabric8.openshift-client.version>2.2.8</io.fabric8.openshift-client.version>
         <io.swagger.version>1.5.9</io.swagger.version>
         <javax.annotation.version>1.2</javax.annotation.version>
         <javax.inject.version>1</javax.inject.version>
@@ -64,7 +65,7 @@
         <jdbc.postgresql-driver.version>9.4-1201-jdbc41</jdbc.postgresql-driver.version>
         <joda-time.version>2.3</joda-time.version>
         <log4j.version>1.2.17</log4j.version>
-        <lsp4j.version>0.1.2</lsp4j.version>
+        <lsp4j.version>0.2.0</lsp4j.version>
         <net.java.dev.jna.version>4.1.0</net.java.dev.jna.version>
         <org.antlr.st4.version>4.0.7</org.antlr.st4.version>
         <org.antlr.version>3.5.2</org.antlr.version>
@@ -90,7 +91,7 @@
         <org.eclipse.search.version>3.10.0.v20150318-0856</org.eclipse.search.version>
         <org.eclipse.text.version>3.5.101</org.eclipse.text.version>
         <org.eclipse.xtext.version>2.10.0</org.eclipse.xtext.version>
-        <org.everrest.version>1.13.4</org.everrest.version>
+        <org.everrest.version>1.13.5</org.everrest.version>
         <org.flyway.version>4.0.3</org.flyway.version>
         <org.javassist.version>3.18.2-GA</org.javassist.version>
         <org.jdom.version>1.1.3</org.jdom.version>
@@ -125,6 +126,7 @@
         <org.mockito.version>1.9.5</org.mockito.version>
         <org.mockitong.version>0.4</org.mockitong.version>
         <org.testng.version>6.8.8</org.testng.version>
+        <com.beust.jcommander.version>1.27</com.beust.jcommander.version>
         <com.tngtech.java>1.9.3</com.tngtech.java>
         <com.googlecode.gwt-test-utils.version>0.47</com.googlecode.gwt-test-utils.version>
         <?SORTPOM RESUME?>
@@ -151,6 +153,11 @@
                 <artifactId>logback-core</artifactId>
                 <version>${ch.qos.logback.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.beust</groupId>
+                <artifactId>jcommander</artifactId>
+                <version>${com.beust.jcommander.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
@@ -416,6 +423,11 @@
                 <artifactId>jsch</artifactId>
                 <version>${com.jcraft.jsch.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>${com.squareup.okhttp3.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.tngtech.java</groupId>
                 <artifactId>junit-dataprovider</artifactId>