Align pax-web and karaf standard features

Karaf's standard feature uses ow2/asm-all 5.0.4, while pax-web
is installing 5.0.2. Patch pax-web to use the same version, saving
around 230k.

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

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 7d83b5eb56b240251a21a2e8a1a6111970505488..18862e10719aec17cf4f43eb68dd511613660b5b 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -223,6 +223,9 @@
                                 <patch patchfile="${project.build.directory}/assembly/patches/karaf-javax-mail-${karaf4.version}.patch"
                                        originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf4.version}/standard-${karaf4.version}-features.xml"
                                        failonerror="true"/>
+                                <patch patchfile="${project.build.directory}/assembly/patches/karaf-paxweb.patch"
+                                       originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/4.3.0/pax-web-features-4.3.0-features.xml"
+                                       failonerror="true"/>
                                 <fixcrlf srcdir="${project.build.directory}/assembly/bin"
                                          includes="*.bat" eol="crlf"/>
                             </target>

diff --git a/karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-paxweb.patch b/karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-paxweb.patch
new file mode 100644 (file)
index 0000000..187cfb2
--- /dev/null
+++ b/karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-paxweb.patch
@@ -0,0 +1,30 @@
+diff -urN a/pax-web-features-4.3.0-features.xml b/pax-web-features-4.3.0-features.xml
+--- system/org/ops4j/pax/web/pax-web-features/4.3.0/pax-web-features-4.3.0-features.xml        2017-05-05 01:32:43.260023036 +0200
++++ system/org/ops4j/pax/web/pax-web-features/4.3.0/pax-web-features-4.3.0-features.xml        2017-05-05 01:35:46.437890587 +0200
+@@ -8,7 +8,7 @@
+         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+               <bundle dependency="true" start-level="30">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
+         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle>
+-        <bundle dependency="true" start-level="30">mvn:org.ow2.asm/asm-all/5.0.2</bundle>
++        <bundle dependency="true" start-level="30">mvn:org.ow2.asm/asm-all/5.0.4</bundle>
+         <bundle dependency="true" start-level="30">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.0.1</bundle>
+         <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/1.1.0</bundle>
+         <bundle start-level="30">mvn:org.eclipse.jetty/jetty-continuation/9.2.19.v20160908</bundle>
+@@ -72,7 +72,7 @@
+         </config>
+         <feature version="[7.0,10.0)">pax-jetty</feature>
+ 
+-        <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/5.0.2</bundle>
++        <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/5.0.4</bundle>
+         <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-bundleutils/4.1</bundle>
+         <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-reflect/4.1</bundle>
+         <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-finder/4.1</bundle>
+@@ -148,7 +148,7 @@
+         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
+         <bundle dependency="true" start-level="30">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+ 
+-        <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/5.0.2</bundle>
++        <bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm-all/5.0.4</bundle>
+         <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-bundleutils/4.1</bundle>
+         <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-reflect/4.1</bundle>
+         <bundle dependency="true" start-level="20">mvn:org.apache.xbean/xbean-finder/4.1</bundle>