Bump karaf to 4.3.2

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

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

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index fe5699f30ebf53a0ce10bfabf8a03929f10ccc47..734c4b613d3e7ca904ea9758c28b9f8f7d16775b 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -125,10 +125,10 @@
                        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/ops4j/pax/web/pax-web-features/7.3.13/pax-web-features-7.3.13-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.3.16/pax-web-features-7.3.16-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.3.13/pax-web-features-7.3.13-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.3.13/pax-web-features-7.3.13-features.xml"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.3.16/pax-web-features-7.3.16-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.3.16/pax-web-features-7.3.16-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
@@ -141,6 +141,12 @@ mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.
                 </echo>
                 <copy file="${project.build.directory}/assembly/etc/startup.properties"
                       tofile="${project.build.directory}/classes/etc/startup.properties"/>
+                <replace file="${project.build.directory}/assembly/etc/users.properties"
+                         token="#karaf" value="karaf" failOnNoReplacements="true"/>
+                <replace file="${project.build.directory}/assembly/etc/users.properties"
+                         token="#_g_" value="_g_" failOnNoReplacements="true"/>
+                <copy file="${project.build.directory}/assembly/etc/users.properties"
+                      tofile="${project.build.directory}/classes/etc/users.properties"/>
                 <fixcrlf srcdir="${project.build.directory}/classes/bin"
                          includes="*.bat" eol="crlf"/>
               </target>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index ea8cfb1488d76a4c218504467222f5b573088bd3..8bd9dac8f396ec824b61b38466b93cea58a0dc85 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.3.1</karaf.version>
+    <karaf.version>4.3.2</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->
@@ -713,7 +713,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.38.v20210224</version>
+        <version>9.4.40.v20210413</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index ab8b0f4eaad32e8744dea4884f4bec1a66de5c21..bd8490ed91b45f45c78f8000b3d1832a76279384 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -120,8 +120,8 @@
         <profile>
             <id>disable-sft</id>
             <activation>
-                <!-- Karaf does not have jre.properties for JDK16+ just yet -->
-                <jdk>[16,)</jdk>
+                <!-- Karaf does not have jre.properties for JDK17+ just yet -->
+                <jdk>[17,)</jdk>
             </activation>
 
             <properties>