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-asjs.git
commit 4373cfafe91ee756c1d07b08ec60524b03a099be Merge: efdd9ea 2e38cba Author: Alex Harui <[email protected]> AuthorDate: Tue Jun 11 22:49:17 2019 -0700 Merge branch 'release_practice' into develop archetypes/pom.xml | 4 +- .../royale-simple-application-archetype/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- archetypes/royale-simple-library-archetype/pom.xml | 4 +- archetypes/royale-simple-typedef-archetype/pom.xml | 4 +- frameworks/fontsrc/pom.xml | 4 +- frameworks/pom.xml | 4 +- frameworks/projects/Basic/pom.xml | 36 +++- frameworks/projects/Binding/pom.xml | 12 +- frameworks/projects/Charts/pom.xml | 44 ++++- frameworks/projects/Collections/pom.xml | 12 +- frameworks/projects/Core/pom.xml | 4 +- frameworks/projects/CreateJS/pom.xml | 36 +++- frameworks/projects/DragDrop/pom.xml | 20 ++- frameworks/projects/Effects/pom.xml | 20 ++- frameworks/projects/Express/pom.xml | 52 +++++- frameworks/projects/Flat/pom.xml | 40 ++++- frameworks/projects/FontAwesome/pom.xml | 44 ++++- frameworks/projects/Formatters/pom.xml | 20 ++- frameworks/projects/GoogleMaps/pom.xml | 20 ++- frameworks/projects/Graphics/pom.xml | 12 +- frameworks/projects/HTML/pom.xml | 44 ++++- frameworks/projects/HTML5/pom.xml | 20 ++- frameworks/projects/Icons/pom.xml | 20 ++- frameworks/projects/JQuery/pom.xml | 20 ++- frameworks/projects/Jewel/pom.xml | 60 ++++++- frameworks/projects/Language/pom.xml | 4 +- frameworks/projects/MXRoyale/pom.xml | 96 ++++++++++- frameworks/projects/MaterialDesignLite/pom.xml | 52 +++++- frameworks/projects/Mobile/pom.xml | 28 +++- frameworks/projects/Network/pom.xml | 20 ++- frameworks/projects/Reflection/pom.xml | 15 +- frameworks/projects/RoyaleSite/pom.xml | 28 +++- frameworks/projects/SparkRoyale/pom.xml | 44 ++++- frameworks/projects/Storage/pom.xml | 12 +- frameworks/projects/TLF/pom.xml | 28 +++- frameworks/projects/Text/pom.xml | 12 +- frameworks/projects/XML/pom.xml | 182 ++++++++++----------- frameworks/projects/pom.xml | 4 +- frameworks/themes/Basic/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Dark-NoFlat-Emphasized-Red-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Dark-NoFlat-Primary-Blue-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Dark-NoFlat-Primary-Green-Theme/pom.xml | 4 +- .../Jewel-Dark-NoFlat-Primary-Orange-Theme/pom.xml | 4 +- .../Jewel-Dark-NoFlat-Primary-Red-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Dark-NoFlat-Primary-Topaz-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Dark-NoFlat-Primary-Violet-Theme/pom.xml | 4 +- .../Jewel-Dark-NoFlat-Primary-Yellow-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Dark-NoFlat-Secondary-Blue-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Dark-NoFlat-Secondary-Red-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Light-NoFlat-Primary-Blue-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Light-NoFlat-Primary-Green-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Light-NoFlat-Primary-Red-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Light-NoFlat-Primary-Topaz-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../Jewel-Light-NoFlat-Secondary-Red-Theme/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 4 +- frameworks/themes/JewelTheme/pom.xml | 12 +- frameworks/themes/MDL/pom.xml | 4 +- frameworks/themes/MXRoyale/pom.xml | 4 +- frameworks/themes/pom.xml | 4 +- pom.xml | 4 +- 118 files changed, 1084 insertions(+), 329 deletions(-) diff --cc frameworks/projects/Basic/pom.xml index 3372440,f0a8a25..36fc573 --- a/frameworks/projects/Basic/pom.xml +++ b/frameworks/projects/Basic/pom.xml @@@ -78,56 -78,56 +78,88 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Binding/pom.xml index cd4e080,864f5c1..18d1494 --- a/frameworks/projects/Binding/pom.xml +++ b/frameworks/projects/Binding/pom.xml @@@ -59,14 -59,14 +59,22 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Charts/pom.xml index 63339f7,9516c22..f5dacc1 --- a/frameworks/projects/Charts/pom.xml +++ b/frameworks/projects/Charts/pom.xml @@@ -67,70 -67,70 +67,110 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Collections/pom.xml index 8ed36c9,a105423..6dea40a --- a/frameworks/projects/Collections/pom.xml +++ b/frameworks/projects/Collections/pom.xml @@@ -61,14 -61,14 +61,22 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/CreateJS/pom.xml index f8ed5c3,fcfa204..179b7a9 --- a/frameworks/projects/CreateJS/pom.xml +++ b/frameworks/projects/CreateJS/pom.xml @@@ -67,56 -67,56 +67,88 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Effects</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Effects</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/DragDrop/pom.xml index 588a4a8,d4ba4e4..05c5e48 --- a/frameworks/projects/DragDrop/pom.xml +++ b/frameworks/projects/DragDrop/pom.xml @@@ -61,28 -61,28 +61,44 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Effects/pom.xml index 23897ca,6c862f0..eac1a96 --- a/frameworks/projects/Effects/pom.xml +++ b/frameworks/projects/Effects/pom.xml @@@ -61,28 -61,28 +61,44 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Express/pom.xml index 989c020,d726e35..2c7e922 --- a/frameworks/projects/Express/pom.xml +++ b/frameworks/projects/Express/pom.xml @@@ -73,84 -73,84 +73,132 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>DragDrop</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>DragDrop</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Flat/pom.xml index 17aa964,662d1f1..0bfec48 --- a/frameworks/projects/Flat/pom.xml +++ b/frameworks/projects/Flat/pom.xml @@@ -73,63 -73,63 +73,99 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/FontAwesome/pom.xml index 8c4c5a0,768d495..c771e34 --- a/frameworks/projects/FontAwesome/pom.xml +++ b/frameworks/projects/FontAwesome/pom.xml @@@ -73,70 -73,70 +73,110 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Formatters/pom.xml index 15723c4,2c8be00..b781b5a --- a/frameworks/projects/Formatters/pom.xml +++ b/frameworks/projects/Formatters/pom.xml @@@ -61,28 -61,28 +61,44 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/GoogleMaps/pom.xml index 25347db,d6291e4..fe7decf --- a/frameworks/projects/GoogleMaps/pom.xml +++ b/frameworks/projects/GoogleMaps/pom.xml @@@ -68,28 -68,28 +68,44 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Graphics/pom.xml index c7efbd4,46f03fc..1c76a84 --- a/frameworks/projects/Graphics/pom.xml +++ b/frameworks/projects/Graphics/pom.xml @@@ -121,14 -121,14 +121,22 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/HTML/pom.xml index 7785176,3bb9197..0284e3c --- a/frameworks/projects/HTML/pom.xml +++ b/frameworks/projects/HTML/pom.xml @@@ -72,70 -72,70 +72,110 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/HTML5/pom.xml index 0e9f7d4,d83bb3a..b7c36ed --- a/frameworks/projects/HTML5/pom.xml +++ b/frameworks/projects/HTML5/pom.xml @@@ -67,28 -67,28 +67,44 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Icons/pom.xml index 2cab214,e40e906..4e5c3a6 --- a/frameworks/projects/Icons/pom.xml +++ b/frameworks/projects/Icons/pom.xml @@@ -76,28 -76,28 +76,44 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/JQuery/pom.xml index 5382b3f,6f2bc39..48bbd9f --- a/frameworks/projects/JQuery/pom.xml +++ b/frameworks/projects/JQuery/pom.xml @@@ -67,28 -67,28 +67,44 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Jewel/pom.xml index 513036e,03b2367..d5e1789 --- a/frameworks/projects/Jewel/pom.xml +++ b/frameworks/projects/Jewel/pom.xml @@@ -99,98 -99,98 +99,154 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>HTML</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>HTML</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Formatters</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Formatters</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/MXRoyale/pom.xml index 9069713,d241a04..cecf29d --- a/frameworks/projects/MXRoyale/pom.xml +++ b/frameworks/projects/MXRoyale/pom.xml @@@ -83,161 -83,161 +83,253 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>DragDrop</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>DragDrop</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Express</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Express</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Effects</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Effects</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Charts</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Charts</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Network</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Network</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Reflection</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Reflection</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>XML</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/MaterialDesignLite/pom.xml index 912313f,08168fd..d4e5980 --- a/frameworks/projects/MaterialDesignLite/pom.xml +++ b/frameworks/projects/MaterialDesignLite/pom.xml @@@ -73,84 -73,84 +73,132 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Binding</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Collections</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>HTML</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>HTML</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Mobile/pom.xml index 01971e8,523ca49..8e75700 --- a/frameworks/projects/Mobile/pom.xml +++ b/frameworks/projects/Mobile/pom.xml @@@ -71,42 -71,42 +71,66 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Graphics</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Network/pom.xml index f2028cd,75a58b1..19c2437 --- a/frameworks/projects/Network/pom.xml +++ b/frameworks/projects/Network/pom.xml @@@ -62,28 -62,28 +62,44 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Reflection</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Reflection</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Reflection/pom.xml index b5d70a7,6b39f22..0cf637e --- a/frameworks/projects/Reflection/pom.xml +++ b/frameworks/projects/Reflection/pom.xml @@@ -47,9 -47,7 +47,13 @@@ <manifest>${project.basedir}/src/main/resources/basic-manifest.xml</manifest> </namespace> </namespaces> ++<<<<<<< HEAD + <includeClasses> + <includeClass>ReflectionClasses</includeClass> + </includeClasses> ++======= + <includeSources>true</includeSources> ++>>>>>>> release_practice <skipExtern>true</skipExtern> <skipAS>${royale.skipAS}</skipAS> </configuration> @@@ -61,27 -59,13 +65,34 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Core</artifactId> + <version>0.9.7-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Language</artifactId> ++======= ++>>>>>>> release_practice <version>0.9.6-SNAPSHOT</version> <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> ++<<<<<<< HEAD + <artifactId>Language</artifactId> ++======= + <artifactId>Core</artifactId> ++>>>>>>> release_practice <version>0.9.6-SNAPSHOT</version> <type>swc</type> <classifier>js</classifier> diff --cc frameworks/projects/RoyaleSite/pom.xml index 7d817dc,21e298c..fc51f84 --- a/frameworks/projects/RoyaleSite/pom.xml +++ b/frameworks/projects/RoyaleSite/pom.xml @@@ -64,42 -64,42 +64,66 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>HTML</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>HTML</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/SparkRoyale/pom.xml index f8bf6b7,1da2096..cb448e5 --- a/frameworks/projects/SparkRoyale/pom.xml +++ b/frameworks/projects/SparkRoyale/pom.xml @@@ -75,70 -75,70 +75,110 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Basic</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>MXRoyale</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>MXRoyale</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Text</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Text</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>TLF</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>TLF</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Storage/pom.xml index f86021c,41e0045..d6162d0 --- a/frameworks/projects/Storage/pom.xml +++ b/frameworks/projects/Storage/pom.xml @@@ -67,14 -67,14 +67,22 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/TLF/pom.xml index 08430a6,24fd76a..18d4dcb --- a/frameworks/projects/TLF/pom.xml +++ b/frameworks/projects/TLF/pom.xml @@@ -64,7 -64,7 +64,11 @@@ <allowSubclassOverrides>true</allowSubclassOverrides> <skipAS>${royale.skipAS}</skipAS> <skipExtern>true</skipExtern> ++<<<<<<< HEAD + <additionalCompilerOptions>${project.compiler.options};-js-vector-emulation-class=Array</additionalCompilerOptions> ++======= + <additionalCompilerOptions>${project.compiler.options}</additionalCompilerOptions> ++>>>>>>> release_practice <defines> <define> <name>CONFIG::debug</name> @@@ -84,35 -84,35 +88,55 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Text</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Text</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Reflection</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Reflection</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>XML</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency> diff --cc frameworks/projects/Text/pom.xml index 9b87fc3,91ae563..d379444 --- a/frameworks/projects/Text/pom.xml +++ b/frameworks/projects/Text/pom.xml @@@ -73,14 -73,14 +73,22 @@@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>HTML</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>swf</classifier> </dependency> <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>HTML</artifactId> ++<<<<<<< HEAD + <version>0.9.7-SNAPSHOT</version> ++======= + <version>0.9.6-SNAPSHOT</version> ++>>>>>>> release_practice <type>swc</type> <classifier>js</classifier> </dependency>
