From 12d0f69ecbf9181b1fef74255cdc792881215115 Mon Sep 17 00:00:00 2001
From: Ya-Lan Yang <ylyang@illinois.edu>
Date: Fri, 13 Sep 2024 19:32:15 +0800
Subject: [PATCH 1/3] upgrade hsql to 2.7.1

---
 CHANGELOG.md                | 1 +
 datawolf-webapp-all/pom.xml | 1 +
 datawolf-webapp/pom.xml     | 1 +
 file-webapp/pom.xml         | 1 +
 ncsa-common-jpa/pom.xml     | 1 +
 pom.xml                     | 3 ++-
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 466c9a4d..b64422a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - Kubernetes executor prints exception [#23](https://github.com/ncsa/datawolf/issues/23)
+- Clean dependency updates [#27](https://github.com/ncsa/datawolf/issues/27)
 
 ## [4.6.0] - 2023-02-15
 
diff --git a/datawolf-webapp-all/pom.xml b/datawolf-webapp-all/pom.xml
index 75b23f15..51b5abcd 100644
--- a/datawolf-webapp-all/pom.xml
+++ b/datawolf-webapp-all/pom.xml
@@ -40,6 +40,7 @@
 			<artifactId>hsqldb</artifactId>
 			<version>${hsql.version}</version>
 			<scope>runtime</scope>
+			<classifier>jdk8</classifier>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
diff --git a/datawolf-webapp/pom.xml b/datawolf-webapp/pom.xml
index 5d474e10..8e556569 100644
--- a/datawolf-webapp/pom.xml
+++ b/datawolf-webapp/pom.xml
@@ -28,6 +28,7 @@
 			<artifactId>hsqldb</artifactId>
 			<version>${hsql.version}</version>
 			<scope>runtime</scope>
+			<classifier>jdk8</classifier>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
diff --git a/file-webapp/pom.xml b/file-webapp/pom.xml
index 09ffd453..bc3a6f3c 100644
--- a/file-webapp/pom.xml
+++ b/file-webapp/pom.xml
@@ -57,6 +57,7 @@
 			<artifactId>hsqldb</artifactId>
 			<version>${hsql.version}</version>
 			<scope>runtime</scope>
+			<classifier>jdk8</classifier>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
diff --git a/ncsa-common-jpa/pom.xml b/ncsa-common-jpa/pom.xml
index 8097b46b..6e311fc3 100644
--- a/ncsa-common-jpa/pom.xml
+++ b/ncsa-common-jpa/pom.xml
@@ -73,6 +73,7 @@
 			<artifactId>hsqldb</artifactId>
 			<version>${hsql.version}</version>
 			<scope>test</scope>
+			<classifier>jdk8</classifier>
 		</dependency>
 
 		<dependency>
diff --git a/pom.xml b/pom.xml
index b15ca67d..c98b9517 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<hibernate.jpa.version>1.0.0.Final</hibernate.jpa.version>
 		<hibernate.version>4.3.5.Final</hibernate.version>
-		<hsql.version>2.3.2</hsql.version>
+		<hsql.version>2.7.1</hsql.version>
 		<mysql.version>5.1.34</mysql.version>
 		<postgresql.version>42.4.0</postgresql.version>
 		<apache.http.version>4.5.13</apache.http.version>
@@ -159,6 +159,7 @@
 			<artifactId>hsqldb</artifactId>
 			<version>${hsql.version}</version>
 			<scope>test</scope>
+			<classifier>jdk8</classifier>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

From 91fb22b134b1c4b43e558f2a609ebb84b1eb38bf Mon Sep 17 00:00:00 2001
From: Ya-Lan Yang <ylyang@illinois.edu>
Date: Fri, 20 Sep 2024 11:22:44 -0500
Subject: [PATCH 2/3] version upgrade to 2.7.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c98b9517..e80f1f27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<hibernate.jpa.version>1.0.0.Final</hibernate.jpa.version>
 		<hibernate.version>4.3.5.Final</hibernate.version>
-		<hsql.version>2.7.1</hsql.version>
+		<hsql.version>2.7.3</hsql.version>
 		<mysql.version>5.1.34</mysql.version>
 		<postgresql.version>42.4.0</postgresql.version>
 		<apache.http.version>4.5.13</apache.http.version>

From 1dcdeb841d455828dd84bd6d83e0d892a7c00f46 Mon Sep 17 00:00:00 2001
From: Ya-Lan Yang <ylyang@illinois.edu>
Date: Fri, 20 Sep 2024 15:33:49 -0500
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b64422a8..5b28732e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 - Kubernetes executor prints exception [#23](https://github.com/ncsa/datawolf/issues/23)
-- Clean dependency updates [#27](https://github.com/ncsa/datawolf/issues/27)
+- Upgrade hsqldb to 2.7.3 [#27](https://github.com/ncsa/datawolf/issues/27)
 
 ## [4.6.0] - 2023-02-15