Build #93

Plan branch:

Stages & jobs

  1. Default Stage

  2. Release

    Requires a user to start manually

Code commits

Git

  • kcissewski <kcissewski@soldevelo.com>

    kcissewski <kcissewski@soldevelo.com> 864fde703df4c7bb2fcc33f8b566c2cbc6dd188e

    Merge pull request #98 from areklalo/SYNCT-254
    SYNCT-254: Added service, mapper and DAO for the MergeConflict object

  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> cadfcae6a949bc278283d705731652e2b4f28599

    SYNCT-254: Added service, mapper and DAO for the MergeConflict object

    • api/src/main/java/org/openmrs/module/sync2/SyncConstants.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/main/java/org/openmrs/module/sync2/api/dao/MergeConflictDao.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/main/java/org/openmrs/module/sync2/api/dao/impl/MergeConflictDaoImpl.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/main/java/org/openmrs/module/sync2/api/mapper/MergeConflictMapper.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/main/java/org/openmrs/module/sync2/api/mapper/impl/MergeConflictMapperImpl.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/main/java/org/openmrs/module/sync2/api/model/MergeConflict.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/main/java/org/openmrs/module/sync2/api/service/MergeConflictService.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/main/java/org/openmrs/module/sync2/api/service/impl/MergeConflictServiceImpl.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/main/resources/MergeConflict.hbm.xml (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/main/resources/liquibase.xml (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/main/resources/moduleApplicationContext.xml (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/test/java/org/openmrs/module/sync2/api/mapper/impl/MergeConflictMapperImplTest.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/test/java/org/openmrs/module/sync2/api/mother/MergeConflictMother.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • api/src/test/java/org/openmrs/module/sync2/api/service/impl/MergeConflictServiceImplTest.java (version cadfcae6a949bc278283d705731652e2b4f28599)
    • omod/src/main/resources/config.xml (version cadfcae6a949bc278283d705731652e2b4f28599)