fix build - revert some of the version upgrade

zanata · Sep 19, 2016 · 2668e54 · 2668e54
1 parent bd74627
commit 2668e54
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
   <properties>
     <zanata.api.version>4.0.0-SNAPSHOT</zanata.api.version>
     <zanata.common.version>4.0.0-SNAPSHOT</zanata.common.version>
-    <powermock.version>1.6.5</powermock.version>
+    <powermock.version>1.6.2</powermock.version>
     <resteasy.version>3.0.12.Final</resteasy.version>
     <jersey.version>1.17.1</jersey.version>
   </properties>
@@ -208,9 +208,7 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
-        <!-- When we upgrade to 4.3 again, please remove the SSLSocketFactory
-             from ZanataProxyFactory -->
-        <version>4.2.6</version>
+        <version>4.3.6</version>
         <exclusions>
           <exclusion>
             <artifactId>commons-logging</artifactId>

diff --git a/stub-server/pom.xml b/stub-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>client</artifactId>
-    <version>4.0.0-alpha-2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>stub-server</artifactId>
   <name>stub-server</name>
@@ -19,7 +19,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jetty.version>9.4.0.M1</jetty.version>
+    <jetty.version>9.0.3.v20130506</jetty.version>
   </properties>
   <dependencies>
     <dependency>

diff --git a/zanata-cli/pom.xml b/zanata-cli/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>client</artifactId>
-    <version>4.0.0-alpha-2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>zanata-cli</artifactId>
   <name>Zanata command-line client</name>

diff --git a/zanata-client-commands/pom.xml b/zanata-client-commands/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>client</artifactId>
-    <version>4.0.0-alpha-2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>zanata-client-commands</artifactId>
   <name>Zanata client commands</name>

diff --git a/zanata-maven-plugin/pom.xml b/zanata-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>client</artifactId>
-    <version>4.0.0-alpha-2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
 
   </parent>
   <artifactId>zanata-maven-plugin</artifactId>

diff --git a/zanata-rest-client/pom.xml b/zanata-rest-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>client</artifactId>
-    <version>4.0.0-alpha-2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
 
   </parent>
   <packaging>jar</packaging>