From 1caba9eb06604810eeb39aa52198b97cb5bd2113 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Thu, 28 Sep 2023 21:24:39 +0100 Subject: [PATCH 1/8] Split off 9.2.26 Signed-off-by: Gavin Halliday --- 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 73bf12efc..9b1a4e27a 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.25-0-SNAPSHOT + 9.2.27-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 9bbd92fa7..fd6ac1328 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.25-0-SNAPSHOT + 9.2.27-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index dee5dbb69..ba6916897 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.25-0-SNAPSHOT + 9.2.27-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 150baeedf..7e567a62a 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.25-0-SNAPSHOT + 9.2.27-0-SNAPSHOT From cad2d76e4a9c69fbc8e70203616ef06306a0f351 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 5 Oct 2023 17:22:03 +0100 Subject: [PATCH 2/8] Split off 9.2.28 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 9b1a4e27a..872b1ebca 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.27-0-SNAPSHOT + 9.2.29-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index fd6ac1328..58582131a 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.27-0-SNAPSHOT + 9.2.29-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index ba6916897..93f0109c4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.27-0-SNAPSHOT + 9.2.29-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 7e567a62a..c1fdc5e87 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.27-0-SNAPSHOT + 9.2.29-0-SNAPSHOT From ac4d14997c2fc8d1dbdf3b55730e7e337c603550 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 13 Oct 2023 18:26:17 +0100 Subject: [PATCH 3/8] Split off 9.2.30 Signed-off-by: Gavin Halliday --- 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 872b1ebca..14d9ad2a0 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.29-0-SNAPSHOT + 9.2.31-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 58582131a..777fb62fa 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.29-0-SNAPSHOT + 9.2.31-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 93f0109c4..f6a2ed407 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.29-0-SNAPSHOT + 9.2.31-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index c1fdc5e87..e76ea1346 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.29-0-SNAPSHOT + 9.2.31-0-SNAPSHOT From e2fb77dfeb525b9b6355ffa823a1aaef83194ce5 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 26 Oct 2023 17:13:48 +0100 Subject: [PATCH 4/8] Split off 9.2.32 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 14d9ad2a0..ae44a71a2 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.31-0-SNAPSHOT + 9.2.33-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 777fb62fa..9cd24230d 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.31-0-SNAPSHOT + 9.2.33-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index f6a2ed407..6bb78965d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.31-0-SNAPSHOT + 9.2.33-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index e76ea1346..b9b711e52 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.31-0-SNAPSHOT + 9.2.33-0-SNAPSHOT From 105905330ed38580dcc040e0daba992df8beaba2 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Thu, 26 Oct 2023 14:33:08 -0400 Subject: [PATCH 5/8] HPCC4J-545 Resume read test causes OOM error (#651) - Updated resume read to use a smaller read buffer size Signed-off-by: James McMullan James.McMullan@lexisnexis.com Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .../java/org/hpccsystems/dfs/client/DFSReadWriteTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java index 2fc59c86d..e5d5fa3b1 100644 --- a/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java +++ b/dfsclient/src/test/java/org/hpccsystems/dfs/client/DFSReadWriteTest.java @@ -178,11 +178,12 @@ public void readResumeTest() throws Exception System.out.println("Messages from file part (" + i + ") read operation:\n" + fileReader.getRemoteReadMessages()); } + int readSizeKB = 100; ArrayList resumedRecords = new ArrayList(); for (int i = 0; i < resumeInfo.size(); i++) { HPCCRecordBuilder recordBuilder = new HPCCRecordBuilder(file.getProjectedRecordDefinition()); - HpccRemoteFileReader fileReader = new HpccRemoteFileReader(fileParts[resumeFilePart.get(i)], originalRD, recordBuilder, -1, -1, true, -1, resumeInfo.get(i)); + HpccRemoteFileReader fileReader = new HpccRemoteFileReader(fileParts[resumeFilePart.get(i)], originalRD, recordBuilder, -1, -1, true, readSizeKB, resumeInfo.get(i)); if (fileReader.hasNext()) { @@ -194,6 +195,10 @@ public void readResumeTest() throws Exception resumedRecords.add(record); } + fileReader.close(); + + fileReader = null; + recordBuilder = null; } assertEquals("Number of records did not match during read resume.", records.size(), resumedRecords.size()); From 43d171ca714bc91ed775c98a78dadef489df3503 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Tue, 31 Oct 2023 09:44:06 -0400 Subject: [PATCH 6/8] Bump org.json:json from 20230227 to 20231013 (#652) Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20230227 to 20231013. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: Pastrana --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6bb78965d..5b5b5958b 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ 0.1.54 2.7 4.13.1 - 20230227 + 20231013 2.17.1 1.8.1 2.10.1 From ff7cccb942f06040f331ab9b9e5eefb52fc3ac68 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Thu, 2 Nov 2023 17:41:20 +0000 Subject: [PATCH 7/8] Split off 9.2.34 Signed-off-by: Gavin Halliday --- 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 ae44a71a2..8828bd785 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.33-0-SNAPSHOT + 9.2.35-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 9cd24230d..addcad389 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.33-0-SNAPSHOT + 9.2.35-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 5b5b5958b..b80d21b3b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.33-0-SNAPSHOT + 9.2.35-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index b9b711e52..a5163bb11 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.33-0-SNAPSHOT + 9.2.35-0-SNAPSHOT From 5f8d0b571b16f6c2d505d29049aa3b3136bf1d97 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Thu, 2 Nov 2023 17:43:29 +0000 Subject: [PATCH 8/8] Split off 9.4.8 Signed-off-by: Gavin Halliday --- 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 4369dcbec..8a5bcf7a3 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.7-0-SNAPSHOT + 9.4.9-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 84a52d717..30cfd20a1 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.7-0-SNAPSHOT + 9.4.9-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index b859c4abc..58e0e9b43 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.7-0-SNAPSHOT + 9.4.9-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 82f5999b3..411766195 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.7-0-SNAPSHOT + 9.4.9-0-SNAPSHOT