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/11/10 08:49:31 UTC
[36/50] git commit: [flex-asjs] [refs/heads/develop] - - Fixed some
minor things in the poms.
- Fixed some minor things in the poms.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/dd642108
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dd642108
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dd642108
Branch: refs/heads/develop
Commit: dd64210895ffd82b1a10a790f2ddc1534df30d5b
Parents: a6ea45a
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Mon Nov 7 08:00:03 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Mon Nov 7 08:00:03 2016 +0100
----------------------------------------------------------------------
examples/flexjs/MDLExample/pom.xml | 15 ++++++++-----
examples/pom.xml | 37 ++++++++++++++++++---------------
2 files changed, 30 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dd642108/examples/flexjs/MDLExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/pom.xml b/examples/flexjs/MDLExample/pom.xml
index 3a31b25..464adca 100644
--- a/examples/flexjs/MDLExample/pom.xml
+++ b/examples/flexjs/MDLExample/pom.xml
@@ -36,13 +36,18 @@
<build>
<sourceDirectory>src/main/flex</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <flashVersion>20.0</flashVersion>
+ <!--flashVersion>20.0</flashVersion-->
<mainClass>App.mxml</mainClass>
</configuration>
<executions>
@@ -72,12 +77,12 @@
</build>
<dependencies>
- <dependency>
+ <!--dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>Core</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
@@ -96,7 +101,7 @@
</dependency>
<!-- Needed for JavaScript compilation -->
- <dependency>
+ <!--dependency>
<groupId>org.apache.flex.flexjs.framework</groupId>
<artifactId>HTML</artifactId>
<version>0.8.0-SNAPSHOT</version>
@@ -107,7 +112,7 @@
<artifactId>Language</artifactId>
<version>0.8.0-SNAPSHOT</version>
<type>swc</type>
- </dependency>
+ </dependency-->
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dd642108/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 6f981d4..e0c8976 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -34,6 +34,10 @@
<name>Apache Flex - FlexJS: Examples</name>
+ <properties>
+ <compiler.output-dir>${basedir}/target/javascript/bin/js-debug</compiler.output-dir>
+ </properties>
+
<modules>
<module>flexjs</module>
<!--module>native</module-->
@@ -51,6 +55,15 @@
</resources>
<pluginManagement>
<plugins>
+ <!-- Copy the resources to the compiler output directory -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.1</version>
+ <configuration>
+ <outputDirectory>${compiler.output-dir}</outputDirectory>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-maven-plugin</artifactId>
@@ -84,13 +97,13 @@
</execution>
</executions>
<configuration>
- <warSourceDirectory>${basedir}/target/javascript/bin/js-debug</warSourceDirectory>
+ <warSourceDirectory>${compiler.output-dir}</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
- <webResources>
+ <!--webResources>
<resource>
<directory>${build.outputDirectory}</directory>
</resource>
- </webResources>
+ </webResources-->
</configuration>
</plugin>
<plugin>
@@ -130,20 +143,10 @@
<profiles>
<profile>
<id>release</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <warSourceDirectory>${basedir}/target/javascript/bin/js-release</warSourceDirectory>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+
+ <properties>
+ <compiler.output-dir>${basedir}/target/javascript/bin/js-release</compiler.output-dir>
+ </properties>
</profile>
<profile>