Oclomrs 1085 - Upgrade to depend on OpenMRS 2.1.0 (#95)

openmrs · Jan 28, 2022 · 8a19d59 · 8a19d59
1 parent e544160
commit 8a19d59
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 28 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -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>

diff --git a/omod/pom.xml b/omod/pom.xml
@@ -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>
@@ -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>

diff --git a/omod/src/main/resources/config.xml b/omod/src/main/resources/config.xml
@@ -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 -->

diff --git a/owa/pom.xml b/owa/pom.xml
@@ -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>

diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>