Skip to content

Commit 582b151

Browse files
wikumChamithwikumChamith
committed
3.x
1 parent f775002 commit 582b151

File tree

223 files changed

+687
-679
lines changed

Some content is hidden

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

223 files changed

+687
-679
lines changed

‎omod/pom.xml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,32 +111,33 @@
111111
<dependency>
112112
<groupId>org.openmrs.contrib</groupId>
113113
<artifactId>dwr</artifactId>
114-
<version>2.0.8-mod-SNAPSHOT</version>
114+
<version>3.0.0-SNAPSHOT</version>
115115
</dependency>
116116

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-
124117
<dependency>
125118
<groupId>jfree</groupId>
126119
<artifactId>jfreechart</artifactId>
127120
</dependency>
128121

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

134123
<dependency>
135124
<groupId>org.mockito</groupId>
136125
<artifactId>mockito-inline</artifactId>
137126
<scope>test</scope>
138127
</dependency>
139128

129+
<dependency>
130+
<groupId>org.apache.commons</groupId>
131+
<artifactId>commons-fileupload2-jakarta</artifactId>
132+
<version>2.0.0-M1</version>
133+
</dependency>
134+
135+
<dependency>
136+
<groupId>jakarta.servlet.jsp.jstl</groupId>
137+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
138+
<version>3.0.2</version>
139+
</dependency>
140+
140141

141142
</dependencies>
142143

‎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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
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

2424
import org.apache.commons.lang.StringUtils;

‎omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPointTag.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
import java.util.List;
1717
import java.util.Map;
1818

19-
import javax.servlet.jsp.JspException;
20-
import javax.servlet.jsp.JspTagException;
21-
import javax.servlet.jsp.tagext.BodyContent;
22-
import javax.servlet.jsp.tagext.BodyTag;
23-
import javax.servlet.jsp.tagext.TagSupport;
19+
import jakarta.servlet.jsp.JspException;
20+
import jakarta.servlet.jsp.JspTagException;
21+
import jakarta.servlet.jsp.tagext.BodyContent;
22+
import jakarta.servlet.jsp.tagext.BodyTag;
23+
import jakarta.servlet.jsp.tagext.TagSupport;
2424

2525
import org.apache.commons.logging.Log;
2626
import org.apache.commons.logging.LogFactory;

‎omod/src/main/java/org/openmrs/module/web/taglib/ExtensionPopupMenuTag.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import java.util.Random;
1616
import java.util.Map;
1717

18-
import javax.servlet.http.HttpServletRequest;
19-
import javax.servlet.jsp.JspException;
20-
import javax.servlet.jsp.tagext.TagSupport;
18+
import jakarta.servlet.http.HttpServletRequest;
19+
import jakarta.servlet.jsp.JspException;
20+
import jakarta.servlet.jsp.tagext.TagSupport;
2121

2222
import org.apache.commons.logging.Log;
2323
import org.apache.commons.logging.LogFactory;

0 commit comments

Comments
 (0)