From 6a8c2fa2b265ddd560d67c7b6555427612d3ee4e Mon Sep 17 00:00:00 2001
From: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Date: Tue, 3 Jan 2017 15:42:15 +0200
Subject: [PATCH 1/5] Upgrade CXF, fixes concurrent http client errors

Upgrades to http client 4.5.2 which fixes https://issues.apache.org/jira/browse/HTTPCLIENT-1715.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f580fba0..5c74fca0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <surefire.version>2.18.1</surefire.version>
     <testng.version>6.8.8</testng.version>
     <guava.version>17.0</guava.version>
-    <cxf.version>3.1.4</cxf.version>
+    <cxf.version>3.1.9</cxf.version>
     <mockwebserver.version>3.5.0</mockwebserver.version>
     <xmlunit.version>2.3.0</xmlunit.version>
   </properties>

From 5a56fa322695bf6d640aa4dbe6b5e9db2d79e07e Mon Sep 17 00:00:00 2001
From: Aled Sage <aled.sage@gmail.com>
Date: Fri, 6 Jan 2017 17:38:04 +0000
Subject: [PATCH 2/5] Add maven-enforcer-plugin

---
 pom.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5c74fca0..7876f504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,33 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce</id>
+            <phase>none</phase>
+          </execution>
+          <execution>
+            <id>brooklyn-build-req</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <inherited>true</inherited>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>${java.version}.0</version>
+                </requireJavaVersion>
+                <requireMavenVersion>
+                  <version>[3.0.0,)</version>
+                </requireMavenVersion>
+                <dependencyConvergence/>
+              </rules>
+            </configuration>
+          </execution>
+      </executions>
+    </plugin>
     </plugins>
     <pluginManagement>
       <plugins>

From 67097cb5002e5ac849ee9f82e8a731ea5e001d73 Mon Sep 17 00:00:00 2001
From: Aled Sage <aled.sage@gmail.com>
Date: Fri, 6 Jan 2017 17:38:50 +0000
Subject: [PATCH 3/5] Update maven-plugins

---
 client/pom.xml |  2 --
 pom.xml        | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index c9e77a7a..a7d10a4a 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -102,7 +102,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.10</version>
         <executions>
           <execution>
             <id>unpack</id>
@@ -201,7 +200,6 @@
           <plugin>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-codegen-plugin</artifactId>
-            <version>${cxf.version}</version>
             <executions>
               <execution>
                 <id>generate-sources</id>
diff --git a/pom.xml b/pom.xml
index 7876f504..1a7d86b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.3</version>
+          <version>3.6.0</version>
           <configuration>
             <source>${java.version}</source>
             <target>${java.version}</target>
@@ -171,7 +171,7 @@
         <plugin>
           <groupId>org.jvnet.jax-ws-commons</groupId>
           <artifactId>jaxws-maven-plugin</artifactId>
-          <version>2.2</version>
+          <version>2.3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.cxf</groupId>
@@ -186,12 +186,12 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.10</version>
+          <version>1.12</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
@@ -207,7 +207,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.0.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>
@@ -216,19 +216,19 @@
         </plugin>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.7</version>
+          <version>3.0.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
-          <version>2.4</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>2.6.1</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-eclipse-plugin</artifactId>
@@ -240,7 +240,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.3</version>
+          <version>2.10.4</version>
         </plugin>
         <plugin>
           <artifactId>maven-gpg-plugin</artifactId>
@@ -248,7 +248,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>2.5.3</version>
         </plugin>
         <!--This plugin's configuration is used to store Eclipse m2e settings 
           only. It has no influence on the Maven build itself. -->

From 2f41b81e7f789885181fa297d0cfa1487ae40d81 Mon Sep 17 00:00:00 2001
From: Aled Sage <aled.sage@gmail.com>
Date: Fri, 6 Jan 2017 17:39:32 +0000
Subject: [PATCH 4/5] Fix version conflict for httpcore (for cxf 3.1.9)

---
 client/pom.xml | 36 ++++++++++++++++++++++++++++++++++++
 pom.xml        |  9 ++++++---
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index a7d10a4a..4e94f162 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -38,6 +38,16 @@
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http-hc</artifactId>
       <version>${cxf.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore-nio</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpasyncclient</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
@@ -51,6 +61,32 @@
       <scope>provided</scope>
     </dependency>
 
+    <!--
+        Exclusions (and then explicit dependencies below) required by cxf-rt-transports-http-hc. That tries to pull in
+        directly httpcore-nio 4.4.5 (which pulls in httpcore 4.4.5), and same for httpasyncclient. However, it also pulls
+        in httclient, which depends on httpcore 4.4.4. This causes maven-enforcer-plugin's dependencyConvergence to fail.
+    -->
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore-nio</artifactId>
+      <version>${httpcomponents.httpcore.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpasyncclient</artifactId>
+      <version>${httpcomponents.httpasyncclient.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore-nio</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
diff --git a/pom.xml b/pom.xml
index 1a7d86b1..66bb74c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,10 +61,13 @@
     <includedTestGroups />
     <excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
     <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
-    <surefire.version>2.18.1</surefire.version>
-    <testng.version>6.8.8</testng.version>
-    <guava.version>17.0</guava.version>
+    <surefire.version>2.19.1</surefire.version>
+    <testng.version>6.9.10</testng.version>
+    <guava.version>18.0</guava.version>
     <cxf.version>3.1.9</cxf.version>
+    <httpcomponents.httpcore.version>4.4.4</httpcomponents.httpcore.version>
+    <httpcomponents.httpasyncclient.version>4.1.2</httpcomponents.httpasyncclient.version>
+    <httpcomponents.httpclient.version>4.5.2</httpcomponents.httpclient.version>
     <mockwebserver.version>3.5.0</mockwebserver.version>
     <xmlunit.version>2.3.0</xmlunit.version>
   </properties>

From f1de495c2a4e5e2f80fe7f8893a02374a2f2a4e6 Mon Sep 17 00:00:00 2001
From: Aled Sage <aled.sage@gmail.com>
Date: Wed, 1 Feb 2017 09:40:03 +0000
Subject: [PATCH 5/5] Upgrade cxf to 3.1.10 (from 3.1.9)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 66bb74c7..8e81d3b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
     <surefire.version>2.19.1</surefire.version>
     <testng.version>6.9.10</testng.version>
     <guava.version>18.0</guava.version>
-    <cxf.version>3.1.9</cxf.version>
+    <cxf.version>3.1.10</cxf.version>
     <httpcomponents.httpcore.version>4.4.4</httpcomponents.httpcore.version>
     <httpcomponents.httpasyncclient.version>4.1.2</httpcomponents.httpasyncclient.version>
     <httpcomponents.httpclient.version>4.5.2</httpcomponents.httpclient.version>