Upgrade to karaf-4.2.7

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

This includes some important upgrades:
- javax.annotation-api from 1.3 to 1.3.1
- jetty from 9.4.18.v20190429 to 9.4.20.v20190813

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

diff --git a/features/odl-jersey-2/src/main/history/dependencies.xml b/features/odl-jersey-2/src/main/history/dependencies.xml
index 3ada09a5ca652767ec58722be2784566d4915a91..d662c100271ec7e3b5d8776e225d2a78e74c09bf 100644 (file)
--- a/features/odl-jersey-2/src/main/history/dependencies.xml
+++ b/features/odl-jersey-2/src/main/history/dependencies.xml
@@ -4,7 +4,7 @@
         <feature>odl-javassist-3</feature>
         <feature>odl-servlet-api</feature>
         <feature>odl-ws-rs-api</feature>
-        <bundle>mvn:javax.annotation/javax.annotation-api/1.3</bundle>
+        <bundle>mvn:javax.annotation/javax.annotation-api/1.3.1</bundle>
         <bundle>mvn:javax.validation/validation-api/1.1.0.Final</bundle>
         <bundle>mvn:org.glassfish.hk2.external/aopalliance-repackaged/2.5.0-b32</bundle>
         <bundle>mvn:org.glassfish.hk2.external/javax.inject/2.5.0-b32</bundle>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index c2954347058d035aa40fe17a644e5c7972e4f42d..5f6f9a11a23e80a23bf3771936ae9cfb8ddf21c1 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -195,38 +195,6 @@
                             <overWriteSnapshots>true</overWriteSnapshots>
                         </configuration>
                     </execution>
-                    <execution>
-                        <!-- Override karaf-4.2.6+ use of pax-logging-1.10.2+ -->
-                        <id>add-pax-logging-1.10.1</id>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-api</artifactId>
-                                    <version>1.10.1</version>
-                                    <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-api/1.10.1</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-logback</artifactId>
-                                    <version>1.10.1</version>
-                                    <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-logback/1.10.1</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-log4j2</artifactId>
-                                    <version>1.10.1</version>
-                                    <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-log4j2/1.10.1</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWriteReleases>true</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -293,23 +261,6 @@
                             </target>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>remove-pax-logging-1.10.2</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <delete dir="${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-api/1.10.2"
-                                    includeemptydirs="true"/>
-                                <delete dir="${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-logback/1.10.2"
-                                    includeemptydirs="true"/>
-                                <delete dir="${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-log4j2/1.10.2"
-                                    includeemptydirs="true"/>
-                            </target>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 7d11cb2e4d70ea0de85bb843d8cb6662df9bfa7e..7418436ee384fcfb99f6ff2c4e7d16ea7d57d5e6 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -79,15 +79,11 @@
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-instance.patch"
                        originalfile="${project.build.directory}/assembly/bin/instance"
                        failonerror="true"/>
-                <replace file="${project.build.directory}/assembly/bin/instance"
-                         token="1.10.2" value="1.10.1" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/bin/instance"
                       tofile="${project.build.directory}/classes/bin/instance"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-instance.bat.patch"
                        originalfile="${project.build.directory}/assembly/bin/instance.bat"
                        failonerror="true" ignorewhitespace="true"/>
-                <replace file="${project.build.directory}/assembly/bin/instance.bat"
-                         token="1.10.2" value="1.10.1" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/bin/instance.bat"
                       tofile="${project.build.directory}/classes/bin/instance.bat"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-inc.patch"
@@ -105,14 +101,6 @@
                        failonerror="true"/>
                 <copy file="${project.build.directory}/assembly/bin/karaf.bat"
                       tofile="${project.build.directory}/classes/bin/karaf.bat"/>
-                <replace file="${project.build.directory}/assembly/bin/shell"
-                         token="1.10.2" value="1.10.1" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/bin/shell"
-                      tofile="${project.build.directory}/classes/bin/shell"/>
-                <replace file="${project.build.directory}/assembly/bin/shell.bat"
-                         token="1.10.2" value="1.10.1" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/bin/shell.bat"
-                      tofile="${project.build.directory}/classes/bin/shell.bat"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-setenv.patch"
                        originalfile="${project.build.directory}/assembly/bin/setenv"
                        failonerror="true"/>
@@ -123,30 +111,25 @@
                        failonerror="true"/>
                 <copy file="${project.build.directory}/assembly/bin/setenv.bat"
                       tofile="${project.build.directory}/classes/bin/setenv.bat"/>
-                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"
-                         token="/1.10.2" value="/1.10.1" failOnNoReplacements="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"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-quiesce.patch"
                        originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                        failonerror="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.12" value="commons-codec/commons-codec/1.14" failOnNoReplacements="true"/>
-                <!-- fixes https://issues.apache.org/jira/browse/ARIES-1923 -->
+                         token="org.jolokia/jolokia-osgi/1.6.1" value="org.jolokia/jolokia-osgi/1.6.2" failOnNoReplacements="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                         token="org.apache.aries.proxy/org.apache.aries.proxy/1.1.4" value="org.apache.aries.proxy/org.apache.aries.proxy/1.1.6" failOnNoReplacements="true"/>
+                         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="org.jolokia/jolokia-osgi/1.6.1" value="org.jolokia/jolokia-osgi/1.6.2" failOnNoReplacements="true"/>
+                         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.10/pax-web-features-7.2.10-features.xml"
-                         token="commons-beanutils/commons-beanutils/1.8.3" value="commons-beanutils/commons-beanutils/1.9.4" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.10/pax-web-features-7.2.10-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.11/pax-web-features-7.2.11-features.xml"
                          token="commons-codec/commons-codec/1.11" value="commons-codec/commons-codec/1.14" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.10/pax-web-features-7.2.10-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.10/pax-web-features-7.2.10-features.xml"/>
-                <replace file="${project.build.directory}/assembly/etc/startup.properties"
-                         token="/1.10.2" value="/1.10.1" failOnNoReplacements="true"/>
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.11/pax-web-features-7.2.11-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/ops4j/pax/web/pax-web-features/7.2.11/pax-web-features-7.2.11-features.xml"
+                         token="org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2" value="org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2.2" failOnNoReplacements="true"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.11/pax-web-features-7.2.11-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.11/pax-web-features-7.2.11-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/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index e513ea027d8cc0e1efc78b97f0ceccde77e88ff3..c31930f25155c4e760942635332be2d6518e09ac 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -382,7 +382,7 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-bom</artifactId>
             <type>pom</type>
-            <version>9.4.18.v20190429</version>
+            <version>9.4.20.v20190813</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 4c106f809e32b9e46da48ce60c08b3f9a11143d6..44adc1c3cdc2e0d77564c33476fbb6ed7241264b 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -46,7 +46,7 @@
     <!-- Used in openflowplugin -->
     <enforcer.version>3.0.0-M2</enforcer.version>
     <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
-    <karaf.version>4.2.6</karaf.version>
+    <karaf.version>4.2.7</karaf.version>
     <!-- Used in bgpcep, lispflowmapping -->
     <projectinfo>2.8.1</projectinfo>
 
@@ -395,7 +395,7 @@
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>javax.annotation-api</artifactId>
-        <version>1.3</version>
+        <version>1.3.1</version>
         <optional>true</optional>
       </dependency>
       <dependency>
@@ -874,7 +874,7 @@
         <groupId>org.ops4j.pax.web</groupId>
         <artifactId>pax-web-api</artifactId>
         <!-- Note: keep this version synchronized with karaf -->
-        <version>7.2.10</version>
+        <version>7.2.11</version>
       </dependency>
 
       <dependency>
@@ -922,7 +922,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.18.v20190429</version>
+        <version>9.4.20.v20190813</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>