Upgrade SCR to 2.1.24

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310100&version=12348094
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310100&version=12348738

JIRA: ODLPARENT-242
Change-Id: I53da147d6c9033731d2f59a9bbbfdb8987519f5f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 3bb0c81a8aa91252560345fd84a320eff08013c2)
(cherry picked from commit 38391190fe9c7728ced353ef75bab6c4b29b5a8a)

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 5ebe168bac62f9b2e441fb6201299d5a0de5a702..0f9c37cb7fd7a43be2ce2179f29ef93e77e40b69 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -261,6 +261,20 @@
                             </target>
                         </configuration>
                     </execution>
+                    <execution>
+                        <!-- FIXME: remove this once we have karaf-4.2.10+ -->
+                        <id>remove-scr-2.1.20</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <delete dir="${project.build.directory}/assembly/system/org/apache/felix/org.apache.felix.scr/2.1.20"
+                                    includeemptydirs="true" failonerror="true"/>
+                            </target>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 8298ef1e9aedc53bac21168e1e2246bca4b2536e..007dd1e6110473c345aa41024be01850c0b15023 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -129,6 +129,8 @@
                          token="commons-codec/commons-codec/1.14" value="commons-codec/commons-codec/1.15" failOnNoReplacements="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                          token="org.apache.commons/commons-lang3/3.10" value="org.apache.commons/commons-lang3/3.11" failOnNoReplacements="true"/>
+                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
+                         token="org.apache.felix.scr/2.1.20" value="org.apache.felix.scr/2.1.24" failOnNoReplacements="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                          token="javax.annotation/javax.annotation-api/1.3&lt;" value="javax.annotation/javax.annotation-api/1.3.1&lt;" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"