From 08335c677401d51e192c82eec227c611f4597f79 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 7 Dec 2023 17:58:27 +0000 Subject: [PATCH 01/14] Split off 8.12.76 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 0ec2b017a..039d15b9e 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 8.12.75-0-SNAPSHOT + 8.12.77-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 297ca7b44..d59fc503b 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 8.12.75-0-SNAPSHOT + 8.12.77-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 817f73c38..646bf2656 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 8.12.75-0-SNAPSHOT + 8.12.77-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 3eab51157..5c5c3467c 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 8.12.75-0-SNAPSHOT + 8.12.77-0-SNAPSHOT From 3670bf3a85a581bc4416f98a903cbe1e4c135c1b Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 7 Dec 2023 18:00:23 +0000 Subject: [PATCH 02/14] Split off 9.0.66 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 19f516679..3907aa7d6 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.65-0-SNAPSHOT + 9.0.67-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index a1cba85cf..3a4fc87e6 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.65-0-SNAPSHOT + 9.0.67-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 060c49732..abb7484ad 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.0.65-0-SNAPSHOT + 9.0.67-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 1e5f5fcd1..0102607d5 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.65-0-SNAPSHOT + 9.0.67-0-SNAPSHOT From 1325daedd30e2e6235a6a6a78995be19d66bf1ed Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 7 Dec 2023 18:02:07 +0000 Subject: [PATCH 03/14] Split off 9.2.44 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index d8b35f2c5..2c8f489e8 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.43-0-SNAPSHOT + 9.2.45-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 3bd81ec61..dfd4c01f2 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.43-0-SNAPSHOT + 9.2.45-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index ca0726b21..aa9614f32 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.43-0-SNAPSHOT + 9.2.45-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index dc0fced9d..776d8fbdc 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.43-0-SNAPSHOT + 9.2.45-0-SNAPSHOT From e3e147ceac31437445998a18caa60540e73692f8 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 14 Dec 2023 17:12:53 +0000 Subject: [PATCH 04/14] Split off 9.0.68 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 3907aa7d6..bbdd6f2d4 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.67-0-SNAPSHOT + 9.0.69-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 3a4fc87e6..8742d02c9 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.67-0-SNAPSHOT + 9.0.69-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index abb7484ad..d49ea7e9d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.0.67-0-SNAPSHOT + 9.0.69-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 0102607d5..ed608b957 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.67-0-SNAPSHOT + 9.0.69-0-SNAPSHOT From 039d7d16a42e0ca5206c4f57f780b862af748c13 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 14 Dec 2023 17:14:09 +0000 Subject: [PATCH 05/14] Split off 9.2.46 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 2c8f489e8..2045f6320 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.45-0-SNAPSHOT + 9.2.47-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index dfd4c01f2..bfe6360e2 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.45-0-SNAPSHOT + 9.2.47-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index aa9614f32..91ee990de 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.45-0-SNAPSHOT + 9.2.47-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 776d8fbdc..251f3eab4 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.45-0-SNAPSHOT + 9.2.47-0-SNAPSHOT From 770f5713bab05669cf90fc64581cf9890759eda5 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 14 Dec 2023 17:15:25 +0000 Subject: [PATCH 06/14] Split off 9.4.20 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 1edbdd336..ead5087da 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.19-0-SNAPSHOT + 9.4.21-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index ee01d1bdf..da93ff35b 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.19-0-SNAPSHOT + 9.4.21-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1aeae2d0a..1f9807552 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.19-0-SNAPSHOT + 9.4.21-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 641263cd0..e837c0772 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.19-0-SNAPSHOT + 9.4.21-0-SNAPSHOT From aeddaf70d47d0939e138d21687039abdb13d27c6 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Mon, 18 Dec 2023 08:58:21 -0500 Subject: [PATCH 07/14] HPCC4J-561 copyfile test wait for spray completion (#668) - Modified WSFileIOClientTest.copyfile test to correctly monitor spray progress - Updated remote unit tests values.yaml to keep file spray service Signed-off-by: James McMullan James.McMullan@lexisnexis.com Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .github/workflows/httpsUnitTests.yml | 23 ++++++++- .../ws/client/WSFileIOClientTest.java | 47 +++++++++++-------- 2 files changed, 49 insertions(+), 21 deletions(-) diff --git a/.github/workflows/httpsUnitTests.yml b/.github/workflows/httpsUnitTests.yml index 215ff1bd3..5a1b43655 100644 --- a/.github/workflows/httpsUnitTests.yml +++ b/.github/workflows/httpsUnitTests.yml @@ -66,7 +66,28 @@ jobs: - name: Install HPCC Cluster run: | - echo -e "certificates:\n enabled: true\ndafilesrv:\n - name: rowservice\n disabled: false\n application: stream\n service:\n servicePort: 7600\n visibility: global" > values.yaml + cat < values.yaml + certificates: + enabled: true + dafilesrv: + - name: rowservice + disabled: false + application: stream + service: + servicePort: 7600 + visibility: global + - name: direct-access + disabled: true + application: directio + service: + servicePort: 7200 + visibility: local + - name: spray-service + application: spray + service: + servicePort: 7300 + visibility: cluster + EOF helm repo add hpcc https://hpcc-systems.github.io/helm-chart helm repo update helm install myhpcc hpcc/hpcc -f values.yaml diff --git a/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java b/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java index 158538608..e27714e24 100644 --- a/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java +++ b/wsclient/src/test/java/org/hpccsystems/ws/client/WSFileIOClientTest.java @@ -21,7 +21,9 @@ HPCC SYSTEMS software Copyright (C) 2019 HPCC Systems®. import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; +import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Set; import org.apache.axis2.AxisFault; @@ -67,9 +69,6 @@ public class WSFileIOClientTest extends BaseRemoteTest @Test public void copyFile() throws Exception { - Assume.assumeFalse("Test not valid on containerized HPCC environment", client.isTargetHPCCContainerized()); - assumeTrue("Ignoring test 'copyFile' because HPCC-30117 is not fixed", HPCC_30117.equalsIgnoreCase("fixed")); - String lzfile=System.currentTimeMillis() + "_csvtest.csv"; String hpccfilename="temp::" + lzfile; client.createHPCCFile(lzfile, targetLZ, true); @@ -77,35 +76,43 @@ public void copyFile() throws Exception client.writeHPCCFileData(data, lzfile, targetLZ, true, 0, 20); try { - ProgressResponseWrapper dfuspray=wsclient.getFileSprayClient().sprayVariable( + System.out.println("Starting file spray."); + ProgressResponseWrapper dfuspray = wsclient.getFileSprayClient().sprayVariable( new DelimitedDataOptions(), wsclient.getFileSprayClient().fetchLocalDropZones().get(0), lzfile,"~" + hpccfilename,"",thorClusterFileGroup,true, HPCCFileSprayClient.SprayVariableFormat.DFUff_csv, null, null, null, null, null, null, null); - Thread.sleep(1000); - int wait=60; if (dfuspray.getExceptions() != null - && dfuspray.getExceptions().getException() != null - && dfuspray.getExceptions().getException().size()>0) + && dfuspray.getExceptions().getException() != null + && dfuspray.getExceptions().getException().size()>0) { fail(dfuspray.getExceptions().getException().get(0).getMessage()); } - if (dfuspray.getSecsLeft()>0) + + List whiteListedStates = Arrays.asList( "queued", "started", "unknown", "finished", "monitoring"); + int waitCount = 0; + int MAX_WAIT_COUNT = 60; + + ProgressResponseWrapper dfuProgress = null; + do { - System.out.println("Still spraying, waiting 1 sec..."); - for (int i=wait;i>0;i--) + dfuProgress = wsclient.getFileSprayClient().getDfuProgress(dfuspray.getWuid()); + boolean stateIsWhiteListed = whiteListedStates.contains(dfuProgress.getState()); + if (!stateIsWhiteListed) { - if (dfuspray.getSecsLeft()==0) - { - i=0; - } - else - { - Thread.sleep(1000); - } + fail("File spray failed: Summary: " + dfuProgress.getSummaryMessage() + " Exceptions: " + dfuProgress.getExceptions()); } - } + + if (dfuProgress.getPercentDone() < 100) + { + Thread.sleep(1000); + System.out.println("File spray percent complete: " + dfuProgress.getPercentDone() + "% Sleeping for 1sec to wait for spray."); + waitCount++; + } + } while (waitCount < 60 && dfuProgress.getPercentDone() < 100); + + assumeTrue("File spray did not complete within: " + MAX_WAIT_COUNT + "s. Failing test.", waitCount < MAX_WAIT_COUNT); System.out.println("Test file successfully sprayed to " + "~" + hpccfilename + ", attempting copy to " + hpccfilename + "_2"); wsclient.getFileSprayClient().copyFile(hpccfilename,hpccfilename + "_2",true); From 01060d5b80c0797b2be60d6ff2d856a0b9043f72 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 21 Dec 2023 11:27:13 +0000 Subject: [PATCH 08/14] Split off 9.0.70 Signed-off-by: Jake Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index bbdd6f2d4..4f6b03957 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.69-0-SNAPSHOT + 9.0.71-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 8742d02c9..dc944d125 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.69-0-SNAPSHOT + 9.0.71-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index d49ea7e9d..dc6d4411a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.0.69-0-SNAPSHOT + 9.0.71-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index ed608b957..9906d8a74 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.69-0-SNAPSHOT + 9.0.71-0-SNAPSHOT From 8d7b75e333f3458f9066c2fdeea6e9a7640f6685 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 21 Dec 2023 11:28:00 +0000 Subject: [PATCH 09/14] Split off 9.2.48 Signed-off-by: Jake Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 2045f6320..80795726e 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.47-0-SNAPSHOT + 9.2.49-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index bfe6360e2..4f7107016 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.47-0-SNAPSHOT + 9.2.49-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 91ee990de..708a25198 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.47-0-SNAPSHOT + 9.2.49-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 251f3eab4..27ccf86bd 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.47-0-SNAPSHOT + 9.2.49-0-SNAPSHOT From 5554f9f3c805df5269d26229d6e49d2dc50e24da Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 21 Dec 2023 11:29:13 +0000 Subject: [PATCH 10/14] Split off 9.4.22 Signed-off-by: Jake Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index ead5087da..a599d0274 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.21-0-SNAPSHOT + 9.4.23-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index da93ff35b..c9fe436ef 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.21-0-SNAPSHOT + 9.4.23-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1f9807552..773c4cc89 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.21-0-SNAPSHOT + 9.4.23-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index e837c0772..1a77c8d70 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.21-0-SNAPSHOT + 9.4.23-0-SNAPSHOT From c68aac855ee87a39a437e45ba2635fd138ed95aa Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 4 Jan 2024 16:56:23 +0000 Subject: [PATCH 11/14] Split off 9.0.72 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 4f6b03957..4e3e4e036 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.71-0-SNAPSHOT + 9.0.73-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index dc944d125..115d17a32 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.71-0-SNAPSHOT + 9.0.73-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index dc6d4411a..c36c255c3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.0.71-0-SNAPSHOT + 9.0.73-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 9906d8a74..403739003 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.0.71-0-SNAPSHOT + 9.0.73-0-SNAPSHOT From a742d1874af80e50f55cda27c53145d3f35bda23 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 4 Jan 2024 16:57:50 +0000 Subject: [PATCH 12/14] Split off 9.2.50 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index 80795726e..6444e9544 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.49-0-SNAPSHOT + 9.2.51-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 4f7107016..6c1c82229 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.49-0-SNAPSHOT + 9.2.51-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 708a25198..3bcd484e8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.49-0-SNAPSHOT + 9.2.51-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 27ccf86bd..3b9456628 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.49-0-SNAPSHOT + 9.2.51-0-SNAPSHOT From 2335fd03e6a568e7c5adb86f7464c4a15d46a6bb Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 4 Jan 2024 16:59:02 +0000 Subject: [PATCH 13/14] Split off 9.4.24 Signed-off-by: Gordon Smith --- commons-hpcc/pom.xml | 2 +- dfsclient/pom.xml | 2 +- pom.xml | 2 +- wsclient/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/commons-hpcc/pom.xml b/commons-hpcc/pom.xml index a599d0274..f522c84f5 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.23-0-SNAPSHOT + 9.4.25-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index c9fe436ef..566b52f52 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.23-0-SNAPSHOT + 9.4.25-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 773c4cc89..4fd5f7aee 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.23-0-SNAPSHOT + 9.4.25-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 1a77c8d70..d14277c8e 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.23-0-SNAPSHOT + 9.4.25-0-SNAPSHOT From 109c213e5fed8ee70b36025453329b5e1bb339fa Mon Sep 17 00:00:00 2001 From: Rodrigo Pastrana Date: Mon, 8 Jan 2024 11:04:04 -0500 Subject: [PATCH 14/14] HPCC4J-564 Bump org.json version to 20231013 Signed-off-by: Rodrigo Pastrana --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c36c255c3..701a16d5d 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ 0.1.54 2.7 4.13.1 - 20180813 + 20231013 2.17.1 1.8.1 2.10.1