Bump karaf to 4.2.5 93/85793/1
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 15 Nov 2019 09:24:57 +0000 (10:24 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Sat, 16 Nov 2019 09:33:56 +0000 (10:33 +0100)
commite0b7e0441052504afc9598ef40882ba3cccc04f9
tree566809fc2a6d9895c0cac5c892418d4eda2c3a2e
parentbd75f977897a3565ac088fcc40b5eec2494f5196
Bump karaf to 4.2.5

This bumps karaf to 4.2.5, removing some workarounds we had to put
in place.

Notable upgrade is javax.annotation-api going from 1.2 to 1.3,
full release notes are here:

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12344587
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12344856
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12345153

We also fix https://issues.apache.org/jira/browse/KARAF-6259 by
manually downgrading Equinox.

Change-Id: If9719909389df5c0b92c9aade0356d4a314ff756
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 2e35dfeaaf555598bbf10b00cc046e7a198d081b)
karaf/karaf4-parent/pom.xml
karaf/opendaylight-karaf-resources/pom.xml
karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.2.5.patch [moved from karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.2.2.patch with 100% similarity]
karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.2.5.patch [moved from karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.2.2.patch with 100% similarity]
karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.2.5.patch [moved from karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.2.2.patch with 94% similarity]
karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.2.5.patch [moved from karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.2.2.patch with 100% similarity]
odlparent/pom.xml