Build #2,621

Plan branch:

Stages & jobs

  1. Default Stage

Code commits

openmrs-core master

  • JaiVora <52439248+JaiVora@users.noreply.github.com>

    JaiVora <52439248+JaiVora@users.noreply.github.com> 34279169d4b6fd933bea71a4db1b995d46fcdabd

    [TRUNK-5907]: Migrated `ConceptReferenceTermMap` from Hibernate XML Mapping to JPA Annotations (#5205)
    * TRUNK-5907: Migrate `ConceptReferenceTermMap` from Hibernate XML Mapping to JPA annotations

    * TRUNK-5907: Migrate `ConceptReferenceTermMap` from Hibernate XML Mapping to JPA annotations

    * fix merge conflicts

    ---------

    Co-authored-by: Jai Vora <jaivora@Jais-MacBook-Pro.local>

    • api/src/main/java/org/openmrs/BaseConceptMap.java (version 34279169d4b6fd933bea71a4db1b995d46fcdabd)
    • api/src/main/java/org/openmrs/ConceptReferenceTermMap.java (version 34279169d4b6fd933bea71a4db1b995d46fcdabd)
    • api/src/main/resources/hibernate.cfg.xml (version 34279169d4b6fd933bea71a4db1b995d46fcdabd)
    • api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTermMap.hbm.xml (version 34279169d4b6fd933bea71a4db1b995d46fcdabd)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 34279169d4b6fd933bea71a4db1b995d46fcdabd)
  • Deborah Nakamatte <denakamatte@gmail.com>

    Deborah Nakamatte <denakamatte@gmail.com> ea5987fe49c4510505ed364724bd3a3ea9f56fa2

    TRUNK-5840: Migrate OrderGroup from Hibernate Mapping XML to JPA annotations (#5100)
    * Updated OrderGroup with cleaner annotations after a hard reset

    * Updated OrderGroup with cleaner annotations after a hard reset

    * Updated annotations on OrderGroup Set & OrderGroup fields in OrderGroup Entity

    * Updated imports for annotations in OrderGroup from javax to jarkata

    * Aligned annotations for Private List field with the hbm file for OrderGroup

    * Updated the OneToMany relationship mapping for List Ordersfield & re-instated LazyCollection annotation on the same field

    * Updated annotations for orders list and added annotated OrderGroup class to OrderServiceTest

    * Updated OrderGroup by adding the attributes field & aligned the rest of the annotations

    • api/src/main/java/org/openmrs/OrderGroup.java (version ea5987fe49c4510505ed364724bd3a3ea9f56fa2)
    • api/src/main/resources/hibernate.cfg.xml (version ea5987fe49c4510505ed364724bd3a3ea9f56fa2)
    • api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroup.hbm.xml (version ea5987fe49c4510505ed364724bd3a3ea9f56fa2)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version ea5987fe49c4510505ed364724bd3a3ea9f56fa2)