Skip to content

HTMLWIDGETS-26: Migrate to Platfrom 2.7.0 and Support Java 21 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkayiwa merged 2 commits into from
May 19, 2025
Merged

HTMLWIDGETS-26: Migrate to Platfrom 2.7.0 and Support Java 21 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aa7678
HTMLWIDGETS-26: Migrate to Platfrom 2.7.0 and Support Java 21
wikumChamith May 16, 2025
2fd5b48
Merge branch 'master' into HTMLWIDGETS-26
wikumChamith May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ jobs:

strategy:
matrix:
java: [8]
java: [8, 11, 17, 21, 24]


steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions api/src/test/resources/TestingApplicationContext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion omod/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 8 additions & 2 deletions omod/src/main/java/org/openmrs/module/htmlwidgets/web/demo/Demo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() { }

Expand Down
28 changes: 24 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>

Expand Down