You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/10/29 17:42:25 UTC
[royale-typedefs] branch develop updated: handle conflicts in Maven
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git
The following commit(s) were added to refs/heads/develop by this push:
new d642168 handle conflicts in Maven
d642168 is described below
commit d6421682a00c42de9cc06c425576b0c7ecea5ef4
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Oct 29 10:42:05 2018 -0700
handle conflicts in Maven
---
jquery/pom.xml | 4 ++++
js/pom.xml | 24 ++++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/jquery/pom.xml b/jquery/pom.xml
index d84ebdd..3451ac6 100644
--- a/jquery/pom.xml
+++ b/jquery/pom.xml
@@ -135,6 +135,10 @@
<className>jQuery</className>
<name>Callbacks</name>
</exclude>
+ <exclude>
+ <className>jQuery.jqXHR</className>
+ <name>onreadystatechange</name>
+ </exclude>
</excludes>
</externcConfig>
<includeFiles>
diff --git a/js/pom.xml b/js/pom.xml
index 2e57748..653561e 100644
--- a/js/pom.xml
+++ b/js/pom.xml
@@ -243,6 +243,30 @@
<className>SVGLocatable</className>
<name>nearestViewportElement</name>
</exclude>
+ <exclude>
+ <className>Document</className>
+ <name>loadXML</name>
+ </exclude>
+ <exclude>
+ <className>Document</className>
+ <name>open</name>
+ </exclude>
+ <exclude>
+ <className>Document</className>
+ <name>close</name>
+ </exclude>
+ <exclude>
+ <className>Document</className>
+ <name>createTreeWalker</name>
+ </exclude>
+ <exclude>
+ <className>Event</className>
+ <name>initUIEvent</name>
+ </exclude>
+ <exclude>
+ <className>Event</className>
+ <name>initMessageEvent</name>
+ </exclude>
</excludes>
</externcConfig>
<includeFiles>