Repository: flex-asjs Updated Branches: refs/heads/develop d5f91beef -> 87fdbb780
- Refactorred "external" scope to "provided" and "runtime" in order to resolve some transitive dependency problems Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/87fdbb78 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/87fdbb78 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/87fdbb78 Branch: refs/heads/develop Commit: 87fdbb7806baba927904f0c07f438dff209d3fac Parents: d5f91be Author: Christofer Dutz <[email protected]> Authored: Thu Jun 30 14:27:55 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Thu Jun 30 14:27:55 2016 +0200 ---------------------------------------------------------------------- examples/flexjs/pom.xml | 2 +- examples/native/pom.xml | 2 +- frameworks/projects/Binding/pom.xml | 6 ++--- frameworks/projects/Charts/pom.xml | 8 +++--- frameworks/projects/Core/pom.xml | 6 ++--- frameworks/projects/CreateJS/pom.xml | 8 +++--- frameworks/projects/Flat/pom.xml | 45 ++++++++++++++++--------------- frameworks/projects/HTML/pom.xml | 43 ++++++++++++++--------------- frameworks/projects/JQuery/pom.xml | 6 ++--- frameworks/projects/Mobile/pom.xml | 41 ++++++++++++++-------------- frameworks/projects/Storage/pom.xml | 4 +-- frameworks/projects/XML/pom.xml | 4 +-- 12 files changed, 89 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/examples/flexjs/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml index e277112..26a0344 100644 --- a/examples/flexjs/pom.xml +++ b/examples/flexjs/pom.xml @@ -59,7 +59,7 @@ <artifactId>playerglobal</artifactId> <version>${flash.version}</version> <type>swc</type> - <scope>external</scope> + <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/examples/native/pom.xml ---------------------------------------------------------------------- diff --git a/examples/native/pom.xml b/examples/native/pom.xml index c4a2250..fe85b2c 100644 --- a/examples/native/pom.xml +++ b/examples/native/pom.xml @@ -43,7 +43,7 @@ <artifactId>playerglobal</artifactId> <version>20.0</version> <type>swc</type> - <scope>external</scope> + <scope>provided</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/frameworks/projects/Binding/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Binding/pom.xml b/frameworks/projects/Binding/pom.xml index bff11f2..178434b 100644 --- a/frameworks/projects/Binding/pom.xml +++ b/frameworks/projects/Binding/pom.xml @@ -71,7 +71,7 @@ <artifactId>airglobal</artifactId> <version>${air.version}</version> <type>swc</type> - <scope>external</scope> + <scope>provided</scope> </dependency> <dependency> @@ -79,7 +79,7 @@ <artifactId>Core</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -87,7 +87,7 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> <classifier>extern</classifier> - <scope>external</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/frameworks/projects/Charts/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Charts/pom.xml b/frameworks/projects/Charts/pom.xml index 8578b3f..ad68954 100644 --- a/frameworks/projects/Charts/pom.xml +++ b/frameworks/projects/Charts/pom.xml @@ -77,7 +77,7 @@ <artifactId>airglobal</artifactId> <version>${air.version}</version> <type>swc</type> - <scope>external</scope> + <scope>provided</scope> </dependency> <dependency> @@ -85,7 +85,7 @@ <artifactId>Core</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -99,7 +99,7 @@ <artifactId>Graphics</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -113,7 +113,7 @@ <artifactId>HTML</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/frameworks/projects/Core/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/pom.xml b/frameworks/projects/Core/pom.xml index fa24dde..ccbc605 100644 --- a/frameworks/projects/Core/pom.xml +++ b/frameworks/projects/Core/pom.xml @@ -74,7 +74,7 @@ <artifactId>airglobal</artifactId> <version>${air.version}</version> <type>swc</type> - <scope>external</scope> + <scope>provided</scope> </dependency> <dependency> @@ -83,7 +83,7 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> <classifier>extern</classifier> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.externs</groupId> @@ -91,7 +91,7 @@ <version>0.7.0-SNAPSHOT</version> <type>swc</type> <classifier>extern</classifier> - <scope>provided</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/frameworks/projects/CreateJS/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/pom.xml b/frameworks/projects/CreateJS/pom.xml index a27ec73..df26e5e 100644 --- a/frameworks/projects/CreateJS/pom.xml +++ b/frameworks/projects/CreateJS/pom.xml @@ -77,7 +77,7 @@ <artifactId>airglobal</artifactId> <version>${air.version}</version> <type>swc</type> - <scope>external</scope> + <scope>provided</scope> </dependency> <dependency> @@ -85,7 +85,7 @@ <artifactId>Core</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -99,7 +99,7 @@ <artifactId>HTML</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -113,7 +113,7 @@ <artifactId>Graphics</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/frameworks/projects/Flat/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/pom.xml b/frameworks/projects/Flat/pom.xml index 603cdb0..3f6ec40 100644 --- a/frameworks/projects/Flat/pom.xml +++ b/frameworks/projects/Flat/pom.xml @@ -83,23 +83,7 @@ <artifactId>airglobal</artifactId> <version>${air.version}</version> <type>swc</type> - <scope>external</scope> - </dependency> - <dependency> - <groupId>org.apache.flex.flexjs.externs</groupId> - <artifactId>flexjs-externs-js</artifactId> - <version>0.7.0-SNAPSHOT</version> - <type>swc</type> - <classifier>extern</classifier> - <scope>external</scope> - </dependency> - <dependency> - <groupId>org.apache.flex.flexjs.externs</groupId> - <artifactId>flexjs-externs-gcl</artifactId> - <version>0.7.0-SNAPSHOT</version> - <type>swc</type> - <classifier>extern</classifier> - <scope>provided</scope> + <scope>provided</scope> </dependency> <dependency> @@ -107,7 +91,7 @@ <artifactId>Core</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -121,28 +105,28 @@ <artifactId>Binding</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Graphics</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>Collections</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> <artifactId>HTML</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -151,6 +135,23 @@ <type>swc</type> <classifier>extern</classifier> </dependency> + + <dependency> + <groupId>org.apache.flex.flexjs.externs</groupId> + <artifactId>flexjs-externs-js</artifactId> + <version>0.7.0-SNAPSHOT</version> + <type>swc</type> + <classifier>extern</classifier> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.externs</groupId> + <artifactId>flexjs-externs-gcl</artifactId> + <version>0.7.0-SNAPSHOT</version> + <type>swc</type> + <classifier>extern</classifier> + <scope>runtime</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/frameworks/projects/HTML/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/pom.xml b/frameworks/projects/HTML/pom.xml index 3c9d08e..ce1930c 100644 --- a/frameworks/projects/HTML/pom.xml +++ b/frameworks/projects/HTML/pom.xml @@ -86,23 +86,7 @@ <artifactId>airglobal</artifactId> <version>${air.version}</version> <type>swc</type> - <scope>external</scope> - </dependency> - <dependency> - <groupId>org.apache.flex.flexjs.externs</groupId> - <artifactId>flexjs-externs-js</artifactId> - <version>0.7.0-SNAPSHOT</version> - <type>swc</type> - <classifier>extern</classifier> - <scope>external</scope> - </dependency> - <dependency> - <groupId>org.apache.flex.flexjs.externs</groupId> - <artifactId>flexjs-externs-gcl</artifactId> - <version>0.7.0-SNAPSHOT</version> - <type>swc</type> - <classifier>extern</classifier> - <scope>provided</scope> + <scope>provided</scope> </dependency> <dependency> @@ -110,7 +94,7 @@ <artifactId>Core</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -124,7 +108,7 @@ <artifactId>Binding</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -138,7 +122,7 @@ <artifactId>Graphics</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -152,7 +136,7 @@ <artifactId>Collections</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -161,6 +145,23 @@ <type>swc</type> <classifier>extern</classifier> </dependency> + + <dependency> + <groupId>org.apache.flex.flexjs.externs</groupId> + <artifactId>flexjs-externs-js</artifactId> + <version>0.7.0-SNAPSHOT</version> + <type>swc</type> + <classifier>extern</classifier> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.externs</groupId> + <artifactId>flexjs-externs-gcl</artifactId> + <version>0.7.0-SNAPSHOT</version> + <type>swc</type> + <classifier>extern</classifier> + <scope>runtime</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/frameworks/projects/JQuery/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/JQuery/pom.xml b/frameworks/projects/JQuery/pom.xml index 09443e9..e26471f 100644 --- a/frameworks/projects/JQuery/pom.xml +++ b/frameworks/projects/JQuery/pom.xml @@ -77,7 +77,7 @@ <artifactId>airglobal</artifactId> <version>${air.version}</version> <type>swc</type> - <scope>external</scope> + <scope>provided</scope> </dependency> <dependency> @@ -85,7 +85,7 @@ <artifactId>Core</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -99,7 +99,7 @@ <artifactId>HTML</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/frameworks/projects/Mobile/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Mobile/pom.xml b/frameworks/projects/Mobile/pom.xml index 5a8acf4..f1efdf2 100644 --- a/frameworks/projects/Mobile/pom.xml +++ b/frameworks/projects/Mobile/pom.xml @@ -81,23 +81,7 @@ <artifactId>airglobal</artifactId> <version>${air.version}</version> <type>swc</type> - <scope>external</scope> - </dependency> - <dependency> - <groupId>org.apache.flex.flexjs.externs</groupId> - <artifactId>flexjs-externs-js</artifactId> - <version>0.7.0-SNAPSHOT</version> - <type>swc</type> - <classifier>extern</classifier> - <scope>external</scope> - </dependency> - <dependency> - <groupId>org.apache.flex.flexjs.externs</groupId> - <artifactId>flexjs-externs-gcl</artifactId> - <version>0.7.0-SNAPSHOT</version> - <type>swc</type> - <classifier>extern</classifier> - <scope>provided</scope> + <scope>provided</scope> </dependency> <dependency> @@ -105,7 +89,7 @@ <artifactId>Core</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -119,7 +103,7 @@ <artifactId>Graphics</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -133,7 +117,7 @@ <artifactId>HTML</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> @@ -142,6 +126,23 @@ <type>swc</type> <classifier>extern</classifier> </dependency> + + <dependency> + <groupId>org.apache.flex.flexjs.externs</groupId> + <artifactId>flexjs-externs-js</artifactId> + <version>0.7.0-SNAPSHOT</version> + <type>swc</type> + <classifier>extern</classifier> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.flex.flexjs.externs</groupId> + <artifactId>flexjs-externs-gcl</artifactId> + <version>0.7.0-SNAPSHOT</version> + <type>swc</type> + <classifier>extern</classifier> + <scope>runtime</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/frameworks/projects/Storage/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Storage/pom.xml b/frameworks/projects/Storage/pom.xml index 6fa81bc..4ccaf36 100644 --- a/frameworks/projects/Storage/pom.xml +++ b/frameworks/projects/Storage/pom.xml @@ -77,7 +77,7 @@ <artifactId>airglobal</artifactId> <version>${air.version}</version> <type>swc</type> - <scope>external</scope> + <scope>provided</scope> </dependency> <dependency> @@ -85,7 +85,7 @@ <artifactId>Core</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87fdbb78/frameworks/projects/XML/pom.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/XML/pom.xml b/frameworks/projects/XML/pom.xml index e6450a7..3dec399 100644 --- a/frameworks/projects/XML/pom.xml +++ b/frameworks/projects/XML/pom.xml @@ -71,7 +71,7 @@ <artifactId>airglobal</artifactId> <version>${air.version}</version> <type>swc</type> - <scope>external</scope> + <scope>provided</scope> </dependency> <dependency> @@ -79,7 +79,7 @@ <artifactId>Core</artifactId> <version>0.7.0-SNAPSHOT</version> <type>swc</type> - <scope>external</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.flex.flexjs.framework</groupId>
