From 6e48611b87553085f77251892968374a6b94b2e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Bontyes?= <michaelbontyes@gmail.com>
Date: Fri, 19 May 2023 12:00:08 -0400
Subject: [PATCH] 3.0.0-beta.8

---
 distro/pom.xml | 37 ++++++++++---------------------------
 pom.xml        | 26 ++------------------------
 2 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/distro/pom.xml b/distro/pom.xml
index 5c98575..b5165bc 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -25,14 +25,15 @@
          we do so here so that we can utilise Maven to track updates, etc. -->
     <fhir2.version>1.9.0</fhir2.version>
     <openmrs.version>2.6.0</openmrs.version>
-    <initializer.version>2.5.0</initializer.version>
+    <datafilter.version>2.1.1</datafilter.version>
+    <initializer.version>2.5.1</initializer.version>
     <webservices.rest.version>2.39.0</webservices.rest.version>
     <addresshierarchy.version>2.15.1</addresshierarchy.version>
-    <idgen.version>4.10.0</idgen.version>
+    <idgen.version>4.10.0-SNAPSHOT</idgen.version>
     <legacyui.version>1.15.0</legacyui.version>
     <metadatamapping.version>1.6.0</metadatamapping.version>
     <metadatasharing.version>1.9.0</metadatasharing.version>
-    <openconceptlab.version>2.1.0</openconceptlab.version>
+    <openconceptlab.version>2.1.0-SNAPSHOT</openconceptlab.version>
     <!-- this is request for the OCL UI -->
     <owa.version>1.14.0</owa.version>
     <attachments.version>3.0.0</attachments.version>
@@ -58,6 +59,12 @@
     </dependency>
 
     <!-- Module dependencies -->
+    <dependency>
+      <groupId>org.openmrs.module</groupId>
+      <artifactId>datafilter-omod</artifactId>
+      <version>${datafilter.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.openmrs.module</groupId>
       <artifactId>initializer-omod</artifactId>
@@ -221,7 +228,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
@@ -261,27 +267,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>validator</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.openmrs.maven.plugins</groupId>
-            <artifactId>openmrs-packager-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>validate-configurations</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>validate-configurations</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2c0fcb8..c1113cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,11 +111,6 @@
           <artifactId>openmrs-sdk-maven-plugin</artifactId>
           <version>4.5.0</version>
         </plugin>
-        <plugin>
-          <groupId>org.openmrs.maven.plugins</groupId>
-          <artifactId>openmrs-packager-maven-plugin</artifactId>
-          <version>1.7.0</version>
-        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -141,9 +136,6 @@
       <snapshots>
         <enabled>true</enabled>
       </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
     </repository>
     <repository>
       <id>mks-nexus-public</id>
@@ -183,20 +175,6 @@
       <snapshots>
         <enabled>true</enabled>
       </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </pluginRepository>
-    <pluginRepository>
-      <id>mks-nexus-public</id>
-      <url>https://nexus.mekomsolutions.net/repository/maven-public/</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>mks-nexus-snapshots</id>
-      <url>https://nexus.mekomsolutions.net/repository/maven-snapshots/</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
     </pluginRepository>
   </pluginRepositories>
 
@@ -204,7 +182,7 @@
     <repository>
       <id>openmrs-repo-releases</id>
       <name>OpenMRS Releases Repo</name>
-      <url>https://mavenrepo.openmrs.org/releases</url>
+      <url>https://openmrs.jfrog.io/artifactory/releases</url>
     </repository>
     <snapshotRepository>
       <id>openmrs-repo-snapshots</id>
@@ -212,4 +190,4 @@
       <url>https://mavenrepo.openmrs.org/snapshots</url>
     </snapshotRepository>
   </distributionManagement>
-</project>
\ No newline at end of file
+</project>