Fixup commons-lang3 packaging 96/107596/1
authorRobert Varga <robert.varga@pantheon.tech>
Wed, 30 Aug 2023 16:42:37 +0000 (18:42 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Wed, 30 Aug 2023 16:42:37 +0000 (18:42 +0200)
We are overriding Karaf's commons-lang3 version, make sure we patch
features-standard to prevent duplicate packaging.

Change-Id: Ie81e6ca95303f9029df3632c28cf44ace845d30e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
karaf/opendaylight-karaf-resources/pom.xml

index 07a3dea69849766eecf33eaf28b378d481bf6c40..83952c8a5524343f288f03b275b821f7da34837e 100644 (file)
                        failonerror="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                          token="commons-io/commons-io/2.11.0" value="commons-io/commons-io/2.13.0" 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.12.0" value="org.apache.commons/commons-lang3/3.13.0" 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"/>
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"