From 9b0618c6a17b84ae2202d79f0eaae4f0fd848d47 Mon Sep 17 00:00:00 2001
From: sudhanshu_raj <rajsudhanshu9431@gmail.com>
Date: Thu, 12 Feb 2026 13:59:23 +0530
Subject: [PATCH 1/2] AM-233 Changed openmrs version to 1.11.6

---
 .../rest/resource/openmrs1_9/AppointmentResource1_9.java        | 2 +-
 pom.xml                                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentResource1_9.java b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentResource1_9.java
index 232dc9a1..3f9a9ea2 100644
--- a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentResource1_9.java
+++ b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentResource1_9.java
@@ -24,7 +24,7 @@
 import org.openmrs.module.webservices.rest.web.resource.impl.DelegatingResourceDescription;
 import org.openmrs.module.webservices.rest.web.resource.impl.NeedsPaging;
 import org.openmrs.module.webservices.rest.web.response.ResponseException;
-import org.openmrs.module.webservices.validation.ValidationException;
+import org.openmrs.api.ValidationException;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Errors;
 
diff --git a/pom.xml b/pom.xml
index 285c491d..8010e91d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 	</modules>
 	
 	<properties>
-		<openMRSVersion>1.9.9</openMRSVersion>
+		<openMRSVersion>1.11.6</openMRSVersion>
 		<webservicesRestVersion>2.5</webservicesRestVersion>
 		<serializationXstreamModuleVersion>0.2.7</serializationXstreamModuleVersion>
 		<calculationModuleVersion>1.0</calculationModuleVersion>

From 9d1786b3f31e4fd7393ffb913ecc9456298447dc Mon Sep 17 00:00:00 2001
From: sudhanshu_raj <rajsudhanshu9431@gmail.com>
Date: Sat, 21 Feb 2026 18:17:10 +0530
Subject: [PATCH 2/2] AM-233: Migrate OpenMRS from 1.9.6 to 1.11.6

---
 ...PatientToAppointmentDataEvaluatorTest.java |  1 -
 .../PersonToAppointmentDataEvaluatorTest.java |  1 -
 .../standardAppointmentTestDataset.xml        |  6 +-
 omod/pom.xml                                  |  2 +-
 .../AppointmentBlockResource1_9.java          | 29 +++++++---
 .../AppointmentRequestResource1_9.java        |  2 +
 .../openmrs1_9/AppointmentResource1_9.java    | 12 ++--
 .../AppointmentStatusHistoryResource1_9.java  |  2 +
 .../ProviderScheduleResource1_9.java          |  2 +
 .../openmrs1_9/TimeSlotResource1_9.java       | 16 +++++-
 ...intmentBlockResource1_9ControllerTest.java |  2 +-
 ...tmentRequestResource1_9ControllerTest.java |  2 +-
 .../AppointmentResource1_9ControllerTest.java |  2 +-
 ...ointmentTypeResource1_9ControllerTest.java |  2 +-
 .../TimeSlotResource1_9ControllerTest.java    |  2 +-
 ...tmentBlockWithTimeSlotResource1_9Test.java |  8 +--
 .../standardWebAppointmentTestDataset.xml     | 57 ++++++++++---------
 pom.xml                                       |  2 +-
 18 files changed, 96 insertions(+), 54 deletions(-)

diff --git a/api/src/test/java/org/openmrs/module/appointmentscheduling/reporting/data/evaluator/PatientToAppointmentDataEvaluatorTest.java b/api/src/test/java/org/openmrs/module/appointmentscheduling/reporting/data/evaluator/PatientToAppointmentDataEvaluatorTest.java
index a74ccd2e..4ac2dc60 100644
--- a/api/src/test/java/org/openmrs/module/appointmentscheduling/reporting/data/evaluator/PatientToAppointmentDataEvaluatorTest.java
+++ b/api/src/test/java/org/openmrs/module/appointmentscheduling/reporting/data/evaluator/PatientToAppointmentDataEvaluatorTest.java
@@ -42,7 +42,6 @@ public void evaluate_shouldReturnPatientDataForEachAppointmentInThePassedContext
     }
 
     @Test
-    @DirtiesContext
     public void evaluate_shouldReturnPatientDataForNonConfidentialAppointments() throws Exception {
         Context.becomeUser("butch");
 
diff --git a/api/src/test/java/org/openmrs/module/appointmentscheduling/reporting/data/evaluator/PersonToAppointmentDataEvaluatorTest.java b/api/src/test/java/org/openmrs/module/appointmentscheduling/reporting/data/evaluator/PersonToAppointmentDataEvaluatorTest.java
index b9b12261..b39c0f6c 100644
--- a/api/src/test/java/org/openmrs/module/appointmentscheduling/reporting/data/evaluator/PersonToAppointmentDataEvaluatorTest.java
+++ b/api/src/test/java/org/openmrs/module/appointmentscheduling/reporting/data/evaluator/PersonToAppointmentDataEvaluatorTest.java
@@ -41,7 +41,6 @@ public void evaluate_shouldReturnPersonDataForEachAppointmentInThePassedContext(
     }
 
     @Test
-    @DirtiesContext
     public void evaluate_shouldReturnPersonDataForNonConfidentialAppointments() throws Exception {
         Context.becomeUser("butch");
 
diff --git a/api/src/test/resources/standardAppointmentTestDataset.xml b/api/src/test/resources/standardAppointmentTestDataset.xml
index d32c0600..76b87844 100644
--- a/api/src/test/resources/standardAppointmentTestDataset.xml
+++ b/api/src/test/resources/standardAppointmentTestDataset.xml
@@ -1,5 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <dataset>
+
+	<provider provider_id="2" person_id="1" identifier="8A760-2" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="c2299800-cca9-11e0-9572-0800200c9a67" />
+	<provider provider_id="3" person_id="1" identifier="8A760-3" creator="1" date_created="2005-01-01 00:00:00.0" retired="true" retire_reason="Test retired provider" uuid="c2299800-cca9-11e0-9572-0800200c9a68" />
+
 	<appointmentscheduling_appointment_type appointment_type_id="1" name="Initial HIV Clinic Appointment" duration="54" description="Initial HIV Clinic Appointment Description" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="c0c579b0-8e59-401d-8a4a-976a0b183519" confidential="1"/>
 	<appointmentscheduling_appointment_type appointment_type_id="2" name="Return TB Clinic Appointment"  duration="5" description="Return TB Clinic Appointment Description" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="759799ab-c9a5-435e-b671-77773ada74e4" confidential="0"/>
 	<appointmentscheduling_appointment_type appointment_type_id="3" name="Hospitalization2" description="Hospitalization Description" duration="10" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" retire_reason="Some Retire Reason" uuid="759799ab-c9a5-435e-b671-77773ada74e6" confidential="0"/>
@@ -54,7 +58,7 @@
     <appointmentscheduling_appointment appointment_id="7" time_slot_id="8" appointment_type_id="1" patient_id="1" status="SCHEDULED" uuid="c0c579b0-8e59-401d-8a4a-976a0b183607" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
     <appointmentscheduling_appointment appointment_id="8" time_slot_id="8" appointment_type_id="1" patient_id="1" status="CANCELLED" cancel_reason="provider sick" uuid="aaaa79b0-8e59-401d-8a4a-976a0b183607" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
     <appointmentscheduling_appointment appointment_id="9" time_slot_id="8" appointment_type_id="1" patient_id="2" status="CANCELLED_AND_NEEDS_RESCHEDULE" uuid="bbbb79b0-8e59-401d-8a4a-976a0b183607" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
-    <appointmentscheduling_appointment appointment_id="10" time_slot_id="8" appointment_type_id="1" patient_id="3" status="SCHEDULED" uuid="cccc79b0-8e59-401d-8a4a-976a0b183607" date_created="2005-01-01 00:00:00.0" voided="true" creator="1"/>
+    <appointmentscheduling_appointment appointment_id="10" time_slot_id="8" appointment_type_id="1" patient_id="2" status="SCHEDULED" uuid="cccc79b0-8e59-401d-8a4a-976a0b183607" date_created="2005-01-01 00:00:00.0" voided="true" creator="1"/>
     <appointmentscheduling_appointment appointment_id="11" time_slot_id="8" appointment_type_id="1" patient_id="6" status="WALKIN" uuid="dddd79b0-8e59-401d-8a4a-976a0b183607" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
     <appointmentscheduling_appointment appointment_id="12" time_slot_id="9" appointment_type_id="1" patient_id="6" status="WALKIN" uuid="dddd79b0-8e59-401d-8a4a-976a0b183608" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
 	<appointmentscheduling_appointment appointment_id="13" time_slot_id="6" appointment_type_id="3" visit_id="2" patient_id="2" status="COMPLETED" uuid="c0c57900-8e59-401d-8a4a-976a0b183605" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
diff --git a/omod/pom.xml b/omod/pom.xml
index 95b17900..1d950b2d 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -43,7 +43,7 @@
 
         <dependency>
             <groupId>org.openmrs.module</groupId>
-            <artifactId>webservices.rest-omod</artifactId>
+            <artifactId>webservices.rest-omod-1.11</artifactId>
             <version>${webservicesRestVersion}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentBlockResource1_9.java b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentBlockResource1_9.java
index 9c2362d5..7f728f9c 100644
--- a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentBlockResource1_9.java
+++ b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentBlockResource1_9.java
@@ -7,10 +7,11 @@
 import org.openmrs.module.appointmentscheduling.api.AppointmentService;
 import org.openmrs.module.appointmentscheduling.rest.controller.AppointmentRestController;
 import org.openmrs.module.appointmentscheduling.rest.resource.openmrs1_9.util.AppointmentRestUtils;
-import org.openmrs.module.webservices.rest.web.ConversionUtil;
-import org.openmrs.module.webservices.rest.web.RequestContext;
-import org.openmrs.module.webservices.rest.web.RestConstants;
-import org.openmrs.module.webservices.rest.web.annotation.Resource;
+import org.openmrs.module.webservices.rest.web.ConversionUtil;
+import org.openmrs.module.webservices.rest.web.RequestContext;
+import org.openmrs.module.webservices.rest.web.RestConstants;
+import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
+import org.openmrs.module.webservices.rest.web.annotation.Resource;
 import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.FullRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.Representation;
@@ -145,9 +146,21 @@ protected PageableResult doSearch(RequestContext context) {
 
 	}
 
-	public String getDisplayString(AppointmentBlock appointmentBlock) {
-		return appointmentBlock.getProvider() + ", " + appointmentBlock.getLocation() + ": "
-		        + appointmentBlock.getStartDate() + " - " + appointmentBlock.getEndDate();
-	}
+	@PropertyGetter("display")
+	public String getDisplayString(AppointmentBlock appointmentBlock) {
+		String providerName = "";
+		if (appointmentBlock.getProvider() != null && appointmentBlock.getProvider().getPerson() != null
+		        && appointmentBlock.getProvider().getPerson().getPersonName() != null) {
+			String fullName = appointmentBlock.getProvider().getPerson().getPersonName().getFullName();
+			String suffix = appointmentBlock.getProvider().getPerson().getPersonName().getFamilyNameSuffix();
+			if (suffix != null && suffix.trim().length() > 0) {
+				providerName = fullName + " " + suffix.trim();
+			} else {
+				providerName = fullName;
+			}
+		}
+		return providerName + ", " + appointmentBlock.getLocation() + ": "
+		        + appointmentBlock.getStartDate() + " - " + appointmentBlock.getEndDate();
+	}
 
 }
diff --git a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentRequestResource1_9.java b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentRequestResource1_9.java
index 8f0666c5..d80e9ce3 100644
--- a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentRequestResource1_9.java
+++ b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentRequestResource1_9.java
@@ -9,6 +9,7 @@
 import org.openmrs.module.appointmentscheduling.rest.controller.AppointmentRestController;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
+import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
 import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.FullRepresentation;
@@ -160,6 +161,7 @@ protected NeedsPaging<AppointmentRequest> doGetAll(RequestContext context) {
                 context.getIncludeAll()), context);
     }
 
+    @PropertyGetter("display")
     public String getDisplayString(AppointmentRequest appointmentRequest) {
         return appointmentRequest.getAppointmentType().getName() + " : " + appointmentRequest.getStatus();
     }
diff --git a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentResource1_9.java b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentResource1_9.java
index 3f9a9ea2..a29178ec 100644
--- a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentResource1_9.java
+++ b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentResource1_9.java
@@ -15,7 +15,8 @@
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
-import org.openmrs.module.webservices.rest.web.annotation.Resource;
+import org.openmrs.module.webservices.rest.web.annotation.Resource;
+import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.FullRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.Representation;
@@ -253,7 +254,8 @@ private List<AppointmentStatus> getStatusList(String[] statuses) {
 		return statusList;
 	}
 
-	public String getDisplayString(PatientAppointment appointment) {
-		return appointment.getAppointmentType().getName() + " : " + appointment.getStatus();
-	}
-}
+	@PropertyGetter("display")
+	public String getDisplayString(PatientAppointment appointment) {
+		return appointment.getAppointmentType().getName() + " : " + appointment.getStatus();
+	}
+}
diff --git a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentStatusHistoryResource1_9.java b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentStatusHistoryResource1_9.java
index ba5edc38..361ed120 100644
--- a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentStatusHistoryResource1_9.java
+++ b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentStatusHistoryResource1_9.java
@@ -7,6 +7,7 @@
 import org.openmrs.module.appointmentscheduling.rest.controller.AppointmentRestController;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
+import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
 import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.FullRepresentation;
@@ -82,6 +83,7 @@ protected PageableResult doSearch(RequestContext context) {
         return new NeedsPaging<AppointmentStatusHistory>(Context.getService(AppointmentService.class).getAppointmentStatusHistories(appointment), context);
     }
 
+    @PropertyGetter("display")
     public String getDisplayString(AppointmentStatusHistory statusHistory) {
         return statusHistory.getStartDate() + "  "+statusHistory.getEndDate();
     }
diff --git a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/ProviderScheduleResource1_9.java b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/ProviderScheduleResource1_9.java
index 76763b1f..8c2786f7 100644
--- a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/ProviderScheduleResource1_9.java
+++ b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/ProviderScheduleResource1_9.java
@@ -10,6 +10,7 @@
 import org.openmrs.module.appointmentscheduling.rest.resource.openmrs1_9.util.AppointmentRestUtils;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
+import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
 import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.FullRepresentation;
@@ -131,6 +132,7 @@ protected PageableResult doSearch(RequestContext context) {
 
     }
 
+    @PropertyGetter("display")
     public String getDisplayString(ProviderSchedule schedule) {
         return schedule.getLocation() + ": "
                 + schedule.getStartTime() + " - " + schedule.getEndTime();
diff --git a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/TimeSlotResource1_9.java b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/TimeSlotResource1_9.java
index c2ca7d48..a538ac7d 100644
--- a/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/TimeSlotResource1_9.java
+++ b/omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/TimeSlotResource1_9.java
@@ -11,6 +11,7 @@
 import org.openmrs.module.webservices.rest.web.ConversionUtil;
 import org.openmrs.module.webservices.rest.web.RequestContext;
 import org.openmrs.module.webservices.rest.web.RestConstants;
+import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
 import org.openmrs.module.webservices.rest.web.annotation.Resource;
 import org.openmrs.module.webservices.rest.web.representation.DefaultRepresentation;
 import org.openmrs.module.webservices.rest.web.representation.FullRepresentation;
@@ -157,8 +158,21 @@ protected PageableResult doSearch(RequestContext context) {
 
 	}
 
+	@PropertyGetter("display")
 	public String getDisplayString(TimeSlot timeSlot) {
-		return timeSlot.getAppointmentBlock().getProvider() + ", " + timeSlot.getAppointmentBlock().getLocation() + ": "
+		String providerName = "";
+		if (timeSlot.getAppointmentBlock().getProvider() != null
+		        && timeSlot.getAppointmentBlock().getProvider().getPerson() != null
+		        && timeSlot.getAppointmentBlock().getProvider().getPerson().getPersonName() != null) {
+			String fullName = timeSlot.getAppointmentBlock().getProvider().getPerson().getPersonName().getFullName();
+			String suffix = timeSlot.getAppointmentBlock().getProvider().getPerson().getPersonName().getFamilyNameSuffix();
+			if (suffix != null && suffix.trim().length() > 0) {
+				providerName = fullName + " " + suffix.trim();
+			} else {
+				providerName = fullName;
+			}
+		}
+		return providerName + ", " + timeSlot.getAppointmentBlock().getLocation() + ": "
 		        + timeSlot.getStartDate() + " - " + timeSlot.getEndDate();
 	}
 
diff --git a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentBlockResource1_9ControllerTest.java b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentBlockResource1_9ControllerTest.java
index 440e0322..3a960243 100644
--- a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentBlockResource1_9ControllerTest.java
+++ b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentBlockResource1_9ControllerTest.java
@@ -149,7 +149,7 @@ public void shouldPurgeAnAppointmentBlock() throws Exception {
 		int originalCount = 5;
 		
 		MockHttpServletRequest req = request(RequestMethod.DELETE, getURI() + "/759799ab-c9a5-435e-b671-77773ada7410");
-		req.addParameter("purge", "");
+		req.addParameter("purge", "true");
 		req.addParameter("reason", "really ridiculous random reason");
 		handle(req);
 		
diff --git a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentRequestResource1_9ControllerTest.java b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentRequestResource1_9ControllerTest.java
index 6a7d19e8..8d2c205c 100644
--- a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentRequestResource1_9ControllerTest.java
+++ b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentRequestResource1_9ControllerTest.java
@@ -138,7 +138,7 @@ public void shouldVoidAnAppointment() throws Exception {
     public void shouldPurgeAnAppointment() throws Exception {
 
         MockHttpServletRequest req = request(RequestMethod.DELETE, getURI() + "/" + getUuid());
-        req.addParameter("purge", "");
+        req.addParameter("purge", "true");
         req.addParameter("reason", "really ridiculous random reason");
         handle(req);
 
diff --git a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentResource1_9ControllerTest.java b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentResource1_9ControllerTest.java
index 1c29a689..ac592f46 100644
--- a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentResource1_9ControllerTest.java
+++ b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentResource1_9ControllerTest.java
@@ -168,7 +168,7 @@ public void shouldPurgeAnAppointment() throws Exception {
 
 		MockHttpServletRequest req = request(RequestMethod.DELETE, getURI()
 				+ "/" + getUuid());
-		req.addParameter("purge", "");
+		req.addParameter("purge", "true");
 		req.addParameter("reason", "really ridiculous random reason");
 		handle(req);
 
diff --git a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentTypeResource1_9ControllerTest.java b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentTypeResource1_9ControllerTest.java
index 93809860..96ac22a0 100644
--- a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentTypeResource1_9ControllerTest.java
+++ b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/AppointmentTypeResource1_9ControllerTest.java
@@ -108,7 +108,7 @@ public void shouldPurgeAnAppointmentType() throws Exception {
 		int originalCount = 4;
 		
 		MockHttpServletRequest req = request(RequestMethod.DELETE, getURI() + "/759799ab-c9a5-435e-b671-77373ada74e6");
-		req.addParameter("purge", "");
+		req.addParameter("purge", "true");
 		req.addParameter("reason", "really ridiculous random reason");
 		handle(req);
 		
diff --git a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/TimeSlotResource1_9ControllerTest.java b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/TimeSlotResource1_9ControllerTest.java
index c0ca9bb3..d6a2daf4 100644
--- a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/TimeSlotResource1_9ControllerTest.java
+++ b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/controller/TimeSlotResource1_9ControllerTest.java
@@ -131,7 +131,7 @@ public void shouldPurgeATimeSlot() throws Exception {
 		int originalCount = 8;
 		
 		MockHttpServletRequest req = request(RequestMethod.DELETE, getURI() + "/c0c579b0-8e59-401d-8a4a-976a0b183607");
-		req.addParameter("purge", "");
+		req.addParameter("purge", "true");
 		req.addParameter("reason", "really ridiculous random reason");
 		handle(req);
 		
diff --git a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentBlockWithTimeSlotResource1_9Test.java b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentBlockWithTimeSlotResource1_9Test.java
index 37295246..7cd21769 100644
--- a/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentBlockWithTimeSlotResource1_9Test.java
+++ b/omod/src/test/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentBlockWithTimeSlotResource1_9Test.java
@@ -48,10 +48,10 @@ public void validateFullRepresentation() throws Exception {
 		assertPropPresent("auditInfo");
 	}
 	
-	@Override
-	public String getDisplayProperty() {
-		return "Mr. Horatio Test Hornblower Esq., Xanadu: 2005-01-03 00:00:00.0 - 2005-01-03 11:00:00.0";
-	}
+	@Override
+	public String getDisplayProperty() {
+		return "Mr. Horatio Test Hornblower Esq., Xanadu: 2005-01-03 00:00:00.0 - 2005-01-03 11:00:00.0";
+	}
 	
 	@Override
 	public String getUuidProperty() {
diff --git a/omod/src/test/resources/standardWebAppointmentTestDataset.xml b/omod/src/test/resources/standardWebAppointmentTestDataset.xml
index 82f9cfd0..35655264 100644
--- a/omod/src/test/resources/standardWebAppointmentTestDataset.xml
+++ b/omod/src/test/resources/standardWebAppointmentTestDataset.xml
@@ -1,5 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <dataset>
+
+	<person person_id="1" voided="false" date_created="2005-01-01 00:00:00.0" uuid="22b47970-8f52-11e3-baa8-0800200c9a66" creator="1" />
+	<person person_id="2" voided="false" date_created="2005-01-01 00:00:00.0" uuid="31e09960-8f52-11e3-baa8-0800200c9a66" creator="1" />
+
+	<provider provider_id="1" person_id="502" identifier="Test Provider" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="c0c549b0-8e59-401d-8a4a-976a0b183599" />
+	<provider provider_id="2" person_id="2" identifier="Test Provider" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="c0c54sd0-8e59-401d-8a4a-976a0b183599" />
+	<provider provider_id="3" person_id="1" identifier="Test Provider" creator="1" date_created="2005-01-01 00:00:00.0" retired="true" retire_reason="Some Retire Reason" uuid="c0c54sd0-8e59-401d-8a4a-976a0b1835p0" />
+
+	<visit visit_id="1" patient_id="2" date_started="2005-01-01 00:00:00.0" uuid="c0c579b0-8e59-401d-8a4a-976a0b183600" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
+	<patient patient_id="1" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" />
+	<patient patient_id="2" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" />
+
+	<location location_id="2" name="Xanadu" description="A metaphor for opulence, most famously in the English Romantic Samuel Taylor Coleridge&apos;s poem Kubla Khan." address1="800 Boylston Street" address2="" city_village="Boston" state_province="MA" postal_code="02115" country="USA" latitude="" longitude="" creator="1" date_created="2008-08-15 13:46:50.0" retired="false" uuid="9356400c-a5a2-4532-8f2b-2361b3446eb7"/>
+	<location location_id="3" name="Xanadu" description="A metaphor for opulence, most famously in the English Romantic Samuel Taylor Coleridge&apos;s poem Kubla Khan." address1="800 Boylston Street" address2="" city_village="Boston" state_province="MA" postal_code="02115" country="USA" latitude="" longitude="" creator="1" date_created="2008-08-15 13:46:50.0" retired="false" uuid="9356400c-a5a2-4532-8f2b-2361b3446eb8" parent_location="2"/>
+	<location location_id="4" name="Xanadu" description="A metaphor for opulence, most famously in the English Romantic Samuel Taylor Coleridge&apos;s poem Kubla Khan." address1="800 Boylston Street" address2="" city_village="Boston" state_province="MA" postal_code="02115" country="USA" latitude="" longitude="" creator="1" date_created="2008-08-15 13:46:50.0" retired="false" uuid="9356400c-a5a2-4532-8f2b-2361b3446eb9" parent_location="3"/>
+
+
 	<appointmentscheduling_appointment_type appointment_type_id="1" name="Initial HIV Clinic Appointment" duration="45" description="Initial HIV Clinic Appointment Description" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="c0c579b0-8e59-401d-8a4a-976a0b183519" confidential="1"/>
 	<appointmentscheduling_appointment_type appointment_type_id="2" name="Return TB Clinic Appointment"  duration="20" description="Return TB Clinic Appointment Description" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="759799ab-c9a5-435e-b671-77773ada74e4" confidential="0"/>
 	<appointmentscheduling_appointment_type appointment_type_id="3" name="Hospitalization2" description="Hospitalization Description" duration="10" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" retire_reason="Some Retire Reason" uuid="759799ab-c9a5-435e-b671-77773ada74e6" confidential="0"/>
@@ -8,43 +25,34 @@
 	<appointmentscheduling_appointment_block appointment_block_id="1" start_date="2005-01-01 00:00:00.0" end_date="2005-01-01 11:00:00.0" provider_id="1" location_id="3"  uuid="c0c579b0-8e59-401d-8a4a-976a0b183599" date_created="2005-01-01 00:00:00.0" date_changed="2005-01-01 00:00:00.0" date_voided="2005-01-01 00:00:00.0" voided="false" creator="1" changed_by="1"/>
 	<appointmentscheduling_appointment_block appointment_block_id="2" start_date="2005-01-02 00:00:00.0" end_date="2005-01-02 11:00:00.0" provider_id="1" location_id="1"  uuid="759799ab-c9a5-435e-b671-77773ada99e9" date_created="2005-01-01 00:00:00.0" date_changed="2005-01-01 00:00:00.0" date_voided="2005-01-01 00:00:00.0" voided="false" void_reason="Some void reason" creator="1" voided_by="1"/>
 	<appointmentscheduling_appointment_block appointment_block_id="3" start_date="2005-01-03 00:00:00.0" end_date="2005-01-03 11:00:00.0" provider_id="2" location_id="2"  uuid="759799ab-c9a5-435e-b671-77773ada7499" date_created="2005-01-01 00:00:00.0" date_changed="2005-01-01 00:00:00.0" date_voided="2005-01-01 00:00:00.0" voided="false" creator="1" changed_by="1"/>
-    <appointmentscheduling_appointment_block appointment_block_id="4" start_date="2005-01-03 00:00:00.0" end_date="2005-01-03 11:00:00.0" provider_id="2" location_id="2"  uuid="759799ab-c9a5-435e-b671-77773ada7410" date_created="2005-01-01 00:00:00.0" date_changed="2005-01-01 00:00:00.0" date_voided="2005-01-01 00:00:00.0" voided="true" void_reason="Some void reason" creator="1" changed_by="1" voided_by="1"/>
-    <appointmentscheduling_appointment_block appointment_block_id="5" start_date="2005-01-03 00:00:00.0" end_date="2005-01-03 11:00:00.0" provider_id="2" location_id="2"  uuid="759799ab-c9a5-435e-b671-77773ada7411" date_created="2005-01-01 00:00:00.0" date_changed="2005-01-01 00:00:00.0" date_voided="2005-01-01 00:00:00.0" voided="false" creator="1" changed_by="1"/>
+	<appointmentscheduling_appointment_block appointment_block_id="4" start_date="2005-01-03 00:00:00.0" end_date="2005-01-03 11:00:00.0" provider_id="2" location_id="2"  uuid="759799ab-c9a5-435e-b671-77773ada7410" date_created="2005-01-01 00:00:00.0" date_changed="2005-01-01 00:00:00.0" date_voided="2005-01-01 00:00:00.0" voided="true" void_reason="Some void reason" creator="1" changed_by="1" voided_by="1"/>
+	<appointmentscheduling_appointment_block appointment_block_id="5" start_date="2005-01-03 00:00:00.0" end_date="2005-01-03 11:00:00.0" provider_id="2" location_id="2"  uuid="759799ab-c9a5-435e-b671-77773ada7411" date_created="2005-01-01 00:00:00.0" date_changed="2005-01-01 00:00:00.0" date_voided="2005-01-01 00:00:00.0" voided="false" creator="1" changed_by="1"/>
+
 
 
-    <provider provider_id="1" person_id="502" identifier="Test Provider" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="c0c549b0-8e59-401d-8a4a-976a0b183599" />
-	<provider provider_id="2" person_id="2" identifier="Test Provider" creator="1" date_created="2005-01-01 00:00:00.0" retired="false" uuid="c0c54sd0-8e59-401d-8a4a-976a0b183599" />
-	<provider provider_id="3" person_id="1" identifier="Test Provider" creator="1" date_created="2005-01-01 00:00:00.0" retired="true" retire_reason="Some Retire Reason" uuid="c0c54sd0-8e59-401d-8a4a-976a0b1835p0" />
-	
 	<appointmentscheduling_block_type_map appointment_block_id="1" appointment_type_id="1"/>
 	<appointmentscheduling_block_type_map appointment_block_id="1" appointment_type_id="2"/>
 	<appointmentscheduling_block_type_map appointment_block_id="1" appointment_type_id="3"/>
-	
+
 	<appointmentscheduling_block_type_map appointment_block_id="2" appointment_type_id="1"/>
 	<appointmentscheduling_block_type_map appointment_block_id="2" appointment_type_id="3"/>
-	
+
 	<appointmentscheduling_block_type_map appointment_block_id="3" appointment_type_id="1"/>
 	<appointmentscheduling_block_type_map appointment_block_id="3" appointment_type_id="2"/>
 
-    <appointmentscheduling_block_type_map appointment_block_id="4" appointment_type_id="3"/>
-    <appointmentscheduling_block_type_map appointment_block_id="5" appointment_type_id="3"/>
+	<appointmentscheduling_block_type_map appointment_block_id="4" appointment_type_id="3"/>
+	<appointmentscheduling_block_type_map appointment_block_id="5" appointment_type_id="3"/>
 
 	<appointmentscheduling_time_slot time_slot_id="1" appointment_block_id="1" start_date="2006-01-01 00:00:00.0" end_date="2006-01-01 01:00:00.0" uuid="c0c579b0-8e59-401d-8a4a-976a0b183604" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
 	<appointmentscheduling_time_slot time_slot_id="2" appointment_block_id="1" start_date="2006-01-01 00:00:00.1" end_date="2006-01-01 01:00:00.1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183605" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
 	<appointmentscheduling_time_slot time_slot_id="3" appointment_block_id="1" start_date="2007-01-01 00:00:00.2" end_date="2007-01-01 01:00:00.0" uuid="c0c579b0-8e59-401d-8a4a-976a0b183606" date_created="2005-01-01 00:00:00.0" voided="true" void_reason="void reason" creator="1" />
 	<appointmentscheduling_time_slot time_slot_id="4" appointment_block_id="1" start_date="2008-01-01 00:00:00.1" end_date="2008-01-01 01:00:00.1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183607" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
-    <appointmentscheduling_time_slot time_slot_id="5" appointment_block_id="2" start_date="2008-01-01 00:00:00.1" end_date="2008-01-01 01:00:00.1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183608" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
-    <appointmentscheduling_time_slot time_slot_id="6" appointment_block_id="2" start_date="2008-01-01 00:00:00.1" end_date="2008-01-01 01:00:00.1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183609" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
-    <appointmentscheduling_time_slot time_slot_id="7" appointment_block_id="3" start_date="2005-01-03 00:00:00.1" end_date="2005-01-03 01:00:00.1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183610" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
-    <appointmentscheduling_time_slot time_slot_id="8" appointment_block_id="5" start_date="2005-01-03 00:00:00.1" end_date="2005-01-03 01:00:00.1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183611" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
+	<appointmentscheduling_time_slot time_slot_id="5" appointment_block_id="2" start_date="2008-01-01 00:00:00.1" end_date="2008-01-01 01:00:00.1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183608" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
+	<appointmentscheduling_time_slot time_slot_id="6" appointment_block_id="2" start_date="2008-01-01 00:00:00.1" end_date="2008-01-01 01:00:00.1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183609" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
+	<appointmentscheduling_time_slot time_slot_id="7" appointment_block_id="3" start_date="2005-01-03 00:00:00.1" end_date="2005-01-03 01:00:00.1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183610" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
+	<appointmentscheduling_time_slot time_slot_id="8" appointment_block_id="5" start_date="2005-01-03 00:00:00.1" end_date="2005-01-03 01:00:00.1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183611" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
 
 
-    <visit visit_id="1" patient_id="2" date_started="2005-01-01 00:00:00.0" uuid="c0c579b0-8e59-401d-8a4a-976a0b183600" date_created="2005-01-01 00:00:00.0" voided="false" creator="1" />
-	<patient patient_id="1" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" />
-	<patient patient_id="2" creator="1" date_created="2005-01-01 00:00:00.0" voided="false" />
-
-    <person person_id="1" voided="false" date_created="2005-01-01 00:00:00.0" uuid="22b47970-8f52-11e3-baa8-0800200c9a66" creator="1" />
-    <person person_id="2" voided="false" date_created="2005-01-01 00:00:00.0" uuid="31e09960-8f52-11e3-baa8-0800200c9a66" creator="1" />
 
 	<appointmentscheduling_appointment appointment_id="1" time_slot_id="1" appointment_type_id="1" patient_id="1" status="SCHEDULED" uuid="c0c579b0-8e59-401d-8a4a-976a0b183601" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
 	<appointmentscheduling_appointment appointment_id="2" time_slot_id="2" appointment_type_id="1" patient_id="2" status="MISSED" visit_id="1" uuid="c0c579b0-8e59-401d-8a4a-976a0b183602" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
@@ -58,13 +66,10 @@
 	<appointmentscheduling_appointment_status_history appointment_status_history_id="2" appointment_id="1" status="INCONSULTATION" start_date="2005-01-01 00:30:00.0" end_date="2005-01-01 02:00:00.0"/>
 	<appointmentscheduling_appointment_status_history appointment_status_history_id="3" appointment_id="2" status="MISSED" start_date="2005-01-01 00:00:00.0" end_date="2005-01-01 00:00:00.0"/>
 
-    <appointmentscheduling_appointment_request appointment_request_id="1" appointment_type_id="1" patient_id="2" provider_id="1" status="PENDING" requested_on="2014-01-01 00:00:00.0" requested_by="1" min_time_frame_value="0" min_time_frame_units="DAYS" max_time_frame_value="7" max_time_frame_units="DAYS" notes="ASAP" uuid="862c94f0-3dae-11e4-916c-0800200c9a66" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
-    <appointmentscheduling_appointment_request appointment_request_id="2" appointment_type_id="2" patient_id="6" provider_id="1" status="FULFILLED" requested_on="2014-01-02 00:00:00.0" requested_by="2" min_time_frame_value="6" min_time_frame_units="WEEKS" max_time_frame_value="2" max_time_frame_units="MONTHS" uuid="862c94f1-3dae-11e4-916c-0800200c9a66" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
-    <appointmentscheduling_appointment_request appointment_request_id="3" appointment_type_id="2" patient_id="6" provider_id="2" status="CANCELLED" requested_on="2014-01-03 00:00:00.0" requested_by="2" uuid="862c94f2-3dae-11e4-916c-0800200c9a66" date_created="2005-01-01 00:00:00.0" voided="true" creator="1"/>
+	<appointmentscheduling_appointment_request appointment_request_id="1" appointment_type_id="1" patient_id="2" provider_id="1" status="PENDING" requested_on="2014-01-01 00:00:00.0" requested_by="1" min_time_frame_value="0" min_time_frame_units="DAYS" max_time_frame_value="7" max_time_frame_units="DAYS" notes="ASAP" uuid="862c94f0-3dae-11e4-916c-0800200c9a66" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
+	<appointmentscheduling_appointment_request appointment_request_id="2" appointment_type_id="2" patient_id="6" provider_id="1" status="FULFILLED" requested_on="2014-01-02 00:00:00.0" requested_by="2" min_time_frame_value="6" min_time_frame_units="WEEKS" max_time_frame_value="2" max_time_frame_units="MONTHS" uuid="862c94f1-3dae-11e4-916c-0800200c9a66" date_created="2005-01-01 00:00:00.0" voided="false" creator="1"/>
+	<appointmentscheduling_appointment_request appointment_request_id="3" appointment_type_id="2" patient_id="6" provider_id="2" status="CANCELLED" requested_on="2014-01-03 00:00:00.0" requested_by="2" uuid="862c94f2-3dae-11e4-916c-0800200c9a66" date_created="2005-01-01 00:00:00.0" voided="true" creator="1"/>
 
-    <location location_id="2" name="Xanadu" description="A metaphor for opulence, most famously in the English Romantic Samuel Taylor Coleridge&apos;s poem Kubla Khan." address1="800 Boylston Street" address2="" city_village="Boston" state_province="MA" postal_code="02115" country="USA" latitude="" longitude="" creator="1" date_created="2008-08-15 13:46:50.0" retired="false" uuid="9356400c-a5a2-4532-8f2b-2361b3446eb7"/>
-	<location location_id="3" name="Xanadu" description="A metaphor for opulence, most famously in the English Romantic Samuel Taylor Coleridge&apos;s poem Kubla Khan." address1="800 Boylston Street" address2="" city_village="Boston" state_province="MA" postal_code="02115" country="USA" latitude="" longitude="" creator="1" date_created="2008-08-15 13:46:50.0" retired="false" uuid="9356400c-a5a2-4532-8f2b-2361b3446eb8" parent_location="2"/>
-	<location location_id="4" name="Xanadu" description="A metaphor for opulence, most famously in the English Romantic Samuel Taylor Coleridge&apos;s poem Kubla Khan." address1="800 Boylston Street" address2="" city_village="Boston" state_province="MA" postal_code="02115" country="USA" latitude="" longitude="" creator="1" date_created="2008-08-15 13:46:50.0" retired="false" uuid="9356400c-a5a2-4532-8f2b-2361b3446eb9" parent_location="3"/>
 
 	<appointmentscheduling_provider_schedule provider_schedule_id="1" start_date="2019-05-05 00:00:00.0" end_date="2119-05-05 00:00:00.0" start_time = "07:00:00" end_time="18:00:00" provider_id="1" location_id="3"  uuid="c0c579b0-ffff-401d-8a4a-976a0b183599" date_created="2019-05-05 00:00:00.0" date_changed="2019-05-05 00:00:00.0" date_voided="2019-05-05 00:00:00.0" voided="false" creator="1" changed_by="1"/>
 	<appointmentscheduling_provider_schedule provider_schedule_id="2" start_date="2019-05-05 00:00:00.0" end_date="2119-05-05 00:00:00.0" start_time = "07:00:00" end_time="18:00:00" provider_id="1" location_id="2"  uuid="759799ab-gggg-435e-b671-77773ada99e9" date_created="2019-05-05 00:00:00.0" date_changed="2019-05-05 00:00:00.0" date_voided="2019-05-05 00:00:00.0" voided="false" creator="1" />
diff --git a/pom.xml b/pom.xml
index 8010e91d..655d87f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
 	
 	<properties>
 		<openMRSVersion>1.11.6</openMRSVersion>
-		<webservicesRestVersion>2.5</webservicesRestVersion>
+		<webservicesRestVersion>2.23.0</webservicesRestVersion>
 		<serializationXstreamModuleVersion>0.2.7</serializationXstreamModuleVersion>
 		<calculationModuleVersion>1.0</calculationModuleVersion>
 		<reportingModuleVersion>0.9.2</reportingModuleVersion>