Merge remote-tracking branch 'upstream/master'

components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot.output.adapter.ui/pom.xml

@@ -140,7 +140,8 @@
                             org.wso2.carbon.event.stream.core,
                             org.wso2.carbon.event.stream.core.exception,
                             org.wso2.carbon.utils,
-                            javax.xml.*,
+                            javax.xml.*; !javax.xml.parsers,
+                            javax.xml.parsers; version="${javax.xml.parsers.import.pkg.version}",
                             org.w3c.dom,
                             org.wso2.carbon.identity.oauth2.stub,
                             org.wso2.carbon.identity.oauth2.stub.dto,

components/iot-plugins/iot-base-plugin/org.wso2.carbon.device.mgt.iot/pom.xml

@@ -70,7 +70,8 @@
                             org.wso2.carbon.core,
                             org.wso2.carbon.device.mgt.common,
                             org.wso2.carbon.utils,
-                            javax.xml.*,
+                            javax.xml.*; !javax.xml.parsers,
+                            javax.xml.parsers; version="${javax.xml.parsers.import.pkg.version}",
                             org.w3c.dom
                         </Import-Package>
                         <Export-Package>

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile/pom.xml

@@ -55,7 +55,8 @@
                             org.osgi.framework,
                             org.osgi.service.component,
                             org.apache.commons.logging,
-                            javax.xml.*,
+                            javax.xml.*; !javax.xml.parsers,
+                            javax.xml.parsers; version="${javax.xml.parsers.import.pkg.version}",
                             javax.naming,
                             javax.sql,
                             org.w3c.dom,