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/04/11 15:18:18 UTC
git commit: [flex-falcon] [refs/heads/feature/maven-migration] -
Refactored the group-ids and artifact-ids
Repository: flex-falcon
Updated Branches:
refs/heads/feature/maven-migration 1c93c278e -> f2ae6be7c
Refactored the group-ids and artifact-ids
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f2ae6be7
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f2ae6be7
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f2ae6be7
Branch: refs/heads/feature/maven-migration
Commit: f2ae6be7ca844f98492e7e238292ae70479b2ecd
Parents: 1c93c27
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon Apr 11 15:18:08 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon Apr 11 15:18:08 2016 +0200
----------------------------------------------------------------------
compiler-build-tools/pom.xml | 5 +-
compiler-jburg-types/pom.xml | 5 +-
compiler-jx/pom.xml | 131 +++++++++++++++++++
compiler.jx/pom.xml | 130 ------------------
compiler/pom.xml | 5 +-
externs/GCL/pom.xml | 10 +-
externs/GCL/src/main/config/compile-config.xml | 2 +-
externs/cordova/pom.xml | 10 +-
.../cordova/src/main/config/compile-config.xml | 2 +-
externs/createjs/pom.xml | 10 +-
.../createjs/src/main/config/compile-config.xml | 2 +-
externs/google_maps/pom.xml | 10 +-
.../src/main/config/compile-config.xml | 2 +-
externs/jasmine/pom.xml | 10 +-
.../jasmine/src/main/config/compile-config.xml | 2 +-
externs/jquery/pom.xml | 10 +-
.../jquery/src/main/config/compile-config.xml | 2 +-
externs/js/pom.xml | 31 +----
externs/node/pom.xml | 10 +-
externs/node/src/main/config/compile-config.xml | 2 +-
externs/pom.xml | 7 +-
flex-compiler-oem/pom.xml | 10 +-
flexjs-maven-plugin/pom.xml | 9 +-
.../apache/flex/maven/flexjs/ExterncMojo.java | 2 +-
migrate-to-maven.sh | 3 +
pom.xml | 25 ++--
26 files changed, 220 insertions(+), 227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/compiler-build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/compiler-build-tools/pom.xml b/compiler-build-tools/pom.xml
index 0e65fbe..735c06f 100644
--- a/compiler-build-tools/pom.xml
+++ b/compiler-build-tools/pom.xml
@@ -21,11 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-parent</artifactId>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>flexjs-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>compiler-build-tools</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/compiler-jburg-types/pom.xml
----------------------------------------------------------------------
diff --git a/compiler-jburg-types/pom.xml b/compiler-jburg-types/pom.xml
index 078978b..5446db2 100644
--- a/compiler-jburg-types/pom.xml
+++ b/compiler-jburg-types/pom.xml
@@ -22,11 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-parent</artifactId>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>flexjs-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>compiler-jburg-types</artifactId>
<version>0.6.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/compiler-jx/pom.xml
----------------------------------------------------------------------
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
new file mode 100644
index 0000000..6affd81
--- /dev/null
+++ b/compiler-jx/pom.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>flexjs-parent</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler-jx</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+
+ <name>Apache Flex - FlexJS: Compiler.JX</name>
+
+ <build>
+ <plugins>
+ <!-- Make the surefire execute all unit-tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.19</version>
+ <configuration>
+ <includes>
+ <include>org/**/Test*.java</include>
+ </includes>
+ <excludes>
+ <exclude>org/apache/flex/compiler/internal/codegen/externals/**</exclude>
+ <exclude>org/apache/flex/compiler/internal/codegen/js/flexjs/**</exclude>
+ <exclude>**/TestGoogClass.java</exclude>
+ <exclude>**/TestGoogEmiter.java</exclude>
+ <exclude>**/TestGoogFile.java</exclude>
+ <exclude>**/TestVF2JSFile.java</exclude>
+ <exclude>**/TestVF2JSMXMLApplication.java</exclude>
+ <exclude>**/TestFlexJSMXMLApplication.java</exclude>
+ <exclude>**/TestFlexJSMXMLScript.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.18.1</version>
+ <configuration>
+ <includes>
+ <include>org/apache/flex/compiler/internal/codegen/externals/**/Test*.java</include>
+ <exclude>org/apache/flex/compiler/internal/codegen/js/flexjs/**/Test*.java</exclude>
+ </includes>
+ <excludes>
+ <!-- Use externs/asjs -->
+ <exclude>**/TestExternChrome.java</exclude>
+ <exclude>**/TestExternJasmine.java</exclude>
+ <exclude>**/TestExternJQuery.java</exclude>
+ <exclude>**/TestExternES3.java</exclude>
+ <exclude>**/TestExternalsJSCompile.java</exclude>
+ <exclude>**/TestFlexJSProject.java</exclude>
+ <exclude>**/TestFlexJSMXMLApplication.java</exclude>
+ <exclude>**/TestFlexJSEmiter.java</exclude>
+ <exclude>**/TestFlexJSClass.java</exclude>
+ <exclude>**/TestFlexJSExpressions.java</exclude>
+ <exclude>**/TestFlexJSFile.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>2.0.28</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codeartisans</groupId>
+ <artifactId>org.json</artifactId>
+ <version>20131017</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ <version>v20151015</version>
+ </dependency>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>google-closure-library</artifactId>
+ <version>0.0-20150902-b129bb9e</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler-build-tools</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/compiler.jx/pom.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/pom.xml b/compiler.jx/pom.xml
deleted file mode 100644
index 380200a..0000000
--- a/compiler.jx/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-parent</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>compiler-jx</artifactId>
- <version>0.6.0-SNAPSHOT</version>
-
- <name>Apache Flex - FlexJS: Compiler.JX</name>
-
- <build>
- <plugins>
- <!-- Make the surefire execute all unit-tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.19</version>
- <configuration>
- <includes>
- <include>org/**/Test*.java</include>
- </includes>
- <excludes>
- <exclude>org/apache/flex/compiler/internal/codegen/externals/**</exclude>
- <exclude>org/apache/flex/compiler/internal/codegen/js/flexjs/**</exclude>
- <exclude>**/TestGoogClass.java</exclude>
- <exclude>**/TestGoogEmiter.java</exclude>
- <exclude>**/TestGoogFile.java</exclude>
- <exclude>**/TestVF2JSFile.java</exclude>
- <exclude>**/TestVF2JSMXMLApplication.java</exclude>
- <exclude>**/TestFlexJSMXMLApplication.java</exclude>
- <exclude>**/TestFlexJSMXMLScript.java</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.18.1</version>
- <configuration>
- <includes>
- <include>org/apache/flex/compiler/internal/codegen/externals/**/Test*.java</include>
- <exclude>org/apache/flex/compiler/internal/codegen/js/flexjs/**/Test*.java</exclude>
- </includes>
- <excludes>
- <!-- Use externs/asjs -->
- <exclude>**/TestExternChrome.java</exclude>
- <exclude>**/TestExternJasmine.java</exclude>
- <exclude>**/TestExternJQuery.java</exclude>
- <exclude>**/TestExternES3.java</exclude>
- <exclude>**/TestExternalsJSCompile.java</exclude>
- <exclude>**/TestFlexJSProject.java</exclude>
- <exclude>**/TestFlexJSMXMLApplication.java</exclude>
- <exclude>**/TestFlexJSEmiter.java</exclude>
- <exclude>**/TestFlexJSClass.java</exclude>
- <exclude>**/TestFlexJSExpressions.java</exclude>
- <exclude>**/TestFlexJSFile.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- <version>2.0.28</version>
- </dependency>
- <dependency>
- <groupId>org.codeartisans</groupId>
- <artifactId>org.json</artifactId>
- <version>20131017</version>
- </dependency>
- <dependency>
- <groupId>com.google.javascript</groupId>
- <artifactId>closure-compiler</artifactId>
- <version>v20151015</version>
- </dependency>
- <dependency>
- <groupId>org.clojure</groupId>
- <artifactId>google-closure-library</artifactId>
- <version>0.0-20150902-b129bb9e</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-build-tools</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/compiler/pom.xml
----------------------------------------------------------------------
diff --git a/compiler/pom.xml b/compiler/pom.xml
index df19faa..35952f3 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -22,11 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-parent</artifactId>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>flexjs-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>compiler</artifactId>
<version>0.6.0-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/GCL/pom.xml
----------------------------------------------------------------------
diff --git a/externs/GCL/pom.xml b/externs/GCL/pom.xml
index da88bda..3097f2e 100644
--- a/externs/GCL/pom.xml
+++ b/externs/GCL/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>flex-compiler-externs-gcl</artifactId>
+ <artifactId>flexjs-externs-gcl</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>swc</packaging>
@@ -53,8 +53,8 @@
<dependencies>
<!--dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs-js</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs-js</artifactId>
<version>0.6.0-SNAPSHOT</version>
<type>swc</type>
</dependency-->
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/GCL/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/GCL/src/main/config/compile-config.xml b/externs/GCL/src/main/config/compile-config.xml
index a4a24ac..b2e4682 100644
--- a/externs/GCL/src/main/config/compile-config.xml
+++ b/externs/GCL/src/main/config/compile-config.xml
@@ -52,7 +52,7 @@
-->
<external-library-path>
- <path-element>../../../../js/target/flex-compiler-externs-js-0.6.0-SNAPSHOT.swc</path-element>
+ <path-element>../../../../js/target/flexjs-externs-js-0.6.0-SNAPSHOT.swc</path-element>
</external-library-path>
<source-path>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/cordova/pom.xml
----------------------------------------------------------------------
diff --git a/externs/cordova/pom.xml b/externs/cordova/pom.xml
index aacab74..0ab882c 100644
--- a/externs/cordova/pom.xml
+++ b/externs/cordova/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>flex-compiler-externs-cordova</artifactId>
+ <artifactId>flexjs-externs-cordova</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>swc</packaging>
@@ -57,8 +57,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs-js</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs-js</artifactId>
<version>0.6.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/cordova/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/cordova/src/main/config/compile-config.xml b/externs/cordova/src/main/config/compile-config.xml
index e633fcb..9dcb4d7 100644
--- a/externs/cordova/src/main/config/compile-config.xml
+++ b/externs/cordova/src/main/config/compile-config.xml
@@ -22,7 +22,7 @@
<accessible>true</accessible>
<external-library-path>
- <path-element>../../../../js/target/flex-compiler-externs-js-0.6.0-SNAPSHOT.swc</path-element>
+ <path-element>../../../../js/target/flexjs-externs-js-0.6.0-SNAPSHOT.swc</path-element>
</external-library-path>
<source-path>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/createjs/pom.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/pom.xml b/externs/createjs/pom.xml
index e6b6e5a..ba1bd6a 100644
--- a/externs/createjs/pom.xml
+++ b/externs/createjs/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>flex-compiler-externs-createjs</artifactId>
+ <artifactId>flexjs-externs-createjs</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>swc</packaging>
@@ -186,8 +186,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs-js</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs-js</artifactId>
<version>0.6.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/createjs/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/src/main/config/compile-config.xml b/externs/createjs/src/main/config/compile-config.xml
index e6628f3..c753e8a 100644
--- a/externs/createjs/src/main/config/compile-config.xml
+++ b/externs/createjs/src/main/config/compile-config.xml
@@ -51,7 +51,7 @@
-->
<external-library-path>
- <path-element>../../../../js/target/flex-compiler-externs-js-0.6.0-SNAPSHOT.swc</path-element>
+ <path-element>../../../../js/target/flexjs-externs-js-0.6.0-SNAPSHOT.swc</path-element>
</external-library-path>
<source-path>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/google_maps/pom.xml
----------------------------------------------------------------------
diff --git a/externs/google_maps/pom.xml b/externs/google_maps/pom.xml
index bd32c75..fa8f129 100644
--- a/externs/google_maps/pom.xml
+++ b/externs/google_maps/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>flex-compiler-externs-goolemaps</artifactId>
+ <artifactId>flexjs-externs-goolemaps</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>swc</packaging>
@@ -105,8 +105,8 @@ google.maps = {};]]></replace></replace-regexp-operation>
<dependencies>
<dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs-js</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs-js</artifactId>
<version>0.6.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/google_maps/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/google_maps/src/main/config/compile-config.xml b/externs/google_maps/src/main/config/compile-config.xml
index 1892535..f66376a 100644
--- a/externs/google_maps/src/main/config/compile-config.xml
+++ b/externs/google_maps/src/main/config/compile-config.xml
@@ -51,7 +51,7 @@
-->
<external-library-path>
- <path-element>../../../../js/target/flex-compiler-externs-js-0.6.0-SNAPSHOT.swc</path-element>
+ <path-element>../../../../js/target/flexjs-externs-js-0.6.0-SNAPSHOT.swc</path-element>
</external-library-path>
<source-path>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/jasmine/pom.xml
----------------------------------------------------------------------
diff --git a/externs/jasmine/pom.xml b/externs/jasmine/pom.xml
index a85335a..5f93822 100644
--- a/externs/jasmine/pom.xml
+++ b/externs/jasmine/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>flex-compiler-externs-jasmine</artifactId>
+ <artifactId>flexjs-externs-jasmine</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>swc</packaging>
@@ -77,8 +77,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs-js</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs-js</artifactId>
<version>0.6.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/jasmine/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/jasmine/src/main/config/compile-config.xml b/externs/jasmine/src/main/config/compile-config.xml
index 8636ee9..1f66561 100644
--- a/externs/jasmine/src/main/config/compile-config.xml
+++ b/externs/jasmine/src/main/config/compile-config.xml
@@ -51,7 +51,7 @@
-->
<external-library-path>
- <path-element>../../../../js/target/flex-compiler-externs-js-0.6.0-SNAPSHOT.swc</path-element>
+ <path-element>../../../../js/target/flexjs-externs-js-0.6.0-SNAPSHOT.swc</path-element>
</external-library-path>
<source-path>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/jquery/pom.xml
----------------------------------------------------------------------
diff --git a/externs/jquery/pom.xml b/externs/jquery/pom.xml
index 3431392..ea1c720 100644
--- a/externs/jquery/pom.xml
+++ b/externs/jquery/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>flex-compiler-externs-jquery</artifactId>
+ <artifactId>flexjs-externs-jquery</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>swc</packaging>
@@ -77,8 +77,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs-js</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs-js</artifactId>
<version>0.6.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/jquery/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/jquery/src/main/config/compile-config.xml b/externs/jquery/src/main/config/compile-config.xml
index f3d8bd0..72ad13b 100644
--- a/externs/jquery/src/main/config/compile-config.xml
+++ b/externs/jquery/src/main/config/compile-config.xml
@@ -51,7 +51,7 @@
-->
<external-library-path>
- <path-element>../../../../js/target/flex-compiler-externs-js-0.6.0-SNAPSHOT.swc</path-element>
+ <path-element>../../../../js/target/flexjs-externs-js-0.6.0-SNAPSHOT.swc</path-element>
</external-library-path>
<source-path>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/js/pom.xml
----------------------------------------------------------------------
diff --git a/externs/js/pom.xml b/externs/js/pom.xml
index 26cb8df..c41fae1 100644
--- a/externs/js/pom.xml
+++ b/externs/js/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>flex-compiler-externs-js</artifactId>
+ <artifactId>flexjs-externs-js</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>swc</packaging>
@@ -153,32 +153,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flexjs-maven-plugin</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- <!-- Generate the ActionScript interface -->
- <executions>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-jx</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
- <dependencies>
- </dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/node/pom.xml
----------------------------------------------------------------------
diff --git a/externs/node/pom.xml b/externs/node/pom.xml
index 8247c64..cace5e5 100644
--- a/externs/node/pom.xml
+++ b/externs/node/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>flex-compiler-externs-node</artifactId>
+ <artifactId>flexjs-externs-node</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>swc</packaging>
@@ -53,8 +53,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>flex-compiler-externs-js</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs-js</artifactId>
<version>0.6.0-SNAPSHOT</version>
<type>swc</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/node/src/main/config/compile-config.xml
----------------------------------------------------------------------
diff --git a/externs/node/src/main/config/compile-config.xml b/externs/node/src/main/config/compile-config.xml
index fe3b2a6..750846d 100644
--- a/externs/node/src/main/config/compile-config.xml
+++ b/externs/node/src/main/config/compile-config.xml
@@ -22,7 +22,7 @@
<accessible>true</accessible>
<external-library-path>
- <path-element>../../../../js/target/flex-compiler-externs-js-0.6.0-SNAPSHOT.swc</path-element>
+ <path-element>../../../../js/target/flexjs-externs-js-0.6.0-SNAPSHOT.swc</path-element>
</external-library-path>
<source-path>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/externs/pom.xml
----------------------------------------------------------------------
diff --git a/externs/pom.xml b/externs/pom.xml
index 0f5d1a5..45821c6 100644
--- a/externs/pom.xml
+++ b/externs/pom.xml
@@ -22,12 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-parent</artifactId>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>flexjs-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
- <artifactId>flex-compiler-externs</artifactId>
+ <groupId>org.apache.flex.flexjs.externs</groupId>
+ <artifactId>flexjs-externs</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/flex-compiler-oem/pom.xml
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml
index aa10fc2..9e5c6cc 100644
--- a/flex-compiler-oem/pom.xml
+++ b/flex-compiler-oem/pom.xml
@@ -22,11 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-parent</artifactId>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>flexjs-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flex-compiler-oem</artifactId>
<version>0.6.0-SNAPSHOT</version>
@@ -35,6 +36,11 @@
<dependencies>
<dependency>
<groupId>org.apache.flex.flexjs.compiler</groupId>
+ <artifactId>compiler</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>compiler-jx</artifactId>
<version>0.6.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/flexjs-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/pom.xml b/flexjs-maven-plugin/pom.xml
index fc132e7..b10f4b8 100644
--- a/flexjs-maven-plugin/pom.xml
+++ b/flexjs-maven-plugin/pom.xml
@@ -21,11 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-parent</artifactId>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>flexjs-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-maven-plugin</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
@@ -70,9 +71,9 @@
<version>3.0.3</version>
</dependency>
<dependency>
- <groupId>org.apache.flex.compiler</groupId>
+ <groupId>org.apache.flex</groupId>
<artifactId>flex-tool-api</artifactId>
- <version>4.15.0</version>
+ <version>1.0.0</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/ExterncMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/ExterncMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/ExterncMojo.java
index a330993..02acfcd 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/ExterncMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/ExterncMojo.java
@@ -46,7 +46,7 @@ public class ExterncMojo
configFile.getPath());
return;
}
-
+
FlexToolRegistry toolRegistry = new FlexToolRegistry();
FlexToolGroup toolGroup = toolRegistry.getToolGroup("FlexJS");
if(toolGroup == null) {
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/migrate-to-maven.sh
----------------------------------------------------------------------
diff --git a/migrate-to-maven.sh b/migrate-to-maven.sh
index c1e205d..16b51bf 100755
--- a/migrate-to-maven.sh
+++ b/migrate-to-maven.sh
@@ -8,6 +8,8 @@ rm -rf compiler/src/main
rm -rf compiler/src/test
rm -rf compiler.jx/src/main
rm -rf compiler.jx/src/test
+rm -rf compiler-jx/src/main
+rm -rf compiler-jx/src/test
rm -rf flex-compiler-oem/src/main
rm -rf externs/GCL/src/main/flex
@@ -126,6 +128,7 @@ git mv compiler.jx.tests/test-files/* compiler-jx/src/test/resources
# Clean up
git rm -r compiler.jx
+rm -r compiler.jx
git rm -r compiler.jx.tests
rm -r compiler.jx.tests
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2ae6be7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c707ab..6d8a004 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,8 @@
<version>14</version>
</parent>
- <groupId>org.apache.flex.flexjs.compiler</groupId>
- <artifactId>compiler-parent</artifactId>
+ <groupId>org.apache.flex.flexjs</groupId>
+ <artifactId>flexjs-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -72,25 +72,28 @@
-->
<profiles>
<profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
+ <id>minimal</id>
+ <modules>
+ <module>compiler-build-tools</module>
+ <module>compiler-jburg-types</module>
+ <module>flexjs-maven-plugin</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>compiler</id>
<modules>
<module>compiler</module>
<module>compiler-jx</module>
<module>flex-compiler-oem</module>
- <module>externs</module>
<module>flexjs-maven-plugin</module>
</modules>
</profile>
<profile>
- <id>minimal</id>
+ <id>externs</id>
<modules>
- <module>compiler-build-tools</module>
- <module>compiler-jburg-types</module>
- <module>flexjs-maven-plugin</module>
+ <module>externs</module>
</modules>
</profile>
</profiles>