Merge branch 'master' into TRUNK-5911

Author: pidsonn

api/src/main/java/org/openmrs/MedicationDispense.java

@@ -17,6 +17,9 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.RelationTargetAuditMode;
+
 import java.util.Date;
 
 /**
@@ -30,6 +33,7 @@
  */
 @Entity
 @Table(name = "medication_dispense")
+@Audited
 public class MedicationDispense extends BaseFormRecordableOpenmrsData {
 
 	private static final long serialVersionUID = 1L;

api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAttribute.hbm.xml

@@ -24,7 +24,6 @@
 			</generator>
         </id>
 
-        <discriminator column="concept_attribute_id" insert="false" />
 
         <many-to-one name="concept" class="Concept" not-null="true" column="concept_id" />
 

api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetMember.hbm.xml

@@ -23,7 +23,6 @@
             </generator>
         </id>
 
-        <discriminator column="order_set_member_id" insert="false" />
 
         <many-to-one name="orderType" class="OrderType" not-null="true">
             <column name="order_type"/>

api/src/main/resources/org/openmrs/notification/db/hibernate/Alert.hbm.xml

@@ -23,7 +23,6 @@
 			</generator>
 		</id>
 
-		<discriminator column="alert_id" insert="false" />
 
 		<property name="text" type="java.lang.String" not-null="true" length="512" />