Skip to content
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

Oclomrs 1085 - Upgrade to depend on OpenMRS 2.1.0 #95

Merged
merged 2 commits into from
Jan 28, 2022
Merged

Oclomrs 1085 - Upgrade to depend on OpenMRS 2.1.0 #95

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
229a57b
OCLOMRS-1085 Update openconceptlab module to require OpenMRS 2.x
mseaton Jan 28, 2022
4cbddfc
OCLOMRS-1085 Update openconceptlab module to require OpenMRS 2.x
mseaton Jan 28, 2022
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
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 @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>openconceptlab</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>openconceptlab-api</artifactId>
Expand Down
36 changes: 15 additions & 21 deletions omod/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,14 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>openconceptlab</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>openconceptlab-omod</artifactId>
<packaging>jar</packaging>
<name>Open Concept Lab Module OMOD</name>
<description>OMOD project for OpenConceptLab</description>

<profiles>
<profile>
<id>2.2</id>
<dependencies>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-omod</artifactId>
<version>${legacyuiVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
Expand Down Expand Up @@ -63,6 +43,20 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-omod</artifactId>
<version>${legacyuiVersion}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>webservices.rest-omod-1.8</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion omod/src/main/resources/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
${project.parent.description}
</description>
<updateURL>https://modules.openmrs.org/modules/download/${project.parent.artifactId}/anImport.rdf</updateURL>
<require_version>1.9.9</require_version>
<require_version>${openmrsVersion}</require_version>
<!-- / Module Properties -->
<require_modules>
<require_module version="${webservices.restVersion}">org.openmrs.module.webservices.rest</require_module>
</require_modules>

<aware_of_modules>
<aware_of_module>org.openmrs.module.owa</aware_of_module>
<aware_of_module>org.openmrs.module.legacyui</aware_of_module>
</aware_of_modules>

<!-- Module Activator -->
Expand Down
2 changes: 1 addition & 1 deletion owa/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>openconceptlab</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>openconceptlab-owa</artifactId>
Expand Down
15 changes: 11 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>openconceptlab</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Open Concept Lab Module</name>
<description>Sustainable solution for using the CIEL dictionary and applying changes over time</description>
Expand Down Expand Up @@ -54,7 +54,7 @@
</modules>

<properties>
<openmrsVersion>1.9.11</openmrsVersion>
<openmrsVersion>2.1.0</openmrsVersion>
<legacyuiVersion>1.9.0</legacyuiVersion>
<webservices.restVersion>2.29.0</webservices.restVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -90,6 +90,13 @@

<!-- End OpenMRS core -->

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>legacyui-api</artifactId>
<version>${legacyuiVersion}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
Expand All @@ -106,14 +113,14 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.13</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
<scope>compile</scope>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down