From e896519a2cfbfb6a17cfe97e55a3248bca8b9963 Mon Sep 17 00:00:00 2001
From: edwincruz <ecruz165@yahoo.com>
Date: Tue, 2 May 2023 00:41:20 -0400
Subject: [PATCH 1/3] Upgraded maven libs to latest versions and added spring
 boot 2.3.0 as parent to drive versions provided by spring boot.

---
 pom.xml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index d81f3ac..51fc912 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,11 @@
 	<groupId>org.ohdsi</groupId>
 	<artifactId>SkeletonCohortCharacterization</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.3.0.RELEASE</version>
+	</parent>
 	<build>
 		<sourceDirectory>${basedir}/java/main/java</sourceDirectory>
 		<outputDirectory>${basedir}/target/classes</outputDirectory>
@@ -25,7 +30,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.5.1</version>
+				<version>3.11.0</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -35,7 +40,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.1.1</version>
+				<version>3.5.0</version>
 				<executions>
 					<execution>
 						<id>copy-installed</id>
@@ -87,7 +92,7 @@
 		<repository>
 			<id>ohdsi</id>
 			<name>repo.ohdsi.org</name>
-			<url>https://repo.ohdsi.org/nexus/content/groups/public</url>
+			<url>https://repo.ohdsi.org/nexus/content/groups/public/</url>
 		</repository>
 	</repositories>
 
@@ -113,7 +118,7 @@
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20170516</version>
+			<version>20230227</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ohdsi</groupId>
@@ -138,37 +143,34 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
-			<version>1.5.20.RELEASE</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest</artifactId>
-			<version>2.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.dbunit</groupId>
 			<artifactId>dbunit</artifactId>
-			<version>2.7.0</version>
+			<version>2.7.3</version>
 			<scope>test</scope>
 		</dependency>    
 		<dependency>
 			<groupId>com.github.mjeanroy</groupId>
 			<artifactId>dbunit-plus</artifactId>
-			<version>2.0.1</version>
+			<version>2.2.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.opentable.components</groupId>
 			<artifactId>otj-pg-embedded</artifactId>
-			<version>0.13.3</version>
+			<version>0.13.4</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

From 010891c4fbb299888f2676e4f93b2032a1d5b06d Mon Sep 17 00:00:00 2001
From: edwincruz <ecruz165@yahoo.com>
Date: Mon, 8 May 2023 09:59:21 -0400
Subject: [PATCH 2/3] Converted parent to bom for dependency managemeent.

---
 pom.xml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 51fc912..800b8a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,12 +6,23 @@
 
 	<groupId>org.ohdsi</groupId>
 	<artifactId>SkeletonCohortCharacterization</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
-	</parent>
+	<version>2.1.0-SNAPSHOT</version>
+	<properties>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<spring.dependencies.version>2.3.0.RELEASE</spring.dependencies.version>
+	</properties>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${spring.dependencies.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<build>
 		<sourceDirectory>${basedir}/java/main/java</sourceDirectory>
 		<outputDirectory>${basedir}/target/classes</outputDirectory>

From ab5e2b524a37e0fdf2b6dc0c8d339e4adf266862 Mon Sep 17 00:00:00 2001
From: edwincruz <ecruz165@yahoo.com>
Date: Mon, 8 May 2023 10:11:13 -0400
Subject: [PATCH 3/3] Converted parent to bom for dependency management.

---
 pom.xml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 800b8a5..40efa63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,9 +8,11 @@
 	<artifactId>SkeletonCohortCharacterization</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
 	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<spring.dependencies.version>2.3.0.RELEASE</spring.dependencies.version>
+		<arachne.version>1.16.3</arachne.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -94,11 +96,6 @@
 		<url>https://github.com/OHDSI/SkeletonCohortCharacterization</url>
 		<tag>HEAD</tag>
 	</scm>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<arachne.version>1.16.3</arachne.version>
-	</properties>
-
 	<repositories>
 		<repository>
 			<id>ohdsi</id>