Bump karaf to 4.3.0

Release notes:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12343304

This forces us to deal with jakarta.activation-api, as that is no
longer provided out of the box. We deal with that by providing our
own feature and ditching javax.activation declaration, hence we now
have odl-jakarta-activation-api.

We also upgrade to jackson-2.11.3, which finally puts an end to
all those serialization widgets vulns. Release notes:
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.11
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.11.1
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.11.2
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.11.3

The resulting packaging ends up with two versions of servlet-api,
which is okay: pax-web can use undertow which supports it, while
jetty does not -- hence we have two versions. This will be rectified
once we have jetty-10.

Also org.osgi.core-6 is now osgi.core-7, creating a bit more transition
work than expected.

Change-Id: Ib34abcbf6948664e5c1f9381fdc8577dc4f62108
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bundles-test-lib/pom.xml b/bundles-test-lib/pom.xml
index 70d247b811847d79dc86d87c0936aa7b2e42b4bd..82482610f6ad42748cab6c2517472b751452a47a 100644 (file)
--- a/bundles-test-lib/pom.xml
+++ b/bundles-test-lib/pom.xml
@@ -31,7 +31,7 @@
   <dependencies>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/bundles-test-lib/src/test/java/org/opendaylight/odlparent/bundlestest/lib/ServiceReferenceUtilTest.java b/bundles-test-lib/src/test/java/org/opendaylight/odlparent/bundlestest/lib/ServiceReferenceUtilTest.java
index eee06b25872a6966e44df0c5a0da312345f2b5a4..90032f7066731291eca80cba186e5023c5808b5a 100644 (file)
--- a/bundles-test-lib/src/test/java/org/opendaylight/odlparent/bundlestest/lib/ServiceReferenceUtilTest.java
+++ b/bundles-test-lib/src/test/java/org/opendaylight/odlparent/bundlestest/lib/ServiceReferenceUtilTest.java
@@ -11,6 +11,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.collect.Lists;
 import java.util.Arrays;
+import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.Test;
@@ -80,6 +81,11 @@ public class ServiceReferenceUtilTest {
         public int compareTo(Object reference) {
             return 0;
         }
+
+        @Override
+        public Dictionary<String, Object> getProperties() {
+            return null;
+        }
     }
 
 }

diff --git a/bundles4-test/pom.xml b/bundles4-test/pom.xml
index d299a390fe387cb4490d56fb6acef7560642da47..149de9dc94fe8abfa446794e8eeb72f8b0fbe018 100644 (file)
--- a/bundles4-test/pom.xml
+++ b/bundles4-test/pom.xml
@@ -35,7 +35,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/docs/pom.xml b/docs/pom.xml
index 184e24cdc6b63bd56033eba6bf143bb7073a9b3f..f19007c2fa20a47e0ddea3ac353a55292fa5bea4 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -58,7 +58,7 @@
         <!-- Also add dependencies we are using -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/features-test/pom.xml b/features-test/pom.xml
index a9e8d05f7221f1c63bb2069c0f1d15187411bcf8..9c2d2c0d40e99a291a341434eee19975be16aa52 100644 (file)
--- a/features-test/pom.xml
+++ b/features-test/pom.xml
@@ -94,7 +94,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index 9e30862c1b0f2587bd60f8426faa3398e5c64287..24fbedde2f367b850b60701b11f36d5b724bb8ee 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -80,7 +80,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-jackson-2.10</artifactId>
+            <artifactId>odl-jackson-2.11</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/features/odl-jackson-2.10/pom.xml b/features/odl-jackson-2.11/pom.xml
similarity index 87%
rename from features/odl-jackson-2.10/pom.xml
rename to features/odl-jackson-2.11/pom.xml
index 656834ea47b47a54a475390e3872082127f104d2..e04bbbbb881b66c39e44f04a5e8059682f9c3b99 100644 (file)
--- a/features/odl-jackson-2.10/pom.xml
+++ b/features/odl-jackson-2.11/pom.xml
@@ -19,12 +19,11 @@
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-jackson-2.10</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <artifactId>odl-jackson-2.11</artifactId>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Jackson 2.10.x</name>
-    <description>Jackson 2.10</description>
+    <name>OpenDaylight :: Jackson 2.11.x</name>
+    <description>Jackson 2.11</description>
 
     <properties>
         <checkDependencyChange>true</checkDependencyChange>
@@ -44,6 +43,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-jakarta-activation-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/features/odl-jackson-2.10/src/main/history/dependencies.xml b/features/odl-jackson-2.11/src/main/history/dependencies.xml
similarity index 70%
rename from features/odl-jackson-2.10/src/main/history/dependencies.xml
rename to features/odl-jackson-2.11/src/main/history/dependencies.xml
index d3a4371558f098b3d1cb98bdd42e9299b5fb68d7..63a28b7253ea293b93f95fa5dd02b78a372ba330 100644 (file)
--- a/features/odl-jackson-2.10/src/main/history/dependencies.xml
+++ b/features/odl-jackson-2.11/src/main/history/dependencies.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-jackson-2.9">
     <feature version="0.0.0">
+        <feature>odl-jakarta-activation-api</feature>
         <feature>odl-woodstox</feature>
         <feature>odl-ws-rs-api</feature>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.5</bundle>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.10.5</bundle>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.10.5</bundle>
-        <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.10.5</bundle>
-        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.10.5</bundle>
-        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.10.5</bundle>
-        <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.10.5</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.11.3</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.11.3</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.11.3</bundle>
+        <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.11.3</bundle>
+        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.11.3</bundle>
+        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.11.3</bundle>
+        <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.11.3</bundle>
     </feature>
 </features>

diff --git a/features/odl-jakarta-activation-api/pom.xml b/features/odl-jakarta-activation-api/pom.xml
new file mode 100644 (file)
index 0000000..cf86557
--- /dev/null
+++ b/features/odl-jakarta-activation-api/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2020 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>8.1.0-SNAPSHOT</version>
+        <relativePath>../../single-feature-parent</relativePath>
+    </parent>
+
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odl-jakarta-activation-api</artifactId>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: jakarta.activation-api</name>
+    <description>Jakarta EE jakarta.activation-api</description>
+
+    <properties>
+        <checkDependencyChange>true</checkDependencyChange>
+        <failOnDependencyChange>true</failOnDependencyChange>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-jakarta-activation-api/src/main/history/dependencies.xml b/features/odl-jakarta-activation-api/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..adf8f9d
--- /dev/null
+++ b/features/odl-jakarta-activation-api/src/main/history/dependencies.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-jakarta-activation">
+    <feature version="0.0.0">
+        <bundle>mvn:jakarta.activation/jakarta.activation-api/1.2.2</bundle>
+    </feature>
+</features>

diff --git a/features/odl-jersey-2/pom.xml b/features/odl-jersey-2/pom.xml
index 9dc50439b9e6cb8eef7f3aae23152bede628233a..b72e8941533695ac0ae3883287ac7aba8ae6d876 100644 (file)
--- a/features/odl-jersey-2/pom.xml
+++ b/features/odl-jersey-2/pom.xml
@@ -50,6 +50,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-jakarta-activation-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
         <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>

diff --git a/features/odl-jersey-2/src/main/history/dependencies.xml b/features/odl-jersey-2/src/main/history/dependencies.xml
index 8d6a90c46c777c0b2197190799eaacdff7942b10..2a3477ac57472e5c76cc213ab604a1a042fac4bf 100644 (file)
--- a/features/odl-jersey-2/src/main/history/dependencies.xml
+++ b/features/odl-jersey-2/src/main/history/dependencies.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="odl-jersey-2">
     <feature version="0.0.0">
+        <feature>odl-jakarta-activation-api</feature>
         <feature>odl-javassist-3</feature>
         <feature>odl-servlet-api</feature>
         <feature>odl-ws-rs-api</feature>

diff --git a/features/pom.xml b/features/pom.xml
index fe794269bdacd177f43c97bf499d82e564d328a8..afac8d2cc414da7f6d792ef83dc11d09eddbda6e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -44,7 +44,8 @@
         <module>odl-dropwizard-metrics</module>
         <module>odl-gson</module>
         <module>odl-guava</module>
-        <module>odl-jackson-2.10</module>
+        <module>odl-jackson-2.11</module>
+        <module>odl-jakarta-activation-api</module>
         <module>odl-javassist-3</module>
         <module>odl-jersey-2</module>
         <module>odl-jung-2.1</module>

diff --git a/karaf-plugin/pom.xml b/karaf-plugin/pom.xml
index b4819e19c75c69306113b617cb9b46c66563dfe8..b0c140a3dc6e6034a31af57f6fdceec8f6a4220c 100644 (file)
--- a/karaf-plugin/pom.xml
+++ b/karaf-plugin/pom.xml
@@ -66,7 +66,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

diff --git a/karaf-util/pom.xml b/karaf-util/pom.xml
index 897b7bd1e4130997d32251ff9d6d6269365bf61f..1b69f5b3b8607d970690a9181273e316f9214b86 100644 (file)
--- a/karaf-util/pom.xml
+++ b/karaf-util/pom.xml
@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <artifactId>osgi.core</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 43f93cedcb410e119d9509cd26db3810ac5cbebb..c0a7ca72a4aa9b2502dae0a6ed0aca6515e0150b 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -262,7 +262,7 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <!-- FIXME: remove this once we have karaf-4.2.10+ -->
+                        <!-- FIXME: remove this once we have karaf-4.3.0+ -->
                         <id>remove-scr-2.1.20</id>
                         <phase>prepare-package</phase>
                         <goals>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 8ceff79195dcddd968e9f871f88f27c362d9387d..32830980df484bf98d57af4dd5a51af58acfddd3 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -125,20 +125,16 @@
                        failonerror="true"/>
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"
                       tofile="${project.build.directory}/classes/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"/>
-                <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.7" value="commons-io/commons-io/2.8.0" failOnNoReplacements="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                          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="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"
                       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.19/pax-web-features-7.2.19-features.xml"
-                         token="commons-codec/commons-codec/1.11" value="commons-codec/commons-codec/1.15" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.19/pax-web-features-7.2.19-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.3.9/pax-web-features-7.3.9-features.xml"
+                         token="commons-codec/commons-codec/1.14" value="commons-codec/commons-codec/1.15" failOnNoReplacements="true"/>
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.3.9/pax-web-features-7.3.9-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/ops4j/pax/web/pax-web-features/7.2.19/pax-web-features-7.2.19-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.19/pax-web-features-7.2.19-features.xml"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.3.9/pax-web-features-7.3.9-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.3.9/pax-web-features-7.3.9-features.xml"/>
                 <!-- Add startup bundles to startup.properties — order is significant, bundles are wired in declaration order -->
                 <echo file="${project.build.directory}/assembly/etc/startup.properties" append="true">
 # The following are added by opendaylight-karaf-resources

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc.patch
index 1c880de12e6cb7128e9a0078cea2aa001a17d323..dad6eb99683d2077460da9d1ed5806fc46e6fda0 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc.patch
@@ -1,30 +1,28 @@
---- target/assembly/bin/inc.orig       2018-08-21 16:15:40.146423070 +0200
-+++ target/assembly/bin/inc    2018-08-21 16:15:43.798408830 +0200
+--- target/assembly/bin/inc    2020-10-27 09:19:51.940334549 +0100
++++ target/assembly/bin/inc    2020-10-27 09:36:25.438005471 +0100
 @@ -243,9 +243,9 @@
 
-     VERSION=$("${JAVA}" -version 2>&1 | ${AWK} -F '"' '/version/ {print $2}' | sed -e 's/_.*//g; s/^1\.//g; s/\..*//g; s/-.*//g;')
+     VERSION=`"${JAVA}" -version 2>&1 | ${AWK} -F '"' '/version/ {print $2}' | sed -e 's/_.*//g; s/^1\.//g; s/\..*//g; s/-.*//g;'`
 
 -    # java must be at least version 8
 -    if [ "${VERSION}" -lt "8" ]; then
--        die "JVM must be greater than 1.8"
-+    # java must be at least version 11 (and not newer, either)
-+    if [ "${VERSION}" -ne "11" ]; then
-+        die "JVM must be version 11"
+-        die "JVM must be version 1.8 or greater"
++    # java must be at least version 11
++    if [ "${VERSION}" -lt "11" ]; then
++        die "JVM must be version 11 or greater"
      fi
  }
 
-@@ -271,6 +271,8 @@
-     fi
+@@ -281,11 +281,20 @@
+ setupDefaults() {
 
-     DEFAULT_JAVA_OPTS="-Xms${JAVA_MIN_MEM} -Xmx${JAVA_MAX_MEM} -XX:+UnlockDiagnosticVMOptions "
+     DEFAULT_JAVA_OPTS="-XX:+UnlockDiagnosticVMOptions "
 +    DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError"
 +    DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:+DisableExplicitGC"
 
-     #Set the JVM_VENDOR specific JVM flags
-     if [ "${JVM_VENDOR}" = "SUN" ]; then
-@@ -285,6 +287,13 @@
-         fi
-     fi
+     setupVendorSepcifics
+
+     DEFAULT_JAVA_OPTS="${DEFAULT_JAVA_OPTS} ${JAVA_VENDOR_OPTS}"
 
 +    # Add default security file option
 +    if [ "x$ODL_JAVA_SECURITY_PROPERTIES" != "x" ]; then

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index f82da32d77474de38ea9ffc8b80715cc1db0a1df..77a6cf8561631582da2507cfe51c8f5ad9b8054c 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -124,7 +124,14 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-jackson-2.10</artifactId>
+                <artifactId>odl-jackson-2.11</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-jakarta-activation-api</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 40459bf3b057eb60f776738c350e045e4b9e11a8..ae50c2651f3314d6c8f2ba5c4ad595b84e81a6b5 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -45,7 +45,7 @@
             <groupId>com.fasterxml.jackson</groupId>
             <artifactId>jackson-bom</artifactId>
             <type>pom</type>
-            <version>2.10.5</version>
+            <version>2.11.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
@@ -136,12 +136,12 @@
             <version>4.1.53.Final</version>
         </dependency>
         <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
@@ -267,7 +267,7 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-bom</artifactId>
             <type>pom</type>
-            <version>9.4.28.v20200408</version>
+            <version>9.4.31.v20200723</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.xtend</groupId>
@@ -397,10 +397,6 @@
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component.annotations</artifactId>
@@ -413,6 +409,10 @@
             <groupId>org.osgi</groupId>
             <artifactId>osgi.cmpn</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 1face194bbd8c373d59c181813cea596430b34f6..e0acfaeca4b79cc02ecc6baebfc6a9fc4325e8fb 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -44,7 +44,7 @@
     <maven.compiler.release>11</maven.compiler.release>
 
     <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
-    <karaf.version>4.2.10</karaf.version>
+    <karaf.version>4.3.0</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
@@ -372,10 +372,11 @@
       </dependency>
 
       <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>1.1.1</version>
+        <groupId>jakarta.activation</groupId>
+        <artifactId>jakarta.activation-api</artifactId>
+        <version>1.2.2</version>
       </dependency>
+
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>javax.annotation-api</artifactId>
@@ -406,7 +407,7 @@
       </dependency>
 
       <!-- These three need to be consistent:
-        jackson-2.10.5 needs woodstox-6.2.x
+        jackson-2.11.3 needs woodstox-6.2.3+
         woodstox-5.3+ needs stax2-api-4.2.x
         -->
       <dependency>
@@ -422,7 +423,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.10.5</version>
+        <version>2.11.3</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -549,31 +550,30 @@
           the runtime - thus the warning can be safely ignored :)
 
           Keep this in sync with rest of OSGi:
-          - OSGi R6 (now)   = 1.3.0
-          - OSGi R7 (next)  = 1.4.0
+          - OSGi R7 (now) = 1.4.0
         -->
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.service.component.annotations</artifactId>
-        <version>1.3.0</version>
+        <version>1.4.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>osgi.cmpn</artifactId>
-        <version>6.0.0</version>
+        <version>7.0.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <version>6.0.0</version>
+        <artifactId>osgi.core</artifactId>
+        <version>7.0.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <!-- for https://bugs.opendaylight.org/show_bug.cgi?id=4290 -->
         <artifactId>org.osgi.service.event</artifactId>
-        <version>1.3.1</version>
+        <version>1.4.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.aries.quiesce</groupId>
@@ -679,7 +679,7 @@
         <groupId>org.ops4j.pax.web</groupId>
         <artifactId>pax-web-api</artifactId>
         <!-- Note: keep this version synchronized with karaf -->
-        <version>7.2.16</version>
+        <version>7.3.9</version>
       </dependency>
 
       <dependency>
@@ -727,7 +727,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.28.v20200408</version>
+        <version>9.4.31.v20200723</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index 7c1a6c78ac0bf210df2c34e2ffca8921f3c62fe8..6722cc86d5f3458fd6729b393c482025b18b3413 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -117,8 +117,8 @@
         <profile>
             <id>disable-sft</id>
             <activation>
-                <!-- Karaf does not have jre.properties for JDK12+ just yet -->
-                <jdk>[12,)</jdk>
+                <!-- Karaf does not have jre.properties for JDK16+ just yet -->
+                <jdk>[16,)</jdk>
             </activation>
 
             <properties>

diff --git a/untested-single-feature-parent/pom.xml b/untested-single-feature-parent/pom.xml
index 64b94b0320c009a275c334515b3162cfb3283986..45cdbfc5e6e9d8e430fb5b743bb0f2a1b3a5de9c 100644 (file)
--- a/untested-single-feature-parent/pom.xml
+++ b/untested-single-feature-parent/pom.xml
@@ -85,9 +85,6 @@
                         <excludedArtifactId>jaxb-api</excludedArtifactId>
                         <excludedArtifactId>jaxb-runtime</excludedArtifactId>
                         <excludedArtifactId>jakarta.xml.bind-api</excludedArtifactId>
-                        <!-- javax.annotation -->
-                        <excludedArtifactId>activation</excludedArtifactId>
-                        <excludedArtifactId>jakarta.activation-api</excludedArtifactId>
 
                         <!-- Guava's annotations -->
                         <excludedArtifactId>error_prone_annotations</excludedArtifactId>