You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/06/30 17:16:54 UTC
git commit: [flex-asjs] [refs/heads/develop] - - Added a new compiler
option "removeCirculars" - Adjusted the compiler mojo to fail in case of
build errors (except the js generation mojo) (Disabled till the last build
errors in the examples are fixed) -
Repository: flex-asjs
Updated Branches:
refs/heads/develop 87fdbb780 -> 669dee0c3
- Added a new compiler option "removeCirculars"
- Adjusted the compiler mojo to fail in case of build errors (except the js generation mojo) (Disabled till the last build errors in the examples are fixed)
- Cleaned up the dependencies
- Added missing dependencies
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/669dee0c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/669dee0c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/669dee0c
Branch: refs/heads/develop
Commit: 669dee0c31243ae6362f5450216b0125e2302ffb
Parents: 87fdbb7
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu Jun 30 19:16:38 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu Jun 30 19:16:38 2016 +0200
----------------------------------------------------------------------
examples/flexjs/CordovaCameraExample/pom.xml | 8 +++++
examples/flexjs/CreateJSExample/pom.xml | 4 +++
examples/flexjs/DataBindingExample/pom.xml | 1 +
examples/flexjs/DataBindingExample_Flat/pom.xml | 1 +
examples/flexjs/DataBindingExample_as/pom.xml | 4 +++
examples/flexjs/DesktopMap/pom.xml | 15 +++++++++
examples/flexjs/FlexJSStore/pom.xml | 1 +
examples/flexjs/FlexJSStore_jquery/pom.xml | 4 +++
examples/flexjs/FlexWebsiteStatsViewer/pom.xml | 1 +
examples/flexjs/MapSearch/pom.xml | 9 ++++++
examples/flexjs/MobileMap/pom.xml | 9 ++++++
examples/flexjs/MobileTrader/pom.xml | 1 +
examples/flexjs/StorageExample/pom.xml | 12 +++++++
examples/flexjs/TodoListSampleApp/pom.xml | 1 +
frameworks/pom.xml | 16 ----------
frameworks/projects/Binding/pom.xml | 8 -----
frameworks/projects/Charts/pom.xml | 18 +++++++----
frameworks/projects/Collections/pom.xml | 10 +-----
frameworks/projects/Core/pom.xml | 27 ----------------
frameworks/projects/CreateJS/pom.xml | 33 +++++++-------------
frameworks/projects/DragDrop/pom.xml | 26 +--------------
frameworks/projects/Effects/pom.xml | 10 +-----
frameworks/projects/Flat/pom.xml | 25 ---------------
frameworks/projects/Formatters/pom.xml | 12 ++-----
frameworks/projects/GoogleMaps/pom.xml | 10 +-----
frameworks/projects/Graphics/pom.xml | 10 +-----
frameworks/projects/HTML/pom.xml | 25 ---------------
frameworks/projects/HTML5/pom.xml | 12 ++-----
frameworks/projects/JQuery/pom.xml | 8 -----
frameworks/projects/Mobile/pom.xml | 25 ---------------
frameworks/projects/Network/pom.xml | 10 +-----
frameworks/projects/Reflection/pom.xml | 10 +-----
frameworks/projects/Storage/pom.xml | 8 -----
frameworks/projects/XML/pom.xml | 8 -----
frameworks/projects/pom.xml | 31 ++++++++++++++++++
35 files changed, 136 insertions(+), 277 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/CordovaCameraExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/pom.xml b/examples/flexjs/CordovaCameraExample/pom.xml
index b7266d7..622256a 100644
--- a/examples/flexjs/CordovaCameraExample/pom.xml
+++ b/examples/flexjs/CordovaCameraExample/pom.xml
@@ -48,6 +48,14 @@
<dependencies>
<dependency>
+ <groupId>com.adobe.air.framework</groupId>
+ <artifactId>airglobal</artifactId>
+ <version>${air.version}</version>
+ <type>swc</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Mobile</artifactId>
<version>0.7.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/CreateJSExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CreateJSExample/pom.xml b/examples/flexjs/CreateJSExample/pom.xml
index c0d9964..47bd4a2 100644
--- a/examples/flexjs/CreateJSExample/pom.xml
+++ b/examples/flexjs/CreateJSExample/pom.xml
@@ -22,6 +22,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!--
+ TODO: File not found: createjs.DisplayObject
+ -->
+
<parent>
<groupId>org.apache.flex.flexjs.examples</groupId>
<artifactId>examples-flexjs</artifactId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/DataBindingExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample/pom.xml b/examples/flexjs/DataBindingExample/pom.xml
index a279ef3..d54abdf 100644
--- a/examples/flexjs/DataBindingExample/pom.xml
+++ b/examples/flexjs/DataBindingExample/pom.xml
@@ -41,6 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>DataBindingExample.mxml</mainClass>
+ <removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/DataBindingExample_Flat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/pom.xml b/examples/flexjs/DataBindingExample_Flat/pom.xml
index 606e979..5e02983 100644
--- a/examples/flexjs/DataBindingExample_Flat/pom.xml
+++ b/examples/flexjs/DataBindingExample_Flat/pom.xml
@@ -41,6 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>DataBindingExample.mxml</mainClass>
+ <removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/DataBindingExample_as/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_as/pom.xml b/examples/flexjs/DataBindingExample_as/pom.xml
index 658ade4..d6bef4a 100644
--- a/examples/flexjs/DataBindingExample_as/pom.xml
+++ b/examples/flexjs/DataBindingExample_as/pom.xml
@@ -22,6 +22,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!--
+ TODO: File not found: org.apache.flex.html.beads.CSSButtonView
+ -->
+
<parent>
<groupId>org.apache.flex.flexjs.examples</groupId>
<artifactId>examples-flexjs</artifactId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/DesktopMap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/pom.xml b/examples/flexjs/DesktopMap/pom.xml
index 6886aff..d080310 100644
--- a/examples/flexjs/DesktopMap/pom.xml
+++ b/examples/flexjs/DesktopMap/pom.xml
@@ -41,6 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>DesktopMap.mxml</mainClass>
+ <removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
@@ -48,11 +49,25 @@
<dependencies>
<dependency>
+ <groupId>com.adobe.air.framework</groupId>
+ <artifactId>airglobal</artifactId>
+ <version>${air.version}</version>
+ <type>swc</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>GoogleMaps</artifactId>
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>HTML</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ <type>swc</type>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/FlexJSStore/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/pom.xml b/examples/flexjs/FlexJSStore/pom.xml
index 986c7d3..9ba04c1 100644
--- a/examples/flexjs/FlexJSStore/pom.xml
+++ b/examples/flexjs/FlexJSStore/pom.xml
@@ -41,6 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>FlexJSStore.mxml</mainClass>
+ <removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/FlexJSStore_jquery/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/pom.xml b/examples/flexjs/FlexJSStore_jquery/pom.xml
index da0695f..c883cdc 100644
--- a/examples/flexjs/FlexJSStore_jquery/pom.xml
+++ b/examples/flexjs/FlexJSStore_jquery/pom.xml
@@ -22,6 +22,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!--
+ TODO: File not found: $
+ -->
+
<parent>
<groupId>org.apache.flex.flexjs.examples</groupId>
<artifactId>examples-flexjs</artifactId>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
index 4a8eba2..0090974 100644
--- a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
+++ b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
@@ -41,6 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>FlexWebsiteStatsViewer.mxml</mainClass>
+ <removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/MapSearch/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/pom.xml b/examples/flexjs/MapSearch/pom.xml
index deaf513..6f3a660 100644
--- a/examples/flexjs/MapSearch/pom.xml
+++ b/examples/flexjs/MapSearch/pom.xml
@@ -41,6 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>MapSearch.mxml</mainClass>
+ <removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
@@ -48,6 +49,14 @@
<dependencies>
<dependency>
+ <groupId>com.adobe.air.framework</groupId>
+ <artifactId>airglobal</artifactId>
+ <version>${air.version}</version>
+ <type>swc</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>GoogleMaps</artifactId>
<version>0.7.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/MobileMap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileMap/pom.xml b/examples/flexjs/MobileMap/pom.xml
index 4cbe190..cdfcda8 100644
--- a/examples/flexjs/MobileMap/pom.xml
+++ b/examples/flexjs/MobileMap/pom.xml
@@ -41,6 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>MobileMap.mxml</mainClass>
+ <removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
@@ -48,6 +49,14 @@
<dependencies>
<dependency>
+ <groupId>com.adobe.air.framework</groupId>
+ <artifactId>airglobal</artifactId>
+ <version>${air.version}</version>
+ <type>swc</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Mobile</artifactId>
<version>0.7.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/MobileTrader/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/pom.xml b/examples/flexjs/MobileTrader/pom.xml
index b75bbbd..c7eaf21 100644
--- a/examples/flexjs/MobileTrader/pom.xml
+++ b/examples/flexjs/MobileTrader/pom.xml
@@ -41,6 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>MobileTrader.mxml</mainClass>
+ <removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/StorageExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/StorageExample/pom.xml b/examples/flexjs/StorageExample/pom.xml
index 48c1fc0..301b993 100644
--- a/examples/flexjs/StorageExample/pom.xml
+++ b/examples/flexjs/StorageExample/pom.xml
@@ -22,6 +22,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!--
+ TODO: File not found: cordova
+ -->
+
<parent>
<groupId>org.apache.flex.flexjs.examples</groupId>
<artifactId>examples-flexjs</artifactId>
@@ -48,6 +52,14 @@
<dependencies>
<dependency>
+ <groupId>com.adobe.air.framework</groupId>
+ <artifactId>airglobal</artifactId>
+ <version>${air.version}</version>
+ <type>swc</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Storage</artifactId>
<version>0.7.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/examples/flexjs/TodoListSampleApp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/TodoListSampleApp/pom.xml b/examples/flexjs/TodoListSampleApp/pom.xml
index adab693..2749fe6 100644
--- a/examples/flexjs/TodoListSampleApp/pom.xml
+++ b/examples/flexjs/TodoListSampleApp/pom.xml
@@ -41,6 +41,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>TodoListSampleApp.mxml</mainClass>
+ <removeCirculars>true</removeCirculars>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/frameworks/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/pom.xml b/frameworks/pom.xml
index 2fef9c3..cfe077b 100644
--- a/frameworks/pom.xml
+++ b/frameworks/pom.xml
@@ -36,20 +36,4 @@
<module>projects</module>
</modules>
- <dependencies>
- <!--
- By declaring this dependency here, we force the flexjs-externs-js to be
- added to the external library path of all modules. Without this it would
- have gone to the library path.
- -->
- <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>
- </dependencies>
-
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/frameworks/projects/Binding/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/pom.xml b/frameworks/projects/Binding/pom.xml
index 178434b..6aac449 100644
--- a/frameworks/projects/Binding/pom.xml
+++ b/frameworks/projects/Binding/pom.xml
@@ -67,14 +67,6 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
<version>0.7.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/frameworks/projects/Charts/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/pom.xml b/frameworks/projects/Charts/pom.xml
index ad68954..6334a90 100644
--- a/frameworks/projects/Charts/pom.xml
+++ b/frameworks/projects/Charts/pom.xml
@@ -73,23 +73,29 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Core</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
<type>swc</type>
- <scope>provided</scope>
+ <scope>runtime</scope>
</dependency>
-
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
+ <classifier>extern</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.framework</groupId>
+ <artifactId>Binding</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ <type>swc</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>Core</artifactId>
+ <artifactId>Binding</artifactId>
<version>0.7.0-SNAPSHOT</version>
<type>swc</type>
<classifier>extern</classifier>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/frameworks/projects/Collections/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/pom.xml b/frameworks/projects/Collections/pom.xml
index bab9e75..a7a8997 100644
--- a/frameworks/projects/Collections/pom.xml
+++ b/frameworks/projects/Collections/pom.xml
@@ -69,19 +69,11 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>external</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<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/669dee0c/frameworks/projects/Core/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/pom.xml b/frameworks/projects/Core/pom.xml
index ccbc605..f904e76 100644
--- a/frameworks/projects/Core/pom.xml
+++ b/frameworks/projects/Core/pom.xml
@@ -68,31 +68,4 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>provided</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>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/669dee0c/frameworks/projects/CreateJS/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/pom.xml b/frameworks/projects/CreateJS/pom.xml
index df26e5e..8e3a3a3 100644
--- a/frameworks/projects/CreateJS/pom.xml
+++ b/frameworks/projects/CreateJS/pom.xml
@@ -73,14 +73,6 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
<version>0.7.0-SNAPSHOT</version>
@@ -129,20 +121,17 @@
<version>0.7.0-SNAPSHOT</version>
<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>
- </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>
+ <!--
+ TODO: Checkout why this is needed
+ This is needed as currently maven has problems resolving flex scopes,
+ it is correctly included by this artifacts parent.
+ -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs-js</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/frameworks/projects/DragDrop/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/pom.xml b/frameworks/projects/DragDrop/pom.xml
index d99efbd..72fa7d5 100644
--- a/frameworks/projects/DragDrop/pom.xml
+++ b/frameworks/projects/DragDrop/pom.xml
@@ -69,35 +69,11 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <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>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<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/669dee0c/frameworks/projects/Effects/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/pom.xml b/frameworks/projects/Effects/pom.xml
index b6d485b..7625d21 100644
--- a/frameworks/projects/Effects/pom.xml
+++ b/frameworks/projects/Effects/pom.xml
@@ -69,19 +69,11 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>external</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<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/669dee0c/frameworks/projects/Flat/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/pom.xml b/frameworks/projects/Flat/pom.xml
index 3f6ec40..ec5c9fb 100644
--- a/frameworks/projects/Flat/pom.xml
+++ b/frameworks/projects/Flat/pom.xml
@@ -79,14 +79,6 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
<version>0.7.0-SNAPSHOT</version>
@@ -135,23 +127,6 @@
<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/669dee0c/frameworks/projects/Formatters/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/pom.xml b/frameworks/projects/Formatters/pom.xml
index 433f4e8..304c468 100644
--- a/frameworks/projects/Formatters/pom.xml
+++ b/frameworks/projects/Formatters/pom.xml
@@ -69,19 +69,11 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>external</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<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>
@@ -95,7 +87,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/669dee0c/frameworks/projects/GoogleMaps/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/pom.xml b/frameworks/projects/GoogleMaps/pom.xml
index fa0af9c..8f54439 100644
--- a/frameworks/projects/GoogleMaps/pom.xml
+++ b/frameworks/projects/GoogleMaps/pom.xml
@@ -74,19 +74,11 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>external</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<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/669dee0c/frameworks/projects/Graphics/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/pom.xml b/frameworks/projects/Graphics/pom.xml
index 25710fc..a8db6bb 100644
--- a/frameworks/projects/Graphics/pom.xml
+++ b/frameworks/projects/Graphics/pom.xml
@@ -69,19 +69,11 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>external</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<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/669dee0c/frameworks/projects/HTML/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/pom.xml b/frameworks/projects/HTML/pom.xml
index ce1930c..3ebe7b6 100644
--- a/frameworks/projects/HTML/pom.xml
+++ b/frameworks/projects/HTML/pom.xml
@@ -82,14 +82,6 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
<version>0.7.0-SNAPSHOT</version>
@@ -145,23 +137,6 @@
<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/669dee0c/frameworks/projects/HTML5/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/pom.xml b/frameworks/projects/HTML5/pom.xml
index 5ba9ca1..a70d393 100644
--- a/frameworks/projects/HTML5/pom.xml
+++ b/frameworks/projects/HTML5/pom.xml
@@ -73,19 +73,11 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>external</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<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 +91,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/669dee0c/frameworks/projects/JQuery/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/pom.xml b/frameworks/projects/JQuery/pom.xml
index e26471f..4361d58 100644
--- a/frameworks/projects/JQuery/pom.xml
+++ b/frameworks/projects/JQuery/pom.xml
@@ -73,14 +73,6 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
<version>0.7.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/frameworks/projects/Mobile/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/pom.xml b/frameworks/projects/Mobile/pom.xml
index f1efdf2..af6a570 100644
--- a/frameworks/projects/Mobile/pom.xml
+++ b/frameworks/projects/Mobile/pom.xml
@@ -77,14 +77,6 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
<version>0.7.0-SNAPSHOT</version>
@@ -126,23 +118,6 @@
<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/669dee0c/frameworks/projects/Network/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/pom.xml b/frameworks/projects/Network/pom.xml
index 33dcb93..ae4276c 100644
--- a/frameworks/projects/Network/pom.xml
+++ b/frameworks/projects/Network/pom.xml
@@ -69,19 +69,11 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>external</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<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/669dee0c/frameworks/projects/Reflection/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Reflection/pom.xml b/frameworks/projects/Reflection/pom.xml
index c158585..74ca744 100644
--- a/frameworks/projects/Reflection/pom.xml
+++ b/frameworks/projects/Reflection/pom.xml
@@ -61,19 +61,11 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>external</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<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/669dee0c/frameworks/projects/Storage/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Storage/pom.xml b/frameworks/projects/Storage/pom.xml
index 4ccaf36..b8b36ff 100644
--- a/frameworks/projects/Storage/pom.xml
+++ b/frameworks/projects/Storage/pom.xml
@@ -73,14 +73,6 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
<version>0.7.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/frameworks/projects/XML/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/pom.xml b/frameworks/projects/XML/pom.xml
index 3dec399..7aac1de 100644
--- a/frameworks/projects/XML/pom.xml
+++ b/frameworks/projects/XML/pom.xml
@@ -67,14 +67,6 @@
<dependencies>
<dependency>
- <groupId>com.adobe.air.framework</groupId>
- <artifactId>airglobal</artifactId>
- <version>${air.version}</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
<version>0.7.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/669dee0c/frameworks/projects/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/pom.xml b/frameworks/projects/pom.xml
index df1b74e..e4cc09e 100644
--- a/frameworks/projects/pom.xml
+++ b/frameworks/projects/pom.xml
@@ -57,4 +57,35 @@
<module>XML</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>com.adobe.air.framework</groupId>
+ <artifactId>airglobal</artifactId>
+ <version>${air.version}</version>
+ <type>swc</type>
+ <scope>provided</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>
+ </dependency>
+ <!--
+ By declaring this dependency here, we force the flexjs-externs-js to be
+ added to the external library path of all modules. Without this it would
+ have gone to the library path.
+ -->
+ <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>
+ </dependencies>
+
</project>