Repository: flex-asjs Updated Branches: refs/heads/develop e863dd135 -> deb9bf46a
- Fixed some problems in the generation of the templates/swfobject directory in the distribution Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/deb9bf46 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/deb9bf46 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/deb9bf46 Branch: refs/heads/develop Commit: deb9bf46a311a0956762ab3bf4b4af2db3350f9a Parents: e863dd1 Author: Christofer Dutz <christofer.d...@codecentric.de> Authored: Mon Jan 16 21:51:01 2017 +0100 Committer: Christofer Dutz <christofer.d...@codecentric.de> Committed: Mon Jan 16 21:52:19 2017 +0100 ---------------------------------------------------------------------- distribution/pom.xml | 7 ++++--- distribution/src/main/assembly/component.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/deb9bf46/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/pom.xml b/distribution/pom.xml index a4eeb43..875f65d 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -501,7 +501,7 @@ <version>2.2</version> <type>jar</type> <outputDirectory>${project.build.directory}/swfobject-temp</outputDirectory> - <includes>META-INF/resources/webjars/swfobject/*/**</includes> + <includes>META-INF/resources/**</includes> </artifactItem> </artifactItems> </configuration> @@ -640,7 +640,7 @@ </dependencies> <build> <plugins> - <plugin> + <!--plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> <executions> @@ -656,10 +656,11 @@ <directory>${distributionTargetFolder}</directory> </fileset> </filesets> + <failOnError>false</failOnError> </configuration> </execution> </executions> - </plugin> + </plugin--> <plugin> <artifactId>maven-assembly-plugin</artifactId> <executions> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/deb9bf46/distribution/src/main/assembly/component.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml index 3b5621c..419777d 100644 --- a/distribution/src/main/assembly/component.xml +++ b/distribution/src/main/assembly/component.xml @@ -187,7 +187,7 @@ under the License. </fileSet> <!-- Copy our custom index.html template as well as the history code --> <fileSet> - <directory>src/main/resources/templates/swfobject</directory> + <directory>../templates/swfobject</directory> <outputDirectory>templates/swfobject</outputDirectory> <includes> <include>**</include>
