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 6e90e706fd78278706807861d75d814472a6669c Author: Alex Harui <[email protected]> AuthorDate: Tue Jun 11 23:33:11 2019 -0700 fix poms. The merge really screwed them up --- frameworks/projects/Basic/pom.xml | 32 --------- frameworks/projects/Binding/pom.xml | 8 --- frameworks/projects/Charts/pom.xml | 40 ----------- frameworks/projects/Collections/pom.xml | 8 --- frameworks/projects/CreateJS/pom.xml | 32 --------- frameworks/projects/DragDrop/pom.xml | 16 ----- frameworks/projects/Effects/pom.xml | 16 ----- frameworks/projects/Express/pom.xml | 48 -------------- frameworks/projects/Flat/pom.xml | 36 ---------- frameworks/projects/FontAwesome/pom.xml | 40 ----------- frameworks/projects/Formatters/pom.xml | 16 ----- frameworks/projects/GoogleMaps/pom.xml | 16 ----- frameworks/projects/Graphics/pom.xml | 8 --- frameworks/projects/HTML/pom.xml | 40 ----------- frameworks/projects/HTML5/pom.xml | 16 ----- frameworks/projects/Icons/pom.xml | 16 ----- frameworks/projects/JQuery/pom.xml | 16 ----- frameworks/projects/Jewel/pom.xml | 56 ---------------- frameworks/projects/MXRoyale/pom.xml | 92 -------------------------- frameworks/projects/MaterialDesignLite/pom.xml | 48 -------------- frameworks/projects/Mobile/pom.xml | 24 ------- frameworks/projects/Network/pom.xml | 16 ----- frameworks/projects/Reflection/pom.xml | 15 +---- frameworks/projects/RoyaleSite/pom.xml | 24 ------- frameworks/projects/SparkRoyale/pom.xml | 40 ----------- frameworks/projects/Storage/pom.xml | 8 --- frameworks/projects/TLF/pom.xml | 24 ------- frameworks/projects/Text/pom.xml | 8 --- 28 files changed, 2 insertions(+), 757 deletions(-) diff --git a/frameworks/projects/Basic/pom.xml b/frameworks/projects/Basic/pom.xml index 36fc573..f0a8a25 100644 --- a/frameworks/projects/Basic/pom.xml +++ b/frameworks/projects/Basic/pom.xml @@ -78,88 +78,56 @@ <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 --git a/frameworks/projects/Binding/pom.xml b/frameworks/projects/Binding/pom.xml index 18d1494..864f5c1 100644 --- a/frameworks/projects/Binding/pom.xml +++ b/frameworks/projects/Binding/pom.xml @@ -59,22 +59,14 @@ <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 --git a/frameworks/projects/Charts/pom.xml b/frameworks/projects/Charts/pom.xml index f5dacc1..9516c22 100644 --- a/frameworks/projects/Charts/pom.xml +++ b/frameworks/projects/Charts/pom.xml @@ -67,110 +67,70 @@ <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 --git a/frameworks/projects/Collections/pom.xml b/frameworks/projects/Collections/pom.xml index 6dea40a..a105423 100644 --- a/frameworks/projects/Collections/pom.xml +++ b/frameworks/projects/Collections/pom.xml @@ -61,22 +61,14 @@ <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 --git a/frameworks/projects/CreateJS/pom.xml b/frameworks/projects/CreateJS/pom.xml index 179b7a9..fcfa204 100644 --- a/frameworks/projects/CreateJS/pom.xml +++ b/frameworks/projects/CreateJS/pom.xml @@ -67,88 +67,56 @@ <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 --git a/frameworks/projects/DragDrop/pom.xml b/frameworks/projects/DragDrop/pom.xml index 05c5e48..d4ba4e4 100644 --- a/frameworks/projects/DragDrop/pom.xml +++ b/frameworks/projects/DragDrop/pom.xml @@ -61,44 +61,28 @@ <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 --git a/frameworks/projects/Effects/pom.xml b/frameworks/projects/Effects/pom.xml index eac1a96..6c862f0 100644 --- a/frameworks/projects/Effects/pom.xml +++ b/frameworks/projects/Effects/pom.xml @@ -61,44 +61,28 @@ <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 --git a/frameworks/projects/Express/pom.xml b/frameworks/projects/Express/pom.xml index 2c7e922..d726e35 100644 --- a/frameworks/projects/Express/pom.xml +++ b/frameworks/projects/Express/pom.xml @@ -73,132 +73,84 @@ <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 --git a/frameworks/projects/Flat/pom.xml b/frameworks/projects/Flat/pom.xml index 0bfec48..662d1f1 100644 --- a/frameworks/projects/Flat/pom.xml +++ b/frameworks/projects/Flat/pom.xml @@ -73,99 +73,63 @@ <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 --git a/frameworks/projects/FontAwesome/pom.xml b/frameworks/projects/FontAwesome/pom.xml index c771e34..768d495 100644 --- a/frameworks/projects/FontAwesome/pom.xml +++ b/frameworks/projects/FontAwesome/pom.xml @@ -73,110 +73,70 @@ <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 --git a/frameworks/projects/Formatters/pom.xml b/frameworks/projects/Formatters/pom.xml index b781b5a..2c8be00 100644 --- a/frameworks/projects/Formatters/pom.xml +++ b/frameworks/projects/Formatters/pom.xml @@ -61,44 +61,28 @@ <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 --git a/frameworks/projects/GoogleMaps/pom.xml b/frameworks/projects/GoogleMaps/pom.xml index fe7decf..d6291e4 100644 --- a/frameworks/projects/GoogleMaps/pom.xml +++ b/frameworks/projects/GoogleMaps/pom.xml @@ -68,44 +68,28 @@ <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 --git a/frameworks/projects/Graphics/pom.xml b/frameworks/projects/Graphics/pom.xml index 1c76a84..46f03fc 100644 --- a/frameworks/projects/Graphics/pom.xml +++ b/frameworks/projects/Graphics/pom.xml @@ -121,22 +121,14 @@ <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 --git a/frameworks/projects/HTML/pom.xml b/frameworks/projects/HTML/pom.xml index 0284e3c..3bb9197 100644 --- a/frameworks/projects/HTML/pom.xml +++ b/frameworks/projects/HTML/pom.xml @@ -72,110 +72,70 @@ <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 --git a/frameworks/projects/HTML5/pom.xml b/frameworks/projects/HTML5/pom.xml index b7c36ed..d83bb3a 100644 --- a/frameworks/projects/HTML5/pom.xml +++ b/frameworks/projects/HTML5/pom.xml @@ -67,44 +67,28 @@ <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 --git a/frameworks/projects/Icons/pom.xml b/frameworks/projects/Icons/pom.xml index 4e5c3a6..e40e906 100644 --- a/frameworks/projects/Icons/pom.xml +++ b/frameworks/projects/Icons/pom.xml @@ -76,44 +76,28 @@ <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 --git a/frameworks/projects/JQuery/pom.xml b/frameworks/projects/JQuery/pom.xml index 48bbd9f..6f2bc39 100644 --- a/frameworks/projects/JQuery/pom.xml +++ b/frameworks/projects/JQuery/pom.xml @@ -67,44 +67,28 @@ <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 --git a/frameworks/projects/Jewel/pom.xml b/frameworks/projects/Jewel/pom.xml index d5e1789..03b2367 100644 --- a/frameworks/projects/Jewel/pom.xml +++ b/frameworks/projects/Jewel/pom.xml @@ -99,154 +99,98 @@ <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 --git a/frameworks/projects/MXRoyale/pom.xml b/frameworks/projects/MXRoyale/pom.xml index cecf29d..d241a04 100644 --- a/frameworks/projects/MXRoyale/pom.xml +++ b/frameworks/projects/MXRoyale/pom.xml @@ -83,253 +83,161 @@ <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 --git a/frameworks/projects/MaterialDesignLite/pom.xml b/frameworks/projects/MaterialDesignLite/pom.xml index d4e5980..08168fd 100644 --- a/frameworks/projects/MaterialDesignLite/pom.xml +++ b/frameworks/projects/MaterialDesignLite/pom.xml @@ -73,132 +73,84 @@ <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 --git a/frameworks/projects/Mobile/pom.xml b/frameworks/projects/Mobile/pom.xml index 8e75700..523ca49 100644 --- a/frameworks/projects/Mobile/pom.xml +++ b/frameworks/projects/Mobile/pom.xml @@ -71,66 +71,42 @@ <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 --git a/frameworks/projects/Network/pom.xml b/frameworks/projects/Network/pom.xml index 19c2437..75a58b1 100644 --- a/frameworks/projects/Network/pom.xml +++ b/frameworks/projects/Network/pom.xml @@ -62,44 +62,28 @@ <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 --git a/frameworks/projects/Reflection/pom.xml b/frameworks/projects/Reflection/pom.xml index 0cf637e..566808b 100644 --- a/frameworks/projects/Reflection/pom.xml +++ b/frameworks/projects/Reflection/pom.xml @@ -47,13 +47,9 @@ <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> @@ -65,34 +61,27 @@ <dependency> <groupId>org.apache.royale.framework</groupId> <artifactId>Core</artifactId> -<<<<<<< HEAD - <version>0.9.7-SNAPSHOT</version> + <version>0.9.6-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> + <version>0.9.6-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 --git a/frameworks/projects/RoyaleSite/pom.xml b/frameworks/projects/RoyaleSite/pom.xml index fc51f84..21e298c 100644 --- a/frameworks/projects/RoyaleSite/pom.xml +++ b/frameworks/projects/RoyaleSite/pom.xml @@ -64,66 +64,42 @@ <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 --git a/frameworks/projects/SparkRoyale/pom.xml b/frameworks/projects/SparkRoyale/pom.xml index cb448e5..1da2096 100644 --- a/frameworks/projects/SparkRoyale/pom.xml +++ b/frameworks/projects/SparkRoyale/pom.xml @@ -75,110 +75,70 @@ <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 --git a/frameworks/projects/Storage/pom.xml b/frameworks/projects/Storage/pom.xml index d6162d0..41e0045 100644 --- a/frameworks/projects/Storage/pom.xml +++ b/frameworks/projects/Storage/pom.xml @@ -67,22 +67,14 @@ <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 --git a/frameworks/projects/TLF/pom.xml b/frameworks/projects/TLF/pom.xml index 18d4dcb..3783c4d 100644 --- a/frameworks/projects/TLF/pom.xml +++ b/frameworks/projects/TLF/pom.xml @@ -64,11 +64,7 @@ <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> @@ -88,55 +84,35 @@ <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 --git a/frameworks/projects/Text/pom.xml b/frameworks/projects/Text/pom.xml index d379444..91ae563 100644 --- a/frameworks/projects/Text/pom.xml +++ b/frameworks/projects/Text/pom.xml @@ -73,22 +73,14 @@ <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>
