From d9ee0e46bfb04d6ec8fbe9ed22686b442436e0fc Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 9 May 2024 16:57:54 +0100 Subject: [PATCH 01/14] Split off 9.2.86 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 0cb0f4df1..e1aa8fcc8 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.85-0-SNAPSHOT + 9.2.87-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index cea5897ad..f8ed09cbb 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.85-0-SNAPSHOT + 9.2.87-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 0a6d9e4f2..d7b7c54ca 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.85-0-SNAPSHOT + 9.2.87-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index b2e392fe6..78b8bd604 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.85-0-SNAPSHOT + 9.2.87-0-SNAPSHOT From e4f63fd26e965ab0d0d5048131af3b9cbec7be6b Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 17 May 2024 18:04:59 +0100 Subject: [PATCH 02/14] Split off 9.2.88 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 e1aa8fcc8..e97cf09cf 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.87-0-SNAPSHOT + 9.2.89-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index f8ed09cbb..1ae794b07 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.87-0-SNAPSHOT + 9.2.89-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index d7b7c54ca..70c2625f8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.87-0-SNAPSHOT + 9.2.89-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 78b8bd604..bb4432c97 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.87-0-SNAPSHOT + 9.2.89-0-SNAPSHOT From c4d5eb1290e9ecd3f474d1e1fcecf256b3b01d95 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 23 May 2024 18:20:06 +0100 Subject: [PATCH 03/14] Split off 9.2.90 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 e97cf09cf..2e8795f1b 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.89-0-SNAPSHOT + 9.2.91-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 1ae794b07..362ffffff 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.89-0-SNAPSHOT + 9.2.91-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 70c2625f8..420c44211 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.89-0-SNAPSHOT + 9.2.91-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index bb4432c97..43d46350b 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.89-0-SNAPSHOT + 9.2.91-0-SNAPSHOT From c998d6371941ed10d1913bdf17eb52a29ac8182f Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 31 May 2024 16:15:36 +0100 Subject: [PATCH 04/14] Split off 9.2.92 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 2e8795f1b..0d5a61330 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.91-0-SNAPSHOT + 9.2.93-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 362ffffff..2bb8d9f31 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.91-0-SNAPSHOT + 9.2.93-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 420c44211..d973f68dc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.91-0-SNAPSHOT + 9.2.93-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 43d46350b..d9667b005 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.91-0-SNAPSHOT + 9.2.93-0-SNAPSHOT From d2cdd15cb2a25f7b5e6d74adb15ebe01a5135975 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 31 May 2024 16:16:43 +0100 Subject: [PATCH 05/14] Split off 9.4.66 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 e63f9f6f1..dd698042c 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.65-0-SNAPSHOT + 9.4.67-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 1f172de46..5548f1ffb 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.65-0-SNAPSHOT + 9.4.67-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index a81e5487a..2e6e8c24a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.65-0-SNAPSHOT + 9.4.67-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 5b481f55c..59f0f7f21 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.65-0-SNAPSHOT + 9.4.67-0-SNAPSHOT From b97ed692aeff76a0594dd2f843e13e3a0bd15e11 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 7 Jun 2024 18:00:32 +0100 Subject: [PATCH 06/14] Split off 9.2.94 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 0d5a61330..3e2dc93ed 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.93-0-SNAPSHOT + 9.2.95-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 2bb8d9f31..041754207 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.93-0-SNAPSHOT + 9.2.95-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index d973f68dc..a176a24b6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.93-0-SNAPSHOT + 9.2.95-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index d9667b005..667635a49 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.93-0-SNAPSHOT + 9.2.95-0-SNAPSHOT From 00acdf9cd817351554d39bb785e4b3098618a411 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 7 Jun 2024 18:02:03 +0100 Subject: [PATCH 07/14] Split off 9.4.68 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 dd698042c..2f21f9544 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.67-0-SNAPSHOT + 9.4.69-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 5548f1ffb..8498b347d 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.67-0-SNAPSHOT + 9.4.69-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2e6e8c24a..510839a73 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.67-0-SNAPSHOT + 9.4.69-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 59f0f7f21..63a2366b7 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.67-0-SNAPSHOT + 9.4.69-0-SNAPSHOT From 76e548c94ac7a54bd222ee3f1a7a0f7012529382 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 14 Jun 2024 17:01:45 +0100 Subject: [PATCH 08/14] Split off 9.2.96 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 3e2dc93ed..9e04db527 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.95-0-SNAPSHOT + 9.2.97-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 041754207..a2529878f 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.95-0-SNAPSHOT + 9.2.97-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index a176a24b6..09ead7159 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.95-0-SNAPSHOT + 9.2.97-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 667635a49..5e6d0d7c6 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.95-0-SNAPSHOT + 9.2.97-0-SNAPSHOT From 85ec23f054c8c9cb02ba4ce35ac3f6226fdf9a88 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Fri, 14 Jun 2024 17:03:20 +0100 Subject: [PATCH 09/14] Split off 9.4.70 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 2f21f9544..db5d3335f 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.69-0-SNAPSHOT + 9.4.71-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 8498b347d..6e9c9fb03 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.69-0-SNAPSHOT + 9.4.71-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 510839a73..7abec41de 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.69-0-SNAPSHOT + 9.4.71-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 63a2366b7..5b77845df 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.69-0-SNAPSHOT + 9.4.71-0-SNAPSHOT From 3653c13360b5e267236257de3de199dfd11d5480 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 20 Jun 2024 16:58:58 +0100 Subject: [PATCH 10/14] Split off 9.4.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 db5d3335f..f00691bb8 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.71-0-SNAPSHOT + 9.4.73-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 6e9c9fb03..47e67b19b 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.71-0-SNAPSHOT + 9.4.73-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 7abec41de..2d38a271b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.71-0-SNAPSHOT + 9.4.73-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 5b77845df..a97566ec2 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.71-0-SNAPSHOT + 9.4.73-0-SNAPSHOT From d03a39be5eef73278fa657985f03b1b811e3c8e4 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 20 Jun 2024 17:00:25 +0100 Subject: [PATCH 11/14] Split off 9.2.98 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 9e04db527..4851ab9a3 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.97-0-SNAPSHOT + 9.2.99-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index a2529878f..4a9fd7edc 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.97-0-SNAPSHOT + 9.2.99-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 09ead7159..6bb3a2511 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.97-0-SNAPSHOT + 9.2.99-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 5e6d0d7c6..746a1e4f8 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.97-0-SNAPSHOT + 9.2.99-0-SNAPSHOT From 42be8649a95597a4a1b0f22c20c647a5a02a619c Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 28 Jun 2024 12:37:09 +0100 Subject: [PATCH 12/14] Split off 9.4.74 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 f00691bb8..2b996a890 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.73-0-SNAPSHOT + 9.4.75-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 47e67b19b..006ae8e5c 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.73-0-SNAPSHOT + 9.4.75-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 2d38a271b..5f9cf9a33 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.4.73-0-SNAPSHOT + 9.4.75-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index a97566ec2..82597a01a 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.4.73-0-SNAPSHOT + 9.4.75-0-SNAPSHOT From d3181a40f8b828916da65684a718e5026fbc437f Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 28 Jun 2024 12:39:03 +0100 Subject: [PATCH 13/14] Split off 9.2.100 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 4851ab9a3..0c86ae00c 100644 --- a/commons-hpcc/pom.xml +++ b/commons-hpcc/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.99-0-SNAPSHOT + 9.2.101-0-SNAPSHOT diff --git a/dfsclient/pom.xml b/dfsclient/pom.xml index 4a9fd7edc..0d32e9cb0 100644 --- a/dfsclient/pom.xml +++ b/dfsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.99-0-SNAPSHOT + 9.2.101-0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 6bb3a2511..8e948d93c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.hpccsystems hpcc4j - 9.2.99-0-SNAPSHOT + 9.2.101-0-SNAPSHOT pom HPCC Systems Java Projects https://hpccsystems.com diff --git a/wsclient/pom.xml b/wsclient/pom.xml index 746a1e4f8..c003f1b68 100644 --- a/wsclient/pom.xml +++ b/wsclient/pom.xml @@ -9,7 +9,7 @@ org.hpccsystems hpcc4j - 9.2.99-0-SNAPSHOT + 9.2.101-0-SNAPSHOT From cf7c92f6ccdc6f290ed17d8d6b91d52604a73841 Mon Sep 17 00:00:00 2001 From: James McMullan Date: Wed, 3 Jul 2024 16:15:06 -0400 Subject: [PATCH 14/14] HPCC4J-620 Jirabot: Sanitize information coming from external sources (#720) Signed-off-by: James McMullan James.McMullan@lexisnexis.com --- .github/workflows/Jirabot.yml | 19 +++++++++++++++---- .github/workflows/JirabotMerge.yml | 1 - 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Jirabot.yml b/.github/workflows/Jirabot.yml index 3e779dcac..c0e4f89d4 100644 --- a/.github/workflows/Jirabot.yml +++ b/.github/workflows/Jirabot.yml @@ -45,8 +45,17 @@ jobs: import time import sys import json + import subprocess + from email.utils import parseaddr from atlassian.jira import Jira + def sanitizeInput(input: str, inputType: str) -> str: + if inputType.lower() == 'email': + # Return the email address only, returns '' if not valid or found + return parseaddr(input)[1] + else: + return '' + def updateIssue(jira, issue, prAuthor : str, transitionMap: dict, propertyMap: dict, pull_url: str) -> str: result = '' @@ -89,8 +98,12 @@ jobs: assigneeId = assignee['accountId'] assigneeEmail = assignee["emailAddress"] + assigneeEmail = sanitizeInput(assigneeEmail, 'email') + prAuthorId = prAuthor["accountId"] prAuthorEmail = prAuthor["emailAddress"] + prAuthorEmail = sanitizeInput(prAuthorEmail, 'email') + if assigneeId is None or assigneeId == '': jira.assign_issue(issueName, prAuthorId) result += 'Assigning user: ' + prAuthorEmail + '\n' @@ -110,7 +123,6 @@ jobs: github_token = os.environ['GITHUB_TOKEN'] comments_url = os.environ['COMMENTS_URL'] - print("%s %s %s" % (title, prAuthor, comments_url)) result = '' issuem = re.search("(HPCC4J|JAPI)-[0-9]+", title) if issuem: @@ -132,7 +144,7 @@ jobs: if userSearchResults and len(userSearchResults) > 0: jiraUser = userSearchResults[0] else: - print('Error: Unable to find Jira user: ' + prAuthor + ' continuing without assigning') + print('Error: Unable to map GitHub user to Jira user, continuing without assigning') if not jira.issue_exists(issue_name): sys.exit('Error: Unable to find Jira issue: ' + issue_name) @@ -159,8 +171,7 @@ jobs: # Escape the result for JSON result = json.dumps(result) - curlCommand = 'curl -X POST %s -H "Content-Type: application/json" -H "Authorization: token %s" --data \'{ "body": %s }\'' % ( comments_url, github_token, result ) - os.system(curlCommand) + subprocess.run(['curl', '-X', 'POST', comments_url, '-H', 'Content-Type: application/json', '-H', f'Authorization: token {github_token}', '--data', f'{{ "body": {result} }}'], check=True) else: print('Unable to find Jira issue name in title') diff --git a/.github/workflows/JirabotMerge.yml b/.github/workflows/JirabotMerge.yml index 27f4cb449..772dc4fb9 100644 --- a/.github/workflows/JirabotMerge.yml +++ b/.github/workflows/JirabotMerge.yml @@ -202,7 +202,6 @@ jobs: branch_name = os.environ['BRANCH_NAME'] comments_url = os.environ['COMMENTS_URL'] - print("Attempting to close out Jira issue: %s %s %s" % (title, user, comments_url)) result = '' issuem = re.search("(HPCC4J|JAPI)-[0-9]+", title) if issuem: