Martin Peřina has submitted this change and it was merged. Change subject: core: Upgrade to CDI 1.2 ...................................................................... core: Upgrade to CDI 1.2 Removes hacks needed to support both CDI 1.0 (EAP6) and CDI 1.1+ (WildFly 8+). From now on we support only CDI 1.2. Change-Id: I3fec8f22a633dcf1fe866fab29cd26c2fa5a9e3d Signed-off-by: Martin Perina <mperina@redhat.com> --- M backend/manager/modules/dal/src/main/modules/org/ovirt/engine/core/dal/main/module.xml M backend/manager/modules/dal/src/main/resources/META-INF/beans.xml M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/CdiIntegration.java M backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml M backend/manager/modules/utils/src/main/resources/META-INF/beans.xml M pom.xml 6 files changed, 23 insertions(+), 42 deletions(-) Approvals: Martin Peřina: Verified; Passed CI tests Juan Hernandez: Looks good to me, but someone else must approve Moti Asayag: Verified; Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/48305 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3fec8f22a633dcf1fe866fab29cd26c2fa5a9e3d Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernandez@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: Moti Asayag <masayag@redhat.com> Gerrit-Reviewer: Oved Ourfali <oourfali@redhat.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>