Bump commons-lang to 3.10

https://commons.apache.org/proper/commons-lang/changes-report.html#a3.10

Change-Id: I540a035acd0aa228ade8e4571d8647c1571946e3
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-apache-commons-lang3/src/main/history/dependencies.xml b/features/odl-apache-commons-lang3/src/main/history/dependencies.xml
index 32dffc3c1bdf5268c426c408275d93fde8608cfd..24ab4b4b77f75f9c3a535fa9dada877d37e25345 100644 (file)
--- a/features/odl-apache-commons-lang3/src/main/history/dependencies.xml
+++ b/features/odl-apache-commons-lang3/src/main/history/dependencies.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-apache-commons-lang3">
-    <feature version="0.0.0">
-        <bundle>mvn:org.apache.commons/commons-lang3/3.9</bundle>
-    </feature>
-</features>
+<ns2:features xmlns:ns2="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-apache-commons-lang3">
+    <ns2:feature version="0.0.0">
+        <ns2:bundle>mvn:org.apache.commons/commons-lang3/3.10</ns2:bundle>
+    </ns2:feature>
+</ns2:features>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 4897f3ee6f5b8309fb2129bf9c87e95410adf03e..c3b7d0b91ef232c9b4f356a954a78ac35730adb0 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -118,6 +118,8 @@
                          token="commons-codec/commons-codec/1.13" value="commons-codec/commons-codec/1.14" 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"/>
+                <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"/>
                 <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"

diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index f7603c3c898c6b61e988d8a3761a8e528431685b..6c62353e9fdc0a86237d12ad7eea536d4251d0dc 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -543,7 +543,7 @@
                 <link>http://doc.akka.io/japi/akka/2.5.30/</link>
                 <link>http://netty.io/4.1/api/</link>
                 <link>https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/</link>
-                <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/</link>
+                <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.10/</link>
                 <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
               </links>
             </configuration>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index c01a14c16fabeacff4a178cea29242c1b28f2b0c..e847d20e348c5edf7f22e9eba38f789ad792c4d0 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -336,7 +336,7 @@
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
         <!-- When bumping this version, remember to also change the JavaDoc link in odlparent-lite -->
-        <version>3.9</version>
+        <version>3.10</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>