Build #158

Plan branch:

Build: #158 was successful Changes by Rafal Korytkowski

Code commits

Git

  • Rafal Korytkowski

    Rafal Korytkowski 13ef6208383ca86857d9c0253b1bf3f1de52dcc1

    TRUNK-4378 Modules using conditional loading should not fail on older versions
    (cherry picked from commit adc56e8a12fa61b65c8437326fd15d03fdf98819)
    (cherry picked from commit aecc9d6087dd35176a9b01f4ab1a992fdbff1832)

    • api/src/main/java/org/openmrs/annotation/OpenmrsComponent.java (version 13ef6208383ca86857d9c0253b1bf3f1de52dcc1)
    • api/src/main/java/org/openmrs/annotation/OpenmrsComponentIncludeFilter.java (version 13ef6208383ca86857d9c0253b1bf3f1de52dcc1)
    • api/src/main/java/org/openmrs/annotation/OpenmrsProfile.java (version 13ef6208383ca86857d9c0253b1bf3f1de52dcc1)
    • api/src/main/java/org/openmrs/annotation/OpenmrsProfileIncludeFilter.java (version 13ef6208383ca86857d9c0253b1bf3f1de52dcc1)
    • api/src/main/resources/applicationContext-service.xml (version 13ef6208383ca86857d9c0253b1bf3f1de52dcc1)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_6To1_7.java (version 13ef6208383ca86857d9c0253b1bf3f1de52dcc1)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_8.java (version 13ef6208383ca86857d9c0253b1bf3f1de52dcc1)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponentIncludeFilterTest.java (version 13ef6208383ca86857d9c0253b1bf3f1de52dcc1)
    • api/src/test/java/org/openmrs/annotation/OpenmrsProfileIncludeFilterTest.java (version 13ef6208383ca86857d9c0253b1bf3f1de52dcc1)
  • Rafal Korytkowski

    Rafal Korytkowski 677284adc5d4dd7a32951195295aaf466750b1ee

    TRUNK-4378 Add OpenmrsComponent annotation
    (cherry picked from commit 7c13fb80212be503667d4608d50cc77f466fb44e)

    Conflicts:
            api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java

    • api/src/main/java/org/openmrs/annotation/OpenmrsComponent.java (version 677284adc5d4dd7a32951195295aaf466750b1ee)
    • api/src/main/java/org/openmrs/annotation/OpenmrsComponentIncludeFilter.java (version 677284adc5d4dd7a32951195295aaf466750b1ee)
    • api/src/main/java/org/openmrs/annotation/OpenmrsProfile.java (version 677284adc5d4dd7a32951195295aaf466750b1ee)
    • api/src/main/java/org/openmrs/annotation/OpenmrsProfileExcludeFilter.java (version 677284adc5d4dd7a32951195295aaf466750b1ee)
    • api/src/main/java/org/openmrs/annotation/OpenmrsProfileExclusionFilter.java (version 677284adc5d4dd7a32951195295aaf466750b1ee)
    • api/src/main/resources/applicationContext-service.xml (version 677284adc5d4dd7a32951195295aaf466750b1ee)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_6To1_7.java (version 677284adc5d4dd7a32951195295aaf466750b1ee)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_8.java (version 677284adc5d4dd7a32951195295aaf466750b1ee)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponentIncludeFilterTest.java (version 677284adc5d4dd7a32951195295aaf466750b1ee)
    • api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java (version 677284adc5d4dd7a32951195295aaf466750b1ee)
    • api/src/test/java/org/openmrs/annotation/OpenmrsProfileExclusionFilterTest.java (version 677284adc5d4dd7a32951195295aaf466750b1ee)