From ffeb38eb6215bd2222d9cd1a40e574be61177643 Mon Sep 17 00:00:00 2001
From: rlowery11nttd <Richard11.Lowery@nttdata.com>
Date: Fri, 15 May 2020 08:13:54 -0400
Subject: [PATCH 1/5] merged from upstream

---
 cloud-provider/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cloud-provider/pom.xml b/cloud-provider/pom.xml
index 7e8ba2f..15c3f4f 100644
--- a/cloud-provider/pom.xml
+++ b/cloud-provider/pom.xml
@@ -35,5 +35,10 @@
             <artifactId>org-openide-dialogs</artifactId>
             <version>${netbeans.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>jeddict-lib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

From 8692e92b71478a79942eea3c65faa6002f1de1e7 Mon Sep 17 00:00:00 2001
From: rlowery11nttd <Richard11.Lowery@nttdata.com>
Date: Thu, 15 Oct 2020 11:53:48 -0400
Subject: [PATCH 2/5] resync with upstream

---
 cloud-provider/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/cloud-provider/pom.xml b/cloud-provider/pom.xml
index c35216b..6716271 100644
--- a/cloud-provider/pom.xml
+++ b/cloud-provider/pom.xml
@@ -35,10 +35,5 @@
             <artifactId>org-openide-dialogs</artifactId>
             <version>${netbeans.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>jeddict-lib</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
 </project>

From 33213d29421abc6da8a944526192777269a929b3 Mon Sep 17 00:00:00 2001
From: rlowery11nttd <Richard11.Lowery@nttdata.com>
Date: Wed, 28 Oct 2020 08:35:41 -0400
Subject: [PATCH 3/5] fix(version-bump): yarn to 1.22.10

---
 .../io/github/jeddict/client/angular/template/pom/pom.xml.ejs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-client/src/main/resources/io/github/jeddict/client/angular/template/pom/pom.xml.ejs b/web-client/src/main/resources/io/github/jeddict/client/angular/template/pom/pom.xml.ejs
index af74016..34a6226 100644
--- a/web-client/src/main/resources/io/github/jeddict/client/angular/template/pom/pom.xml.ejs
+++ b/web-client/src/main/resources/io/github/jeddict/client/angular/template/pom/pom.xml.ejs
@@ -14,7 +14,7 @@
         <npm.version>v5.6.0</npm.version>
             <%_ } _%>
             <%_ if (clientPackageManager === 'yarn') { _%>
-        <yarn.version>v1.3.2</yarn.version>
+        <yarn.version>v1.22.10</yarn.version>
             <%_ } _%>
         <%_ } _%>
         <version.frontend-maven-plugin>1.9.1</version.frontend-maven-plugin>

From 9be8508043a46dab013c6a877867f90904955b0a Mon Sep 17 00:00:00 2001
From: rlowery11nttd <Richard11.Lowery@nttdata.com>
Date: Wed, 15 Mar 2023 10:29:20 -0400
Subject: [PATCH 4/5] feat(netbeans17): updated to netbeans 17

---
 cloud-provider/pom.xml | 2 +-
 pom.xml                | 6 +++---
 web-client/pom.xml     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cloud-provider/pom.xml b/cloud-provider/pom.xml
index 44b4af5..9f984b3 100644
--- a/cloud-provider/pom.xml
+++ b/cloud-provider/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.jeddict</groupId>
         <artifactId>hipee</artifactId>
-        <version>6.1.0</version>
+        <version>6.3.0</version>
     </parent>
     <artifactId>cloud-provider</artifactId>
     <name>Cloud Provider</name>
diff --git a/pom.xml b/pom.xml
index 8e8f9f6..70d023a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>io.github.jeddict</groupId>
     <artifactId>hipee</artifactId>
     <name>Hipee</name>
-    <version>6.1.0</version>
+    <version>6.3.0</version>
     <packaging>pom</packaging>
     <modules>
         <module>web-client</module>
@@ -13,7 +13,7 @@
     <properties>
         <root.dir>${basedir}</root.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <netbeans.version>RELEASE150</netbeans.version>
+        <netbeans.version>RELEASE170</netbeans.version>
         <netbeans.installation>${root.dir}/../incubator-netbeans/nbbuild/netbeans</netbeans.installation>
         <nbm.cluster>jeddict</nbm.cluster>
         <nbm.build.dir>${root.dir}/../jeddict-cluster</nbm.build.dir>
@@ -112,4 +112,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/web-client/pom.xml b/web-client/pom.xml
index 70e45e2..8064af3 100644
--- a/web-client/pom.xml
+++ b/web-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.jeddict</groupId>
         <artifactId>hipee</artifactId>
-        <version>6.1.0</version>
+        <version>6.3.0</version>
     </parent>
     <artifactId>web-client</artifactId>
     <name>Web Client</name>
@@ -55,4 +55,4 @@
             <version>${netbeans.version}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

From 4741859353ed42b970aed8e0574657a873b95d2b Mon Sep 17 00:00:00 2001
From: Richard Lowery <richardlowery@northwesternmutual.com>
Date: Wed, 15 Mar 2023 10:44:09 -0400
Subject: [PATCH 5/5] feat(netbeans17): updated for netbeans17

---
 cloud-provider/pom.xml | 2 +-
 web-client/pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud-provider/pom.xml b/cloud-provider/pom.xml
index 9f984b3..ca1acd2 100644
--- a/cloud-provider/pom.xml
+++ b/cloud-provider/pom.xml
@@ -36,4 +36,4 @@
             <version>${netbeans.version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/web-client/pom.xml b/web-client/pom.xml
index 8064af3..f964aff 100644
--- a/web-client/pom.xml
+++ b/web-client/pom.xml
@@ -55,4 +55,4 @@
             <version>${netbeans.version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file