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 2017/05/01 17:16:44 UTC
git commit: [flex-asjs] [refs/heads/develop] - - Post dual branch
merge cleanup
Repository: flex-asjs
Updated Branches:
refs/heads/develop 986d75596 -> ed2503e4e
- Post dual branch merge cleanup
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ed2503e4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ed2503e4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ed2503e4
Branch: refs/heads/develop
Commit: ed2503e4ec9a260a026008ba9b2737992d8b53a8
Parents: 986d755
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon May 1 19:16:26 2017 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon May 1 19:16:39 2017 +0200
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
examples/native/ButtonExample/pom.xml | 1 -
examples/native/USStatesMap/pom.xml | 1 -
testsuite/src/it/compiler-options/custom-html-template/pom.xml | 2 +-
5 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed2503e4/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
index 637e719..637b3c1 100644
--- a/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/flexjs-simple-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -53,7 +53,7 @@
</goals>
<configuration>
<debug>\${compiler.debug}</debug>
- <outputJavaScript>true</outputJavaScript>
+ <targets>JS</targets>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed2503e4/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
index 66360ea..ad6af3a 100644
--- a/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/flexjs-simple-application-pure-js-archetype/src/main/resources/archetype-resources/pom.xml
@@ -42,8 +42,8 @@
<extensions>true</extensions>
<configuration>
<mainClass>App.mxml</mainClass>
- <outputJavaScript>true</outputJavaScript>
<debug>\${compiler.debug}</debug>
+ <targets>JS</targets>
</configuration>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed2503e4/examples/native/ButtonExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/native/ButtonExample/pom.xml b/examples/native/ButtonExample/pom.xml
index b81d238..17b1942 100644
--- a/examples/native/ButtonExample/pom.xml
+++ b/examples/native/ButtonExample/pom.xml
@@ -41,7 +41,6 @@
<artifactId>flexjs-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <outputJavaScript>true</outputJavaScript>
<mainClass>ButtonExample.as</mainClass>
<targets>JS</targets>
</configuration>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed2503e4/examples/native/USStatesMap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/native/USStatesMap/pom.xml b/examples/native/USStatesMap/pom.xml
index 936866d..7c6d81e 100644
--- a/examples/native/USStatesMap/pom.xml
+++ b/examples/native/USStatesMap/pom.xml
@@ -42,7 +42,6 @@
<version>${flexjs.compiler.version}</version>
<extensions>true</extensions>
<configuration>
- <outputJavaScript>true</outputJavaScript>
<mainClass>USStatesMap.as</mainClass>
<targets>JS</targets>
</configuration>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ed2503e4/testsuite/src/it/compiler-options/custom-html-template/pom.xml
----------------------------------------------------------------------
diff --git a/testsuite/src/it/compiler-options/custom-html-template/pom.xml b/testsuite/src/it/compiler-options/custom-html-template/pom.xml
index d6096d5..74ff0d0 100644
--- a/testsuite/src/it/compiler-options/custom-html-template/pom.xml
+++ b/testsuite/src/it/compiler-options/custom-html-template/pom.xml
@@ -43,7 +43,7 @@
<configuration>
<debug>true</debug>
<mainClass>HelloWorld.mxml</mainClass>
- <outputJavaScript>true</outputJavaScript>
+ <targets>JS</targets>
<htmlTemplate>${basedir}/src/main/template/custom-js-index-template.html</htmlTemplate>
</configuration>
<dependencies>