fix poms

Bahmni · Mar 8, 2017 · 4dc21d0 · 4dc21d0
1 parent 90c4ada
commit 4dc21d0
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 30 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -85,41 +85,50 @@
             <artifactId>bahmnicore-api</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.bahmni.module</groupId>
             <artifactId>bahmnicore-api</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.bahmni.module</groupId>
             <artifactId>bahmni-mapping</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>calculation-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>serialization.xstream-api-2.0</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>reporting-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.ict4h.openmrs</groupId>
             <artifactId>openmrs-atomfeed-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>providermanagement-api</artifactId>
         </dependency>
 
+        <!-- Other dependencies -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+
     </dependencies>
 
 </project>
diff --git a/omod/pom.xml b/omod/pom.xml
@@ -114,31 +114,83 @@
             <groupId>org.openmrs.module</groupId>
             <artifactId>webservices.rest-omod-common</artifactId>
             <classifier>tests</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openmrs.module</groupId>
             <artifactId>episodes-api</artifactId>
-            <version>${episodes.version}</version>
-            <scope>provided</scope>
             <type>jar</type>
         </dependency>
 
-        <!-- Test Module Dependencies -->
-
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>calculation-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>serialization.xstream-api-2.0</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>reporting-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.openmrs.module</groupId>
             <artifactId>providermanagement-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.openmrs.module</groupId>
+            <artifactId>legacyui-omod</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openmrs.module</groupId>
+            <artifactId>uiframework-api</artifactId>
+            <version>${uiframeworkVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bahmni.module</groupId>
+            <artifactId>bahmni-migrator</artifactId>
+            <version>${bahmniVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bahmni.module</groupId>
+            <artifactId>file-uploader</artifactId>
+            <version>${bahmniVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bahmni.module</groupId>
+            <artifactId>admin</artifactId>
+            <version>${bahmniVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bahmni.module</groupId>
+            <artifactId>reference-data-api</artifactId>
+            <version>${bahmniVersion}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.6.3</version>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
         <bahmniVersion>0.88-SNAPSHOT</bahmniVersion>
         <bahmniEndTbVersion>1.8-SNAPSHOT</bahmniEndTbVersion>
         <emrapi-omod.version>1.20</emrapi-omod.version>
-        <episodes.version>1.0-SNAPSHOT</episodes.version>
+        <episodesVersion>1.0-SNAPSHOT</episodesVersion>
         <legacyuiVersion>1.0</legacyuiVersion>
         <dataintegrityVersion>4.2.3</dataintegrityVersion>
         <uiframeworkVersion>3.3.1</uiframeworkVersion>
@@ -145,7 +145,6 @@
                 <scope>provided</scope>
                 <type>jar</type>
             </dependency>
-            <!-- End OpenMRS core -->
 
             <dependency>
                 <groupId>org.openmrs.module</groupId>
@@ -187,67 +186,58 @@
                 <scope>test</scope>
             </dependency>
 
-            <!-- Test Module Dependencies -->
+            <!-- Test Dependencies -->
 
             <dependency>
                 <groupId>org.bahmni.module</groupId>
                 <artifactId>bahmni-mapping</artifactId>
                 <version>${bahmniVersion}</version>
                 <scope>test</scope>
             </dependency>
+
             <dependency>
                 <groupId>org.openmrs.module</groupId>
                 <artifactId>calculation-api</artifactId>
                 <version>${calculationModuleVersion}</version>
                 <scope>test</scope>
             </dependency>
+
             <dependency>
                 <groupId>org.openmrs.module</groupId>
                 <artifactId>serialization.xstream-api-2.0</artifactId>
                 <version>${serializationXstreamModuleVersion}</version>
                 <scope>test</scope>
             </dependency>
+
             <dependency>
                 <groupId>org.openmrs.module</groupId>
-                <artifactId>providermanagement-api</artifactId>
-                <version>1.1.3</version>
+                <artifactId>reporting-api</artifactId>
+                <version>${reportingModuleVersion}</version>
                 <scope>test</scope>
             </dependency>
 
             <dependency>
-                <groupId>org.bahmni.module</groupId>
-                <artifactId>bahmni-emr-api</artifactId>
-                <version>${bahmniVersion}</version>
-                <scope>provided</scope>
-                <type>jar</type>
-            </dependency>
-            <!-- Begin Data Integrity omod -->
-            <dependency>
-                <groupId>org.openmrs.module</groupId>
-                <artifactId>dataintegrity-omod</artifactId>
-                <version>${dataintegrityVersion}</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.openmrs.module</groupId>
-                <artifactId>reporting-api</artifactId>
-                <version>${reportingModuleVersion}</version>
+                <groupId>org.ict4h.openmrs</groupId>
+                <artifactId>openmrs-atomfeed-api</artifactId>
+                <version>${atomfeedVersion}</version>
                 <scope>test</scope>
             </dependency>
+
             <dependency>
                 <groupId>org.openmrs.module</groupId>
-                <artifactId>dataintegrity-api</artifactId>
-                <version>${dataintegrityVersion}</version>
-                <scope>provided</scope>
+                <artifactId>providermanagement-api</artifactId>
+                <version>${providermanagementVersion}</version>
+                <scope>test</scope>
             </dependency>
-            <!-- End Data Integrity omod  -->
 
+            <!-- Other dependencies -->
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
                 <version>3.0.1</version>
                 <scope>provided</scope>
             </dependency>
+
         </dependencies>
     </dependencyManagement>