Repository: flex-asjs Updated Branches: refs/heads/develop 2b70fb01e -> 4a666879f
- Added a PackageJSMojo to make the usage of the maven-war-plugin and the build-helper-plugin obsolete. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4a666879 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4a666879 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4a666879 Branch: refs/heads/develop Commit: 4a666879ffa8c1b8053a97e8b227a932d953df83 Parents: 2b70fb0 Author: Christofer Dutz <[email protected]> Authored: Sat Mar 11 21:56:42 2017 +0100 Committer: Christofer Dutz <[email protected]> Committed: Sat Mar 11 21:56:42 2017 +0100 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 40 -------------- .../main/resources/archetype-resources/pom.xml | 40 -------------- .../flexjs/examples/tests/ExampleBuildTest.java | 6 --- examples/express/DataBindingExample/pom.xml | 8 --- examples/flexjs/ASDoc/pom.xml | 8 --- examples/flexjs/ChartExample/pom.xml | 8 --- examples/flexjs/CordovaCameraExample/pom.xml | 4 -- examples/flexjs/CreateJSExample/pom.xml | 8 --- examples/flexjs/DataBindingExample/pom.xml | 8 --- examples/flexjs/DataBindingExample_Flat/pom.xml | 55 +++++++++++++------- examples/flexjs/DataBindingExample_as/pom.xml | 8 --- examples/flexjs/DataGridExample/pom.xml | 8 --- examples/flexjs/DateControlsExample/pom.xml | 8 --- examples/flexjs/DesktopMap/pom.xml | 8 --- examples/flexjs/FlexJSStore/pom.xml | 8 --- examples/flexjs/FlexJSStore_jquery/pom.xml | 8 --- examples/flexjs/FlexTeamPage_MDL/pom.xml | 8 --- examples/flexjs/FlexWebsiteStatsViewer/pom.xml | 8 --- examples/flexjs/HelloWorld/pom.xml | 8 --- examples/flexjs/ListExample/pom.xml | 8 --- examples/flexjs/MDLBlogExample/pom.xml | 8 --- examples/flexjs/MDLDynamicTabsExample/pom.xml | 8 --- examples/flexjs/MDLExample/pom.xml | 8 --- examples/flexjs/MapSearch/pom.xml | 8 --- examples/flexjs/MobileMap/pom.xml | 8 --- examples/flexjs/MobileStocks/pom.xml | 8 --- examples/flexjs/MobileTrader/pom.xml | 8 --- examples/flexjs/StorageExample/pom.xml | 8 --- examples/flexjs/StyleExample/pom.xml | 8 --- examples/flexjs/TeamPage/pom.xml | 8 --- examples/flexjs/TodoListSampleApp/pom.xml | 8 --- examples/flexjs/TreeExample/pom.xml | 8 --- examples/flexjs/pom.xml | 2 + examples/native/ButtonExample/pom.xml | 8 --- examples/native/USStatesMap/pom.xml | 8 --- examples/pom.xml | 45 ---------------- .../custom-html-template/pom.xml | 40 -------------- 37 files changed, 38 insertions(+), 426 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/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 d3930c7..637e719 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 @@ -65,46 +65,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>package-javascript</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - </execution> - </executions> - <configuration> - <warSourceDirectory>\${compiler.output-dir}</warSourceDirectory> - <failOnMissingWebXml>false</failOnMissingWebXml> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.11</version> - <executions> - <execution> - <id>attach-war</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - </execution> - </executions> - <configuration> - <artifacts> - <artifact> - <file>target/\${artifactId}-\${version}.war</file> - <type>war</type> - </artifact> - </artifacts> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/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 fb2f161..66360ea 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 @@ -53,46 +53,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>package-javascript</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - </execution> - </executions> - <configuration> - <warSourceDirectory>\${compiler.output-dir}</warSourceDirectory> - <failOnMissingWebXml>false</failOnMissingWebXml> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.11</version> - <executions> - <execution> - <id>attach-war</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - </execution> - </executions> - <configuration> - <artifacts> - <artifact> - <file>target/\${artifactId}-\${version}.war</file> - <type>war</type> - </artifact> - </artifacts> - </configuration> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java ---------------------------------------------------------------------- diff --git a/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java b/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java index cde764f..9fcd1f7 100644 --- a/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java +++ b/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java @@ -56,12 +56,6 @@ public class ExampleBuildTest { File buildDirectory = getBuildDirectory(); - File explodedWarDirectory = new File(buildDirectory, getArtifactId() + "-" + getVersion()); - Assert.assertTrue("The exploded WAR directory doesn't exist.", explodedWarDirectory.exists()); - Assert.assertTrue("The exploded WAR directory is not a directory.", explodedWarDirectory.isDirectory()); - File[] content = explodedWarDirectory.listFiles(); - Assert.assertTrue("The exploded WAR directory is empty.", content != null && content.length > 0); - File warFile = new File(buildDirectory, getArtifactId() + "-" + getVersion() + ".war"); Assert.assertTrue("The WAR file doesn't exist.", warFile.exists()); Assert.assertTrue("The WAR file is not a file.", warFile.isFile()); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/express/DataBindingExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/express/DataBindingExample/pom.xml b/examples/express/DataBindingExample/pom.xml index 777898a..58ff0fa 100644 --- a/examples/express/DataBindingExample/pom.xml +++ b/examples/express/DataBindingExample/pom.xml @@ -44,14 +44,6 @@ <mainClass>DataBindingExample.mxml</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/ASDoc/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/ASDoc/pom.xml b/examples/flexjs/ASDoc/pom.xml index a212699..9039b94 100644 --- a/examples/flexjs/ASDoc/pom.xml +++ b/examples/flexjs/ASDoc/pom.xml @@ -45,14 +45,6 @@ <removeCirculars>true</removeCirculars> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/ChartExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/ChartExample/pom.xml b/examples/flexjs/ChartExample/pom.xml index fada9d5..73460f8 100644 --- a/examples/flexjs/ChartExample/pom.xml +++ b/examples/flexjs/ChartExample/pom.xml @@ -50,14 +50,6 @@ <mainClass>ChartExample.mxml</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/CordovaCameraExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/CordovaCameraExample/pom.xml b/examples/flexjs/CordovaCameraExample/pom.xml index 694629b..46c950b 100644 --- a/examples/flexjs/CordovaCameraExample/pom.xml +++ b/examples/flexjs/CordovaCameraExample/pom.xml @@ -45,10 +45,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> <groupId>org.jboss.errai</groupId> <artifactId>cordova-maven-plugin</artifactId> </plugin> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/CreateJSExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/CreateJSExample/pom.xml b/examples/flexjs/CreateJSExample/pom.xml index 4637f69..9e918df 100644 --- a/examples/flexjs/CreateJSExample/pom.xml +++ b/examples/flexjs/CreateJSExample/pom.xml @@ -50,14 +50,6 @@ <mainClass>CreateJSExample.mxml</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/DataBindingExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataBindingExample/pom.xml b/examples/flexjs/DataBindingExample/pom.xml index 777898a..58ff0fa 100644 --- a/examples/flexjs/DataBindingExample/pom.xml +++ b/examples/flexjs/DataBindingExample/pom.xml @@ -44,14 +44,6 @@ <mainClass>DataBindingExample.mxml</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/DataBindingExample_Flat/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataBindingExample_Flat/pom.xml b/examples/flexjs/DataBindingExample_Flat/pom.xml index 5829ad5..60a1f39 100644 --- a/examples/flexjs/DataBindingExample_Flat/pom.xml +++ b/examples/flexjs/DataBindingExample_Flat/pom.xml @@ -44,6 +44,20 @@ <name>Apache Flex - FlexJS: Examples: FlexJS: DataBindingExample_Flat</name> + <properties> + <war.source.directory>${project.build.directory}/javascript/bin/js-debug</war.source.directory> + </properties> + + <profiles> + <profile> + <id>release</id> + + <properties> + <war.source.directory>${project.build.directory}/javascript/bin/js-release</war.source.directory> + </properties> + </profile> + </profiles> + <build> <plugins> <plugin> @@ -57,25 +71,28 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <!-- - Add the content of the 'Fonts' artifact inside a 'fonts' directory, - making the font definitions available to the JavaScript application. - --> - <overlays> - <overlay> - <id>add-font-resources</id> - <groupId>org.apache.flex.flexjs.framework</groupId> - <artifactId>Fonts</artifactId> - <targetPath>fonts</targetPath> - </overlay> - </overlays> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <executions> + <execution> + <id>unpack-fonts</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.flex.flexjs.framework</groupId> + <artifactId>Fonts</artifactId> + <version>0.8.0-SNAPSHOT</version> + <type>war</type> + <outputDirectory>${war.source.directory}/fonts</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/DataBindingExample_as/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataBindingExample_as/pom.xml b/examples/flexjs/DataBindingExample_as/pom.xml index 0a17945..8644723 100644 --- a/examples/flexjs/DataBindingExample_as/pom.xml +++ b/examples/flexjs/DataBindingExample_as/pom.xml @@ -71,14 +71,6 @@ </defines> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/DataGridExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DataGridExample/pom.xml b/examples/flexjs/DataGridExample/pom.xml index b65b0f0..864d13b 100644 --- a/examples/flexjs/DataGridExample/pom.xml +++ b/examples/flexjs/DataGridExample/pom.xml @@ -48,14 +48,6 @@ <mainClass>DataGridExample.mxml</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/DateControlsExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DateControlsExample/pom.xml b/examples/flexjs/DateControlsExample/pom.xml index 2883693..98c0e37 100644 --- a/examples/flexjs/DateControlsExample/pom.xml +++ b/examples/flexjs/DateControlsExample/pom.xml @@ -48,14 +48,6 @@ <mainClass>DateControlsExample.mxml</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/DesktopMap/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/DesktopMap/pom.xml b/examples/flexjs/DesktopMap/pom.xml index b28d9de..97636c3 100644 --- a/examples/flexjs/DesktopMap/pom.xml +++ b/examples/flexjs/DesktopMap/pom.xml @@ -51,14 +51,6 @@ <removeCirculars>true</removeCirculars> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/FlexJSStore/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore/pom.xml b/examples/flexjs/FlexJSStore/pom.xml index 4dc7316..5a1e60b 100644 --- a/examples/flexjs/FlexJSStore/pom.xml +++ b/examples/flexjs/FlexJSStore/pom.xml @@ -58,14 +58,6 @@ <removeCirculars>true</removeCirculars> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/FlexJSStore_jquery/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexJSStore_jquery/pom.xml b/examples/flexjs/FlexJSStore_jquery/pom.xml index c5a3c87..4d69be0 100644 --- a/examples/flexjs/FlexJSStore_jquery/pom.xml +++ b/examples/flexjs/FlexJSStore_jquery/pom.xml @@ -59,14 +59,6 @@ <removeCirculars>true</removeCirculars> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/FlexTeamPage_MDL/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexTeamPage_MDL/pom.xml b/examples/flexjs/FlexTeamPage_MDL/pom.xml index 51e67e0..4a27c04 100644 --- a/examples/flexjs/FlexTeamPage_MDL/pom.xml +++ b/examples/flexjs/FlexTeamPage_MDL/pom.xml @@ -59,14 +59,6 @@ <additionalCompilerOptions>-compiler.exclude-defaults-css-files=HTML-0.8.0-SNAPSHOT.swc:defaults.css</additionalCompilerOptions> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/FlexWebsiteStatsViewer/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml index 13574e5..801d6c3 100644 --- a/examples/flexjs/FlexWebsiteStatsViewer/pom.xml +++ b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml @@ -45,14 +45,6 @@ <removeCirculars>true</removeCirculars> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/HelloWorld/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/HelloWorld/pom.xml b/examples/flexjs/HelloWorld/pom.xml index 8a30d11..ed2c578 100644 --- a/examples/flexjs/HelloWorld/pom.xml +++ b/examples/flexjs/HelloWorld/pom.xml @@ -44,14 +44,6 @@ <mainClass>HelloWorld.mxml</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/ListExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/ListExample/pom.xml b/examples/flexjs/ListExample/pom.xml index cf86a1a..1904e11 100644 --- a/examples/flexjs/ListExample/pom.xml +++ b/examples/flexjs/ListExample/pom.xml @@ -51,14 +51,6 @@ <!--flashVersion>20.0</flashVersion--> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/MDLBlogExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLBlogExample/pom.xml b/examples/flexjs/MDLBlogExample/pom.xml index bd243f2..654f05a 100644 --- a/examples/flexjs/MDLBlogExample/pom.xml +++ b/examples/flexjs/MDLBlogExample/pom.xml @@ -59,14 +59,6 @@ <additionalCompilerOptions>-compiler.exclude-defaults-css-files=HTML-0.8.0-SNAPSHOT.swc:defaults.css</additionalCompilerOptions> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/MDLDynamicTabsExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLDynamicTabsExample/pom.xml b/examples/flexjs/MDLDynamicTabsExample/pom.xml index 07c0d4b..2531f2b 100644 --- a/examples/flexjs/MDLDynamicTabsExample/pom.xml +++ b/examples/flexjs/MDLDynamicTabsExample/pom.xml @@ -54,14 +54,6 @@ <additionalCompilerOptions>-compiler.exclude-defaults-css-files=HTML-0.8.0-SNAPSHOT.swc:defaults.css</additionalCompilerOptions> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/MDLExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/pom.xml b/examples/flexjs/MDLExample/pom.xml index 6272e76..2dc28f4 100644 --- a/examples/flexjs/MDLExample/pom.xml +++ b/examples/flexjs/MDLExample/pom.xml @@ -59,14 +59,6 @@ <additionalCompilerOptions>-compiler.exclude-defaults-css-files=HTML-0.8.0-SNAPSHOT.swc:defaults.css</additionalCompilerOptions> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/MapSearch/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MapSearch/pom.xml b/examples/flexjs/MapSearch/pom.xml index bad5543..322e868 100644 --- a/examples/flexjs/MapSearch/pom.xml +++ b/examples/flexjs/MapSearch/pom.xml @@ -55,14 +55,6 @@ <removeCirculars>true</removeCirculars> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/MobileMap/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileMap/pom.xml b/examples/flexjs/MobileMap/pom.xml index a58585c..e19255f 100644 --- a/examples/flexjs/MobileMap/pom.xml +++ b/examples/flexjs/MobileMap/pom.xml @@ -50,14 +50,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.jboss.errai</groupId> <artifactId>cordova-maven-plugin</artifactId> </plugin> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/MobileStocks/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileStocks/pom.xml b/examples/flexjs/MobileStocks/pom.xml index dd9a9f2..bed67e8 100644 --- a/examples/flexjs/MobileStocks/pom.xml +++ b/examples/flexjs/MobileStocks/pom.xml @@ -52,14 +52,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.jboss.errai</groupId> <artifactId>cordova-maven-plugin</artifactId> </plugin> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/MobileTrader/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MobileTrader/pom.xml b/examples/flexjs/MobileTrader/pom.xml index 12d0ac6..73121a8 100644 --- a/examples/flexjs/MobileTrader/pom.xml +++ b/examples/flexjs/MobileTrader/pom.xml @@ -52,14 +52,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.jboss.errai</groupId> <artifactId>cordova-maven-plugin</artifactId> </plugin> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/StorageExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/StorageExample/pom.xml b/examples/flexjs/StorageExample/pom.xml index 870dcc9..cdb4ab1 100644 --- a/examples/flexjs/StorageExample/pom.xml +++ b/examples/flexjs/StorageExample/pom.xml @@ -45,14 +45,6 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.jboss.errai</groupId> <artifactId>cordova-maven-plugin</artifactId> </plugin> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/StyleExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/StyleExample/pom.xml b/examples/flexjs/StyleExample/pom.xml index 5a76f9b..611c0a0 100644 --- a/examples/flexjs/StyleExample/pom.xml +++ b/examples/flexjs/StyleExample/pom.xml @@ -56,14 +56,6 @@ <removeCirculars>true</removeCirculars> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/TeamPage/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/TeamPage/pom.xml b/examples/flexjs/TeamPage/pom.xml index 709f291..20568e4 100644 --- a/examples/flexjs/TeamPage/pom.xml +++ b/examples/flexjs/TeamPage/pom.xml @@ -47,14 +47,6 @@ <!--flashVersion>20.0</flashVersion--> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/TodoListSampleApp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/TodoListSampleApp/pom.xml b/examples/flexjs/TodoListSampleApp/pom.xml index d7a4901..95b5acf 100644 --- a/examples/flexjs/TodoListSampleApp/pom.xml +++ b/examples/flexjs/TodoListSampleApp/pom.xml @@ -50,14 +50,6 @@ <mainClass>TodoListSampleApp.mxml</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/TreeExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/TreeExample/pom.xml b/examples/flexjs/TreeExample/pom.xml index 2cfb0b4..10dd400 100644 --- a/examples/flexjs/TreeExample/pom.xml +++ b/examples/flexjs/TreeExample/pom.xml @@ -44,14 +44,6 @@ <mainClass>TreeExample.mxml</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/flexjs/pom.xml ---------------------------------------------------------------------- diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml index c87be3d..8542cf4 100644 --- a/examples/flexjs/pom.xml +++ b/examples/flexjs/pom.xml @@ -52,6 +52,8 @@ <module>HelloWorld</module> <module>ListExample</module> <module>MapSearch</module> + <module>MDLBlogExample</module> + <module>MDLDynamicTabsExample</module> <module>MDLExample</module> <module>MobileMap</module> <module>MobileStocks</module> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/native/ButtonExample/pom.xml ---------------------------------------------------------------------- diff --git a/examples/native/ButtonExample/pom.xml b/examples/native/ButtonExample/pom.xml index fa34cf9..aacf74f 100644 --- a/examples/native/ButtonExample/pom.xml +++ b/examples/native/ButtonExample/pom.xml @@ -45,14 +45,6 @@ <mainClass>ButtonExample.as</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/native/USStatesMap/pom.xml ---------------------------------------------------------------------- diff --git a/examples/native/USStatesMap/pom.xml b/examples/native/USStatesMap/pom.xml index efee76c..13755b8 100644 --- a/examples/native/USStatesMap/pom.xml +++ b/examples/native/USStatesMap/pom.xml @@ -46,14 +46,6 @@ <mainClass>USStatesMap.as</mainClass> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/examples/pom.xml ---------------------------------------------------------------------- diff --git a/examples/pom.xml b/examples/pom.xml index 1e1257b..d5aba43 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -85,51 +85,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>package-javascript</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - </execution> - </executions> - <configuration> - <warSourceDirectory>${compiler.output-dir}</warSourceDirectory> - <failOnMissingWebXml>false</failOnMissingWebXml> - <!--webResources> - <resource> - <directory>${compiler.output-dir}</directory> - </resource> - </webResources--> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.11</version> - <executions> - <execution> - <id>attach-war</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - </execution> - </executions> - <configuration> - <artifacts> - <artifact> - <file>${basedir}/target/${project.artifactId}-${project.version}.war</file> - <type>war</type> - </artifact> - </artifacts> - </configuration> - </plugin> - <plugin> <groupId>org.jboss.errai</groupId> <artifactId>cordova-maven-plugin</artifactId> <version>4.0.0.Beta2</version> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4a666879/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 298904e..d6096d5 100644 --- a/testsuite/src/it/compiler-options/custom-html-template/pom.xml +++ b/testsuite/src/it/compiler-options/custom-html-template/pom.xml @@ -54,46 +54,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>package-javascript</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - </execution> - </executions> - <configuration> - <warSourceDirectory>${basedir}/target/javascript/bin/js-debug</warSourceDirectory> - <failOnMissingWebXml>false</failOnMissingWebXml> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.11</version> - <executions> - <execution> - <id>attach-war</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - </execution> - </executions> - <configuration> - <artifacts> - <artifact> - <file>${basedir}/target/${project.artifactId}-${project.version}.war</file> - <type>war</type> - </artifact> - </artifacts> - </configuration> - </plugin> </plugins> </build>
