Update addons.xml versions and fix RestClient CompletableResponseListener

Author: acetousk

addons.xml

@@ -35,51 +35,51 @@
     </repository>
 
     <!-- Where to get runtime directory if not present -->
-    <runtime name="moqui-runtime" group="moqui" version="3.9.9" branch="master"/>
+    <runtime name="moqui-runtime" group="moqui" version="4.0.0" branch="master"/>
 
     <!-- Example Component -->
-    <component name="example" group="moqui" version="3.9.9" branch="master"/>
-    <component name="start" group="moqui" version="1.0.1" branch="master"/>
+    <component name="example" group="moqui" version="4.0.0" branch="master"/>
+    <component name="start" group="moqui" version="1.0.2" branch="master"/>
 
     <!-- Moqui Tool Components -->
-    <component name="moqui-aws" group="moqui" version="1.1.1" branch="master"/>
-    <component name="moqui-camel" group="moqui" version="1.9.9" branch="master"/>
-    <component name="moqui-cups" group="moqui" version="1.0.1" branch="master"/>
+    <component name="moqui-aws" group="moqui" version="1.1.2" branch="master"/>
+    <component name="moqui-camel" group="moqui" version="2.0.0" branch="master"/>
+    <component name="moqui-cups" group="moqui" version="1.0.2" branch="master"/>
     <!-- no longer supported: <component name="moqui-elasticsearch" group="moqui" version="1.2.2" branch="master"/> -->
-    <component name="moqui-fop" group="moqui" version="1.9.9" branch="master"/>
-    <component name="moqui-hazelcast" group="moqui" version="1.9.9" branch="master"/>
-    <component name="moqui-image" group="moqui" version="1.0.0" branch="master"/><!-- no releases yet -->
-    <component name="moqui-kie" group="moqui" version="1.9.9" branch="master"/>
-    <component name="moqui-orientdb" group="moqui" version="1.9.9" branch="master"/>
-    <component name="moqui-poi" group="moqui" version="1.0.2" branch="master"/>
-    <component name="moqui-sftp" group="moqui" version="1.0.2" branch="master"/>
-    <component name="moqui-sso" group="moqui" version="1.9.9" branch="master"/>
-    <component name="moqui-wikitext" group="moqui" version="1.0.4" branch="master"/>
+    <component name="moqui-fop" group="moqui" version="2.0.0" branch="master"/>
+    <component name="moqui-hazelcast" group="moqui" version="2.0.0" branch="master"/>
+    <component name="moqui-image" group="moqui" version="1.0.0" branch="master"/>
+    <component name="moqui-kie" group="moqui" version="2.0.0" branch="master"/>
+    <component name="moqui-orientdb" group="moqui" version="2.0.0" branch="master"/>
+    <component name="moqui-poi" group="moqui" version="1.0.3" branch="master"/>
+    <component name="moqui-sftp" group="moqui" version="1.0.3" branch="master"/>
+    <component name="moqui-sso" group="moqui" version="2.0.0" branch="master"/>
+    <component name="moqui-wikitext" group="moqui" version="1.0.5" branch="master"/>
 
     <!-- <component name="moqui-atomikos" group="moqui" version="1.0.0" branch="master"/> Deprecated after Moqui 4.0 release and bitronix fork (Atomikos intentionally broke community version to sell commercial; not actively maintained -->
 
     <!-- Mantle Business Artifact and Integration Components -->
     <component name="mantle-udm" group="moqui" version="2.2.1" branch="master"/>
-    <component name="mantle-usl" group="moqui" version="2.9.9" branch="master"/>
+    <component name="mantle-usl" group="moqui" version="3.0.0" branch="master"/>
 
     <component name="AuthorizeDotNet" group="moqui" version="1.2.5" branch="master"/>
     <component name="mantle-edi" group="moqui" version="1.1.5" branch="master"/>
     <component name="mantle-paytrace" group="moqui" version="1.0.3" branch="master"/>
     <component name="mantle-shippo" group="moqui" version="1.2.1" branch="master"/>
     <component name="mantle-yotpo" group="moqui" version="1.0.2" branch="master"/>
 
-    <component name="mantle-braintree" group="moqui" version="1.9.9" branch="master"/><!-- no releases yet -->
+    <component name="mantle-braintree" group="moqui" version="2.0.0" branch="master"/>
     <component name="mantle-rsis" group="moqui" version="" branch="master"/><!-- no releases yet -->
 
     <component name="mantle-oagis" group="moqui" version="" branch="master"/><!-- no releases yet -->
     <component name="mantle-ubpl" group="moqui" version="" branch="master"/><!-- no releases -->
 
     <!-- Moqui Applications -->
-    <component name="SimpleScreens" group="moqui" version="2.2.1" branch="master"/>
-    <component name="HiveMind" group="moqui" version="1.5.1" branch="master"/>
-    <component name="PopCommerce" group="moqui" version="2.2.1" branch="master"/>
+    <component name="SimpleScreens" group="moqui" version="2.2.2" branch="master"/>
+    <component name="HiveMind" group="moqui" version="1.5.2" branch="master"/>
+    <component name="PopCommerce" group="moqui" version="2.2.2" branch="master"/>
     <component name="MarbleERP" group="moqui" version="1.0.1" branch="master"/>
-    <component name="PopRestStore" group="moqui" version="1.1.1" branch="master"/>
+    <component name="PopRestStore" group="moqui" version="1.1.2" branch="master"/>
     <component name="WeCreate" group="moqui" version="" branch="master"/>
     <component name="moqui-mjml" group="moqui" version="" branch="master"/>
     <!-- Moqui Web and Demo Sites -->

framework/src/main/java/org/moqui/util/RestClient.java

@@ -334,9 +334,8 @@ protected RestResponse callInternal() throws TimeoutException {
         try {
             Request request = makeRequest(tempFactory != null ? tempFactory : (overrideRequestFactory != null ? overrideRequestFactory : getDefaultRequestFactory()));
             if (timeoutSeconds < 2) timeoutSeconds = 2;
-            request.idleTimeout(timeoutSeconds - 1, TimeUnit.SECONDS);
-            // use a FutureResponseListener so we can set the timeout and max response size (old: response = request.send(); )
-            FutureResponseListener listener = new FutureResponseListener(request, maxResponseSize);
+            request.idleTimeout(timeoutSeconds-1, TimeUnit.SECONDS);
+            CompletableResponseListener listener = new CompletableResponseListener(request, maxResponseSize);
             try {
                 CompletableFuture<ContentResponse> future = listener.send();
                 ContentResponse response = future.get(timeoutSeconds, TimeUnit.SECONDS);
@@ -813,4 +812,4 @@ public PooledRequestFactory init() {
             }
         }
     }
-}
+}