Upgrade Felix SCR from 2.1.16 to 2.1.20

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

This upgrade is slated for Karaf-4.2.9, but we need it sooner as we
are hitting https://issues.apache.org/jira/browse/FELIX-6206 in
testing.

JIRA: ODLPARENT-236
Change-Id: If393d29e1a7c5dd392458dd278d2d8a92cdcf921
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 3563a60451c22f5a49d92af1a1db684d832fcbbe..9c6f49a7f0f06ea3e12c1fc584ff9e2e49a273f3 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.9+ -->
+                        <id>remove-scr-2.1.16</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.16"
+                                    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 5d56bd939ac9d303437da8a00bc94f4e8d78039c..b7f9f9c8c7097257144a8fed51733d375c17272e 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -127,6 +127,8 @@
                          token="javax.annotation/javax.annotation-api/1.3<" value="javax.annotation/javax.annotation-api/1.3.1<" 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.9" value="org.apache.commons/commons-lang3/3.10" 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.16" value="org.apache.felix.scr/2.1.20" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                       tofile="${project.build.directory}/classes/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"/>
                 <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.14/pax-web-features-7.2.14-features.xml"