Skip to content

Commit 92411d1

Browse files
wikumChamithibacher
wikumChamith
and
ibacher
authored
Update the module to Platform 3.x (#221)
* Rebase with main * Update the module to platform 3.x * Migrate from XML MVC annotations -> Java Config * Deal with some problems in the ConceptFormControllerTest * Fix DWRConceptServiceTest errors * Fix ProgramFormControllerTest error * Fix ConceptFormController lazy initialization error * Fix ConceptFormControllerTest initialization issue * Add "provided" scope to dependencies in omod/pom.xml * Migrate to Jakarta EE by replacing javax.* references with jakarta.* and updating dependencies * Exclude additional taglibs artifacts from dependencies in pom.xml * Migrate JSP taglib references from javax.* to jakarta.* for Jakarta EE compatibility * Migrate JSP taglib and tag class references from javax.* to jakarta.* for Jakarta EE compatibility. * Remove JSTL core validation from c-rt.tld as it is no longer needed * Remove legacy tag library definitions and migrate JSP to use Jakarta EE taglibs * Remove the c-rt.tld file. * Remove JSTL dependencies and update JSP files for Jakarta taglibs compatibility. * Add Jakarta taglib references to JSP files for compatibility. * Introduce `LegacyCatchAllController` to handle legacy URL mappings and centralize fallback logic. * Replace lang with lang3 * Replace spring theme with CSS * Fix maven version mismatch * Remove older java versions from the CI * Bump the version to 3.0.0-SNAPSHOT * Revert formatting changes in ConceptFormControllerTest --------- Co-authored-by: Ian <ian.c.bacher@gmail.com>
1 parent 21d4b2c commit 92411d1

File tree

458 files changed

+1658
-2981
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+1658
-2981
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# this build is designed to replicate the Travis CI workflow
12
name: Build with Maven
23

34
on:
@@ -11,5 +12,5 @@ jobs:
1112
build:
1213
uses: openmrs/openmrs-contrib-gha-workflows/.github/workflows/build-backend-module.yml@main
1314
with:
14-
java_versions: '[8, 11, 17, 21, 25]'
15-
main_java_version: '8'
15+
java_versions: '[21, 25]'
16+
main_java_version: '21'

‎api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.openmrs.module</groupId>
1717
<artifactId>legacyui</artifactId>
18-
<version>2.1.0-SNAPSHOT</version>
18+
<version>3.0.0-SNAPSHOT</version>
1919
</parent>
2020

2121
<artifactId>legacyui-api</artifactId>

‎omod/pom.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.openmrs.module</groupId>
1717
<artifactId>legacyui</artifactId>
18-
<version>2.1.0-SNAPSHOT</version>
18+
<version>3.0.0-SNAPSHOT</version>
1919
</parent>
2020

2121
<artifactId>legacyui-omod</artifactId>
@@ -51,6 +51,12 @@
5151
<groupId>org.openmrs.api</groupId>
5252
<artifactId>openmrs-api</artifactId>
5353
<type>jar</type>
54+
<exclusions>
55+
<exclusion>
56+
<groupId>org.codehaus.groovy</groupId>
57+
<artifactId>groovy-all</artifactId>
58+
</exclusion>
59+
</exclusions>
5460
</dependency>
5561

5662
<dependency>
@@ -111,33 +117,27 @@
111117
<dependency>
112118
<groupId>org.openmrs.contrib</groupId>
113119
<artifactId>dwr</artifactId>
114-
<version>${openmrsContribDwrVersion}</version>
120+
<version>3.0.0-SNAPSHOT</version>
115121
</dependency>
116122

117-
<dependency>
118-
<groupId>javax.servlet</groupId>
119-
<artifactId>javax.servlet-api</artifactId>
120-
<version>3.0.1</version>
121-
<scope>provided</scope>
122-
</dependency>
123-
124123
<dependency>
125124
<groupId>jfree</groupId>
126125
<artifactId>jfreechart</artifactId>
127126
</dependency>
128127

129-
<dependency>
130-
<groupId>javax.servlet</groupId>
131-
<artifactId>jsp-api</artifactId>
132-
</dependency>
133128

134129
<dependency>
135130
<groupId>org.mockito</groupId>
136131
<artifactId>mockito-inline</artifactId>
137132
<scope>test</scope>
138133
</dependency>
139134

140-
135+
<dependency>
136+
<groupId>org.apache.commons</groupId>
137+
<artifactId>commons-fileupload2-jakarta</artifactId>
138+
<version>2.0.0-M1</version>
139+
<scope>provided</scope>
140+
</dependency>
141141
</dependencies>
142142

143143
<build>

‎omod/src/main/java/org/openmrs/hl7/web/HL7InQueueProcessorServlet.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
import java.io.IOException;
1313

14-
import javax.servlet.ServletException;
15-
import javax.servlet.ServletOutputStream;
16-
import javax.servlet.http.HttpServlet;
17-
import javax.servlet.http.HttpServletRequest;
18-
import javax.servlet.http.HttpServletResponse;
19-
import javax.servlet.http.HttpSession;
14+
import jakarta.servlet.ServletException;
15+
import jakarta.servlet.ServletOutputStream;
16+
import jakarta.servlet.http.HttpServlet;
17+
import jakarta.servlet.http.HttpServletRequest;
18+
import jakarta.servlet.http.HttpServletResponse;
19+
import jakarta.servlet.http.HttpSession;
2020

2121
import org.openmrs.api.context.Context;
2222
import org.openmrs.hl7.HL7InQueueProcessor;

‎omod/src/main/java/org/openmrs/module/web/controller/ModuleListController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import java.util.List;
2424
import java.util.Map;
2525

26-
import javax.servlet.ServletException;
27-
import javax.servlet.http.HttpServletRequest;
28-
import javax.servlet.http.HttpServletResponse;
29-
import javax.servlet.http.HttpSession;
26+
import jakarta.servlet.ServletException;
27+
import jakarta.servlet.http.HttpServletRequest;
28+
import jakarta.servlet.http.HttpServletResponse;
29+
import jakarta.servlet.http.HttpSession;
3030

3131
import org.apache.commons.logging.Log;
3232
import org.apache.commons.logging.LogFactory;

‎omod/src/main/java/org/openmrs/module/web/controller/ModuleManagementController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import java.io.IOException;
1313
import java.util.List;
1414

15-
import javax.servlet.http.HttpServletRequest;
16-
import javax.servlet.http.HttpServletResponse;
15+
import jakarta.servlet.http.HttpServletRequest;
16+
import jakarta.servlet.http.HttpServletResponse;
1717

1818
import org.apache.commons.logging.Log;
1919
import org.apache.commons.logging.LogFactory;

‎omod/src/main/java/org/openmrs/module/web/controller/ModulePropertiesFormController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
import java.util.HashMap;
1313
import java.util.Map;
1414

15-
import javax.servlet.ServletException;
16-
import javax.servlet.http.HttpServletRequest;
17-
import javax.servlet.http.HttpServletResponse;
18-
import javax.servlet.http.HttpSession;
15+
import jakarta.servlet.ServletException;
16+
import jakarta.servlet.http.HttpServletRequest;
17+
import jakarta.servlet.http.HttpServletResponse;
18+
import jakarta.servlet.http.HttpSession;
1919

2020
import org.apache.commons.logging.Log;
2121
import org.apache.commons.logging.LogFactory;

‎omod/src/main/java/org/openmrs/module/web/filter/AdminPageFilter.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
import java.io.IOException;
1313

14-
import javax.servlet.Filter;
15-
import javax.servlet.FilterChain;
16-
import javax.servlet.FilterConfig;
17-
import javax.servlet.ServletException;
18-
import javax.servlet.ServletRequest;
19-
import javax.servlet.ServletResponse;
14+
import jakarta.servlet.Filter;
15+
import jakarta.servlet.FilterChain;
16+
import jakarta.servlet.FilterConfig;
17+
import jakarta.servlet.ServletException;
18+
import jakarta.servlet.ServletRequest;
19+
import jakarta.servlet.ServletResponse;
2020

2121
public class AdminPageFilter implements Filter {
2222

‎omod/src/main/java/org/openmrs/module/web/filter/ForcePasswordChangeFilter.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111

1212
import java.io.IOException;
1313

14-
import javax.servlet.Filter;
15-
import javax.servlet.FilterChain;
16-
import javax.servlet.FilterConfig;
17-
import javax.servlet.ServletException;
18-
import javax.servlet.ServletRequest;
19-
import javax.servlet.ServletResponse;
20-
import javax.servlet.http.HttpServletRequest;
21-
import javax.servlet.http.HttpServletResponse;
14+
import jakarta.servlet.Filter;
15+
import jakarta.servlet.FilterChain;
16+
import jakarta.servlet.FilterConfig;
17+
import jakarta.servlet.ServletException;
18+
import jakarta.servlet.ServletRequest;
19+
import jakarta.servlet.ServletResponse;
20+
import jakarta.servlet.http.HttpServletRequest;
21+
import jakarta.servlet.http.HttpServletResponse;
2222

2323
import org.openmrs.api.context.Context;
2424
import org.openmrs.web.user.UserProperties;

‎omod/src/main/java/org/openmrs/module/web/filter/RedirectAfterLoginFilter.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111

1212
import static org.openmrs.web.WebConstants.OPENMRS_LOGIN_REDIRECT_HTTPSESSION_ATTR;
1313

14-
import javax.servlet.Filter;
15-
import javax.servlet.FilterChain;
16-
import javax.servlet.FilterConfig;
17-
import javax.servlet.ServletException;
18-
import javax.servlet.ServletRequest;
19-
import javax.servlet.ServletResponse;
20-
import javax.servlet.http.HttpServletRequest;
21-
import javax.servlet.http.HttpSession;
14+
import jakarta.servlet.Filter;
15+
import jakarta.servlet.FilterChain;
16+
import jakarta.servlet.FilterConfig;
17+
import jakarta.servlet.ServletException;
18+
import jakarta.servlet.ServletRequest;
19+
import jakarta.servlet.ServletResponse;
20+
import jakarta.servlet.http.HttpServletRequest;
21+
import jakarta.servlet.http.HttpSession;
2222
import java.io.IOException;
2323

24-
import org.apache.commons.lang.StringUtils;
24+
import org.apache.commons.lang3.StringUtils;
2525
import org.openmrs.api.context.Context;
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;

0 commit comments

Comments
 (0)