Downgrade javax.mail version

Installing both jdbc and jetty-8 features causes a conflict on
which version of javax.mail to use, as they pull in 1.4.4 and 1.4.5
respectively.

Resolve this by downgrading the version in jetty-8.

Change-Id: Icfa2fe3d5f87b7fc97405f94fe7bf33113178a75
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index c82de8ac366aba0fd83074e48cfb664759253c4a..9a1b95d142f0a7911a2156cfd45fa6d3dc592205 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -234,6 +234,9 @@
                                 <patch patchfile="${project.build.directory}/assembly/patches/karaf-quiesce-4.0.7.patch"
                                        originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/4.0.7/standard-4.0.7-features.xml"
                                        failonerror="true"/>
+                                <patch patchfile="${project.build.directory}/assembly/patches/karaf-javax-mail.patch"
+                                       originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/4.0.7/standard-4.0.7-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-javax-mail.patch b/karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-javax-mail.patch
new file mode 100644 (file)
index 0000000..e569979
--- /dev/null
+++ b/karaf/opendaylight-karaf4-resources/src/main/resources/patches/karaf-javax-mail.patch
@@ -0,0 +1,11 @@
+--- system/org/apache/karaf/features/standard/4.0.7/standard-4.0.7-features.xml        2017-02-13 15:13:43.895825491 +0100
++++ system/org/apache/karaf/features/standard/4.0.7/standard-4.0.7-features.xml        2017-02-13 15:40:10.593825491 +0100
+@@ -316,7 +316,7 @@
+     <feature name="jetty" version="8.1.14.v20131031">
+         <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.7.0</bundle>
+         <bundle start-level="30" dependency="true">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
+-        <bundle start-level="30" dependency="true">mvn:javax.mail/mail/1.4.5</bundle>
++        <bundle start-level="30" dependency="true">mvn:javax.mail/mail/1.4.4</bundle>
+         <bundle start-level="30" dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+         <bundle start-level="30" dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>
+         <bundle start-level="30" dependency="true">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/1.1</bundle>