From 4aa7678b1f40fe8d6e5ccc0ca1910bfdedea5ad7 Mon Sep 17 00:00:00 2001
From: Wikum Weerakutti <wikum@linuxdeveloper.space>
Date: Fri, 16 May 2025 18:11:35 +0530
Subject: [PATCH] HTMLWIDGETS-26: Migrate to Platfrom 2.7.0 and Support Java 21

---
 .github/workflows/maven.yml                   | 29 +++++++++++++++++++
 api/pom.xml                                   |  2 +-
 .../resources/TestingApplicationContext.xml   | 16 +++++-----
 omod/pom.xml                                  |  2 +-
 .../module/htmlwidgets/web/demo/Demo.java     | 10 +++++--
 pom.xml                                       | 28 +++++++++++++++---
 6 files changed, 71 insertions(+), 16 deletions(-)
 create mode 100644 .github/workflows/maven.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..56c6d8a
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,29 @@
+# this build is designed to replicate the Travis CI workflow
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java: [8, 11, 17, 21, 24]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build with Maven
+        run: mvn clean install --file pom.xml
diff --git a/api/pom.xml b/api/pom.xml
index 15d6a03..37241fe 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>htmlwidgets</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>htmlwidgets-api</artifactId>
 	<packaging>jar</packaging>
diff --git a/api/src/test/resources/TestingApplicationContext.xml b/api/src/test/resources/TestingApplicationContext.xml
index 81c3d56..8bc821d 100644
--- a/api/src/test/resources/TestingApplicationContext.xml
+++ b/api/src/test/resources/TestingApplicationContext.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/context
-		http://www.springframework.org/schema/context/spring-context-3.0.xsd
-		http://www.springframework.org/schema/util
-		http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+		http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 	
 	<!-- 
 	From applicationContext-service.xml in openmrs-api
@@ -23,6 +18,11 @@
 		<property name="mappingJarLocations">
 			<ref bean="mappingJarResources" />
 		</property>
+		<property name="packagesToScan">
+			<list>
+				<value>org.openmrs</value>
+			</list>
+		</property>
 		<!--  default properties must be set in the hibernate.default.properties -->
 	</bean>
 	
diff --git a/omod/pom.xml b/omod/pom.xml
index 8909585..2fbfc10 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.openmrs.module</groupId>
 		<artifactId>htmlwidgets</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>htmlwidgets-omod</artifactId>
 	<packaging>jar</packaging>
diff --git a/omod/src/main/java/org/openmrs/module/htmlwidgets/web/demo/Demo.java b/omod/src/main/java/org/openmrs/module/htmlwidgets/web/demo/Demo.java
index 3e86a43..75d19ea 100644
--- a/omod/src/main/java/org/openmrs/module/htmlwidgets/web/demo/Demo.java
+++ b/omod/src/main/java/org/openmrs/module/htmlwidgets/web/demo/Demo.java
@@ -34,14 +34,20 @@
 import org.openmrs.ProgramWorkflow;
 import org.openmrs.ProgramWorkflowState;
 import org.openmrs.User;
-import org.openmrs.api.PatientSetService.PatientLocationMethod;
 
 /**
  * Demonstration / test bean to encapsulate the properties that can be set
  * using the Widget Framework
  */
 public class Demo {
-		
+
+	enum PatientLocationMethod {
+		EARLIEST_ENCOUNTER,
+		LATEST_ENCOUNTER,
+		ANY_ENCOUNTER,
+		PATIENT_HEALTH_CENTER;
+	}
+
 	// ******* CONSTRUCTORS ********
 	public Demo() { }
 	
diff --git a/pom.xml b/pom.xml
index 7fa6092..86fd802 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.openmrs.module</groupId>
 	<artifactId>htmlwidgets</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>HTML Widgets</name>
 	<description>Parent project for HTML Widgets</description>
@@ -69,6 +69,16 @@
 			<classifier>tests</classifier>
 			<type>jar</type>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-api-mockito</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-api-mockito2</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>
@@ -77,11 +87,21 @@
 			<version>${openMRSVersion}</version>
 			<type>pom</type>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-api-mockito</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.powermock</groupId>
+					<artifactId>powermock-api-mockito2</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 
 	<properties>
-		<openMRSVersion>1.9.9</openMRSVersion>
+		<openMRSVersion>2.7.3</openMRSVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<MODULE_ID>${project.parent.artifactId}</MODULE_ID>
@@ -154,8 +174,8 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<configuration>
-						<target>1.6</target>
-						<source>1.6</source>
+						<target>1.8</target>
+						<source>1.8</source>
 					</configuration>
 				</plugin>