Merge 8239342 into 440b51a

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/CareSettingResource1_10.java

@@ -35,7 +35,7 @@
  * {@link org.openmrs.CareSetting}, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/caresetting", supportedClass = CareSetting.class, supportedOpenmrsVersions = {
-        "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.10.* - 9.*" })
 public class CareSettingResource1_10 extends MetadataDelegatingCrudResource<CareSetting> {
 
 	/**

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/DrugOrderSubclassHandler1_10.java

@@ -37,7 +37,7 @@
  * Exposes the {@link org.openmrs.DrugOrder} subclass as a type in
  * {@link org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_10.DrugOrderSubclassHandler1_10}
  */
-@SubClassHandler(supportedClass = DrugOrder.class, supportedOpenmrsVersions = { "1.10.*", "1.11.*" })
+@SubClassHandler(supportedClass = DrugOrder.class, supportedOpenmrsVersions = { "1.10.* - 1.11.*" })
 public class DrugOrderSubclassHandler1_10 extends DrugOrderSubclassHandler1_8 {
 
 	/**

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/DrugReferenceMapResource1_10.java

@@ -33,8 +33,7 @@
 import org.openmrs.module.webservices.rest.web.RestConstants;
 
 @Resource(name = RestConstants.VERSION_1
-        + "/drugreferencemap", supportedClass = DrugReferenceMap.class, supportedOpenmrsVersions = { "1.10.*", "1.11.*",
-        "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        + "/drugreferencemap", supportedClass = DrugReferenceMap.class, supportedOpenmrsVersions = { "1.10.* - 9.*" })
 public class DrugReferenceMapResource1_10 extends DelegatingCrudResource<DrugReferenceMap> {
 
 	@Override

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderEntryConfigResource1_10.java

@@ -21,7 +21,7 @@
 
 // the framework requires we specify a supportedClass, even though this shouldn't have one
 @Resource(name = RestConstants.VERSION_1 + "/orderentryconfig", supportedClass = OrderService.class, supportedOpenmrsVersions = {
-        "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.10.* - 9.*" })
 public class OrderEntryConfigResource1_10 implements Listable {
 
 	@Override

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderFrequencyResource1_10.java

@@ -30,7 +30,7 @@
  * {@link Resource} for {@link OrderFrequency}, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/orderfrequency", supportedClass = OrderFrequency.class, supportedOpenmrsVersions = {
-        "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.10.* - 9.*" })
 public class OrderFrequencyResource1_10 extends MetadataDelegatingCrudResource<OrderFrequency> {
 
 	/**

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderResource1_10.java

@@ -49,8 +49,7 @@
  * {@link org.openmrs.module.webservices.rest.web.annotation.Resource} for {@link org.openmrs.Order}
  * , supporting standard CRUD operations
  */
-@Resource(name = RestConstants.VERSION_1 + "/order", supportedClass = Order.class, supportedOpenmrsVersions = { "1.10.*",
-        "1.11.*", "1.12.*", "2.0.*", "2.1.*" })
+@Resource(name = RestConstants.VERSION_1 + "/order", supportedClass = Order.class, supportedOpenmrsVersions = { "1.10.* - 2.1.*" })
 public class OrderResource1_10 extends OrderResource1_8 {
 
 	/**

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderTypeResource1_10.java

@@ -36,7 +36,7 @@
  * {@link Resource} for {@link org.openmrs.OrderType}, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/ordertype", supportedClass = OrderType.class, supportedOpenmrsVersions = {
-        "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.10.* - 9.*" })
 public class OrderTypeResource1_10 extends MetadataDelegatingCrudResource<OrderType> {
 
 	/**

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/OrderableResource1_10.java

@@ -42,7 +42,7 @@
  * orderable. It returns ConceptSearchResults instead of Concepts
  */
 @Resource(name = RestConstants.VERSION_1 + "/orderable", supportedClass = ConceptSearchResult.class, supportedOpenmrsVersions = {
-        "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.10.* - 9.*" })
 public class OrderableResource1_10 extends BaseDelegatingResource<ConceptSearchResult> implements Searchable {
 
 	/**

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/PersonResource1_10.java

@@ -22,7 +22,7 @@
  * {@link Resource} for Person, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/person", order = 3, supportedClass = Person.class, supportedOpenmrsVersions = {
-        "1.10.4 - 1.10.6" })
+        "1.10.4 - 1.10.*" })
 public class PersonResource1_10 extends PersonResource1_8 {
 
 	/**

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramEnrollmentResource1_10.java

@@ -36,7 +36,7 @@
 import java.util.Set;
 
 @Resource(name = RestConstants.VERSION_1 + "/programenrollment", supportedClass = PatientProgram.class, supportedOpenmrsVersions = {
-        "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.10.* - 9.*" })
 public class ProgramEnrollmentResource1_10 extends ProgramEnrollmentResource1_8 {
 
 	@Override

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/ProgramResource1_10.java

@@ -24,7 +24,7 @@
 import org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8.ProgramResource1_8;
 
 @Resource(name = RestConstants.VERSION_1 + "/program", supportedClass = Program.class, supportedOpenmrsVersions = {
-        "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.10.* - 9.*" })
 public class ProgramResource1_10 extends ProgramResource1_8 {
 
 	@Override

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_10/TestOrderSubclassHandler1_10.java

@@ -45,8 +45,7 @@
  * Exposes the {@link org.openmrs.TestOrder} subclass as a type in
  * {@link org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8.OrderResource1_8}
  */
-@SubClassHandler(supportedClass = TestOrder.class, supportedOpenmrsVersions = { "1.10.*", "1.11.*", "1.12.*", "2.0.*",
-        "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+@SubClassHandler(supportedClass = TestOrder.class, supportedOpenmrsVersions = { "1.10.* - 9.*" })
 public class TestOrderSubclassHandler1_10 extends BaseDelegatingSubclassHandler<Order, TestOrder> implements DelegatingSubclassHandler<Order, TestOrder> {
 
 	/**

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchByMappingHandler1_10.java

@@ -10,7 +10,7 @@
 package org.openmrs.module.webservices.rest.web.v1_0.search.openmrs1_10;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
@@ -56,7 +56,7 @@ public class DrugSearchByMappingHandler1_10 implements SearchHandler {
 	        .withOptionalParameters(REQUEST_PARAM_CODE, REQUEST_PARAM_MAP_TYPES).build();
 
 	private final SearchConfig searchConfig = new SearchConfig("getDrugByMapping", RestConstants.VERSION_1 + "/drug",
-	        Arrays.asList("1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*"), searchQuery);
+			Collections.singletonList("1.10.* - 9.*"), searchQuery);
 
 	/**
 	 * @see org.openmrs.module.webservices.rest.web.resource.api.SearchHandler#getSearchConfig()

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugSearchHandler1_10.java

@@ -9,7 +9,7 @@
  */
 package org.openmrs.module.webservices.rest.web.v1_0.search.openmrs1_10;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
@@ -53,8 +53,8 @@ public class DrugSearchHandler1_10 implements SearchHandler {
 	        + " drug reference term mappings").withRequiredParameters(REQUEST_PARAM_QUERY)
 	        .withOptionalParameters(REQUEST_PARAM_LOCALE, REQUEST_PARAM_EXACT_LOCALE).build();
 
-	private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/drug", Arrays.asList(
-	    "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*"), searchQuery);
+	private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/drug",
+			Collections.singletonList("1.10.* - 9.*"), searchQuery);
 
 	/**
 	 * @see org.openmrs.module.webservices.rest.web.resource.api.SearchHandler#getSearchConfig()

omod-1.10/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_10/DrugsSearchByMappingHandler1_10.java

@@ -10,7 +10,7 @@
 package org.openmrs.module.webservices.rest.web.v1_0.search.openmrs1_10;
 
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
@@ -55,7 +55,7 @@ public class DrugsSearchByMappingHandler1_10 implements SearchHandler {
 	        .withOptionalParameters(REQUEST_PARAM_CODE, REQUEST_PARAM_MAP_TYPES).build();
 
 	private final SearchConfig searchConfig = new SearchConfig("getDrugsByMapping", RestConstants.VERSION_1 + "/drug",
-	        Arrays.asList("1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*"), searchQuery);
+			Collections.singletonList("1.10.* - 9.*"), searchQuery);
 
 	/**
 	 * @see org.openmrs.module.webservices.rest.web.resource.api.SearchHandler#getSearchConfig()

omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/ConceptResource1_11.java

@@ -17,7 +17,7 @@
 import org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_9.ConceptResource1_9;
 
 @Resource(name = RestConstants.VERSION_1 + "/concept", supportedClass = Concept.class, supportedOpenmrsVersions = {
-        "1.11.*", "1.12.*" })
+        "1.11.* - 1.12.*" })
 public class ConceptResource1_11 extends ConceptResource1_9 {
 
 	/**

omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/DrugIngredientResource1_11.java

@@ -37,7 +37,7 @@
  * {@link Resource} for DrugIngredient, supporting standard CRUD operations
  */
 @SubResource(parent = DrugResource1_11.class, path = "ingredient", supportedClass = DrugIngredient.class, supportedOpenmrsVersions = {
-        "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.11.* - 9.*" })
 public class DrugIngredientResource1_11 extends DelegatingSubResource<DrugIngredient, Drug, DrugResource1_11> {
 
 	@Override

omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/EncounterRoleResource1_11.java

@@ -21,7 +21,7 @@
  * {@link Resource} for {@link EncounterRole}, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/encounterrole", supportedClass = EncounterRole.class, supportedOpenmrsVersions = {
-        "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.11.* - 9.*" })
 public class EncounterRoleResource1_11 extends EncounterRoleResource1_9 {
 
 	/**

omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/ObsResource1_11.java

@@ -22,7 +22,7 @@
 import org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_9.ObsResource1_9;
 
 @Resource(name = RestConstants.VERSION_1 + "/obs", order = 1, supportedClass = Obs.class, supportedOpenmrsVersions = {
-        "1.11.*", "1.12.*", "2.0.*" })
+        "1.11.* - 2.0.*" })
 public class ObsResource1_11 extends ObsResource1_9 {
 
 	/**

omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_11/PersonResource1_11.java

@@ -27,7 +27,7 @@
  * {@link Resource} for Person, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/person", order = 1, supportedClass = Person.class, supportedOpenmrsVersions = {
-        "1.11.*", "1.12.*", "2.0.*", "2.1.*" })
+        "1.11.* - 2.1.*" })
 public class PersonResource1_11 extends PersonResource1_10 {
 
 	/**

omod-1.11/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_11/LivingPatientSearchHandler1_11.java

@@ -12,6 +12,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
@@ -32,10 +33,10 @@
 public class LivingPatientSearchHandler1_11 implements SearchHandler {
 
 	private final SearchConfig searchConfig = new SearchConfig("default", RestConstants.VERSION_1 + "/patient",
-	        Arrays.asList("1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*"),
-	        Arrays.asList(
-	                new SearchQuery.Builder("Allows you to find all patients including the dead or only living patients")
-	                        .withRequiredParameters("q").withOptionalParameters("includeDead").build()));
+			Collections.singletonList("1.11.* - 9.*"),
+			Collections.singletonList(
+					new SearchQuery.Builder("Allows you to find all patients including the dead or only living patients")
+							.withRequiredParameters("q").withOptionalParameters("includeDead").build()));
 
 	@Override
 	public SearchConfig getSearchConfig() {

omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/DrugOrderSubclassHandler1_12.java

@@ -21,8 +21,7 @@
  * Exposes the {@link org.openmrs.DrugOrder} subclass as a type in
  * {@link org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_10.DrugOrderSubclassHandler1_10}
  */
-@SubClassHandler(supportedClass = DrugOrder.class, supportedOpenmrsVersions = { "1.12.*", "2.0.*", "2.1.*", "2.2.*",
-        "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+@SubClassHandler(supportedClass = DrugOrder.class, supportedOpenmrsVersions = { "1.12.* - 9.*" })
 public class DrugOrderSubclassHandler1_12 extends DrugOrderSubclassHandler1_10 {
 
 	/**

omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/DrugResource1_12.java

@@ -23,7 +23,7 @@
  * {@link Resource} for {@link Drug}, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/drug", order = 1, supportedClass = Drug.class, supportedOpenmrsVersions = {
-        "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.12.* - 9.*" })
 public class DrugResource1_12 extends DrugResource1_11 {
 
 	/**

omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderGroupResource1_12.java

@@ -35,7 +35,7 @@
 import io.swagger.models.properties.StringProperty;
 
 @Resource(name = RestConstants.VERSION_1 + "/ordergroup", supportedClass = OrderGroup.class, supportedOpenmrsVersions = {
-        "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.12.* - 9.*" })
 public class OrderGroupResource1_12 extends DataDelegatingCrudResource<OrderGroup> {
 
 	@Override

omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderSetMemberResource1_12.java

@@ -41,7 +41,7 @@
  * {@link Resource} for OrderSetMembers, supporting standard CRUD operations
  */
 @SubResource(parent = OrderSetResource1_12.class, path = "ordersetmember", supportedClass = OrderSetMember.class, supportedOpenmrsVersions = {
-        "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.12.* - 9.*" })
 public class OrderSetMemberResource1_12 extends DelegatingSubResource<OrderSetMember, OrderSet, OrderSetResource1_12> {
 
 	@Override

omod-1.12/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_12/OrderSetResource1_12.java

@@ -35,7 +35,7 @@
 import java.util.List;
 
 @Resource(name = RestConstants.VERSION_1 + "/orderset", supportedClass = OrderSet.class, supportedOpenmrsVersions = {
-        "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.12.* - 9.*" })
 public class OrderSetResource1_12 extends MetadataDelegatingCrudResource<OrderSet> {
 
 	@Override

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ActiveListTypeResource1_8.java

@@ -23,7 +23,7 @@
  * {@link Resource} for ActiveListType, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/activelisttype", supportedClass = ActiveListType.class, supportedOpenmrsVersions = {
-        "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*" })
+        "1.8.* - 1.12.*" })
 public class ActiveListTypeResource1_8 extends MetadataDelegatingCrudResource<ActiveListType> {
 
 	/**

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/CohortMemberResource1_8.java

@@ -42,7 +42,7 @@
  * Sub-resource for cohort members
  */
 @SubResource(parent = CohortResource1_8.class, path = "member", supportedClass = CohortMember1_8.class, supportedOpenmrsVersions = {
-        "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*" })
+        "1.8.* - 2.0.*" })
 public class CohortMemberResource1_8 extends DelegatingSubResource<CohortMember1_8, Cohort, CohortResource1_8> {
 
 	/**

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/CohortResource1_8.java

@@ -33,8 +33,7 @@
 /**
  * {@link Resource} for Cohorts, supporting standard CRUD operations
  */
-@Resource(name = RestConstants.VERSION_1 + "/cohort", supportedClass = Cohort.class, supportedOpenmrsVersions = { "1.8.*",
-        "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*" })
+@Resource(name = RestConstants.VERSION_1 + "/cohort", supportedClass = Cohort.class, supportedOpenmrsVersions = { "1.8.* - 2.0.*" })
 public class CohortResource1_8 extends DataDelegatingCrudResource<Cohort> {
 
 	/**

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptClassResource1_8.java

@@ -25,7 +25,7 @@
  * {@link Resource} for {@link ConceptClass}, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/conceptclass", supportedClass = ConceptClass.class, supportedOpenmrsVersions = {
-        "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.8.* - 9.*" })
 public class ConceptClassResource1_8 extends MetadataDelegatingCrudResource<ConceptClass> {
 
 	/**

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptDatatypeResource1_8.java

@@ -33,7 +33,7 @@
  * {@link Resource} for {@link ConceptDatatype}, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/conceptdatatype", supportedClass = ConceptDatatype.class, supportedOpenmrsVersions = {
-        "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*" })
+        "1.8.* - 1.12.*" })
 public class ConceptDatatypeResource1_8 extends MetadataDelegatingCrudResource<ConceptDatatype> {
 
 	/**

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/ConceptSourceResource1_8.java

@@ -36,7 +36,7 @@
  * {@link Resource} for {@link ConceptSource}, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/conceptsource", supportedClass = ConceptSource.class, supportedOpenmrsVersions = {
-        "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*" })
+        "1.8.* - 1.12.*" })
 public class ConceptSourceResource1_8 extends MetadataDelegatingCrudResource<ConceptSource> {
 
 	/**

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/DrugOrderSubclassHandler1_8.java

@@ -40,7 +40,7 @@
 /**
  * Exposes the {@link DrugOrder} subclass as a type in {@link OrderResource1_8}
  */
-@SubClassHandler(supportedClass = DrugOrder.class, supportedOpenmrsVersions = { "1.8.*", "1.9.*" })
+@SubClassHandler(supportedClass = DrugOrder.class, supportedOpenmrsVersions = { "1.8.* - 1.9.*" })
 public class DrugOrderSubclassHandler1_8 extends BaseDelegatingSubclassHandler<Order, DrugOrder> implements DelegatingSubclassHandler<Order, DrugOrder> {
 
 	public DrugOrderSubclassHandler1_8() {

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/DrugResource1_8.java

@@ -35,8 +35,7 @@
 /**
  * {@link Resource} for {@link Drug}, supporting standard CRUD operations
  */
-@Resource(name = RestConstants.VERSION_1 + "/drug", supportedClass = Drug.class, supportedOpenmrsVersions = { "1.8.*",
-        "1.9.*" })
+@Resource(name = RestConstants.VERSION_1 + "/drug", supportedClass = Drug.class, supportedOpenmrsVersions = { "1.8.* - 1.9.*" })
 public class DrugResource1_8 extends MetadataDelegatingCrudResource<Drug> {
 
 	/**

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/EncounterTypeResource1_8.java

@@ -27,7 +27,7 @@
  * {@link Resource} for {@link EncounterType}, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/encountertype", supportedClass = EncounterType.class, supportedOpenmrsVersions = {
-        "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.8.* - 9.*" })
 public class EncounterTypeResource1_8 extends MetadataDelegatingCrudResource<EncounterType> {
 
 	/**

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldAnswerResource1_8.java

@@ -40,7 +40,7 @@
  * {@link Resource} for {@link FieldAnswer}, supporting standard CRUD operations
  */
 @SubResource(parent = FieldResource1_8.class, path = "answer", supportedClass = FieldAnswer.class, supportedOpenmrsVersions = {
-        "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.8.* - 9.*" })
 public class FieldAnswerResource1_8 extends DelegatingSubResource<FieldAnswer, Field, FieldResource1_8> {
 
 	@Override

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldResource1_8.java

@@ -33,8 +33,7 @@
 /**
  * {@link Resource} for {@link Field}, supporting standard CRUD operations
  */
-@Resource(name = RestConstants.VERSION_1 + "/field", supportedClass = Field.class, supportedOpenmrsVersions = { "1.8.*",
-        "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+@Resource(name = RestConstants.VERSION_1 + "/field", supportedClass = Field.class, supportedOpenmrsVersions = { "1.8.* - 9.*" })
 public class FieldResource1_8 extends MetadataDelegatingCrudResource<Field> {
 
 	public Model getGETModel(Representation rep) {

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/FieldTypeResource1_8.java

@@ -29,7 +29,7 @@
  * {@link Resource} for {@link FieldType}, supporting standard CRUD operations
  */
 @Resource(name = RestConstants.VERSION_1 + "/fieldtype", supportedClass = FieldType.class, supportedOpenmrsVersions = {
-        "1.8.*", "1.9.*", "1.10.*", "1.11.*", "1.12.*", "2.0.*", "2.1.*", "2.2.*", "2.3.*", "2.4.*", "2.5.*", "2.6.*" })
+        "1.8.* - 9.*" })
 public class FieldTypeResource1_8 extends MetadataDelegatingCrudResource<FieldType> {
 
 	public Model getGETModel(Representation rep) {