Bump karaf to 4.2.5

This bumps karaf to 4.2.5, removing some workarounds we had to put
in place.

Notable upgrade is javax.annotation-api going from 1.2 to 1.3,
full release notes are here:

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

We also fix https://issues.apache.org/jira/browse/KARAF-6259 by
manually downgrading Equinox.

Change-Id: If9719909389df5c0b92c9aade0356d4a314ff756
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 2e35dfeaaf555598bbf10b00cc046e7a198d081b)

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index ef437da0f32f16a5bd0182ef50f4bc9770b17b18..4fe40176eeaa1ea2f2a45120eb92da33214b313a 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -195,6 +195,26 @@
                             <overWriteSnapshots>true</overWriteSnapshots>
                         </configuration>
                     </execution>
+                    <execution>
+                        <!-- Override karaf-4.2.5 mis-bump of Equinox -->
+                        <id>add-equinox-3.12</id>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.eclipse.platform</groupId>
+                                    <artifactId>org.eclipse.osgi</artifactId>
+                                    <version>3.12.100</version>
+                                    <outputDirectory>${project.build.directory}/assembly/system/org/eclipse/platform/org.eclipse.osgi/3.12.100</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                            <overWriteReleases>true</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -261,6 +281,19 @@
                             </target>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>remove-equinox-3.13</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <delete dir="${project.build.directory}/assembly/system/org/eclipse/platform/org.eclipse.osgi/3.13.300"
+                                    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 701b099970470d69525df8a5a31e864df399eac6..e11e13be49df374df2d678ced76caa90a4df9f93 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -115,28 +115,20 @@
                        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.10" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
+                         token="commons-codec/commons-codec/1.11" value="commons-codec/commons-codec/1.13" 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.8.1" value="org.apache.commons/commons-lang3/3.9" failOnNoReplacements="true"/>
-                <!-- fixes https://issues.apache.org/jira/browse/KARAF-5086 -->
                 <!-- fixes https://issues.apache.org/jira/browse/ARIES-1923 -->
                 <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.3" value="org.apache.aries.proxy/org.apache.aries.proxy/1.1.6" failOnNoReplacements="true"/>
+                         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"/>
                 <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.5/pax-web-features-7.2.5-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.8/pax-web-features-7.2.8-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.5/pax-web-features-7.2.5-features.xml"
-                         token="commons-codec/commons-codec/1.8" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
-                         token="javax.mail/mail/1.4.4" value="javax.mail/mail/1.4.7" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
-                    token="org.apache.aries/org.apache.aries.util/1.1.0" value="org.apache.aries/org.apache.aries.util/1.1.3" failOnNoReplacements="true"/>
-                <!-- Keep consistency with standard-features.xml -->
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
-                         token="org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.0.10" value="org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.5/pax-web-features-7.2.5-features.xml"/>
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.8/pax-web-features-7.2.8-features.xml"
+                         token="commons-codec/commons-codec/1.11" value="commons-codec/commons-codec/1.13" failOnNoReplacements="true"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.8/pax-web-features-7.2.8-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.8/pax-web-features-7.2.8-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
@@ -148,6 +140,10 @@ 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/config.properties"
+                         token="org.eclipse.platform/org.eclipse.osgi/3.13.300" value="org.eclipse.platform/org.eclipse.osgi/3.12.100" failOnNoReplacements="true"/>
+                <copy file="${project.build.directory}/assembly/etc/config.properties"
+                      tofile="${project.build.directory}/classes/etc/config.properties"/>
                 <fixcrlf srcdir="${project.build.directory}/classes/bin"
                          includes="*.bat" eol="crlf"/>
               </target>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.2.2.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.2.5.patch
similarity index 100%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.2.2.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.2.5.patch

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.2.2.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.2.5.patch
similarity index 100%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.2.2.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.2.5.patch

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.2.2.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.2.5.patch
similarity index 94%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.2.2.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.2.5.patch
index 4cbce2986e716e4b77e3555325a3537151dd9506..591a6ffc756121a5ee2314e92e4a9458995fd164 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.2.2.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.2.5.patch
@@ -3,7 +3,7 @@
 @@ -48,6 +48,7 @@
          <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.api/1.0.1</bundle>
          <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.3.1</bundle>
-         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.10.1</bundle>
+         <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core/1.10.2</bundle>
 +        <bundle start-level="20">mvn:org.apache.aries.quiesce/org.apache.aries.quiesce.api/1.0.0</bundle>
          <conditional>
              <condition>bundle</condition>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.2.2.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.2.5.patch
similarity index 100%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.2.2.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.2.5.patch

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index e7f3cfa47015c45319a19649155c9af332741b80..2f9e93977b980e13a02472bd5d650b47496cbe50 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.2</karaf.version>
+    <karaf.version>4.2.5</karaf.version>
     <!-- Used in bgpcep, lispflowmapping -->
     <projectinfo>2.8.1</projectinfo>