- Chaned the build to use exec-maven-plugin with git instead of the maven-patch-plugin, which calls a "patch" executable itself - Removed my alternate patches
Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/3a049675 Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/3a049675 Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/3a049675 Branch: refs/heads/master Commit: 3a049675d9ab0da7a5bfc260404d544740914fe8 Parents: 871e82f Author: Christofer Dutz <[email protected]> Authored: Wed Jun 1 20:08:36 2016 +0200 Committer: Christofer Dutz <[email protected]> Committed: Wed Jun 1 20:08:36 2016 +0200 ---------------------------------------------------------------------- createjs/pom.xml | 39 +- createjs/src/main/patch/easeljs2.patch | 8636 --------------------------- createjs/src/main/patch/tweenjs2.patch | 1462 ----- google_maps/pom.xml | 26 +- jquery/pom.xml | 28 +- js/pom.xml | 29 +- 6 files changed, 64 insertions(+), 10156 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/3a049675/createjs/pom.xml ---------------------------------------------------------------------- diff --git a/createjs/pom.xml b/createjs/pom.xml index d2f5dd0..26d726f 100644 --- a/createjs/pom.xml +++ b/createjs/pom.xml @@ -77,40 +77,41 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-patch-plugin</artifactId> - <version>1.2</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.5.0</version> <configuration> - <patchDirectory>src/main/patch</patchDirectory> - <strip>2</strip> - <binary>true</binary> + <executable>git</executable> + <workingDirectory>${basedir}/../..</workingDirectory> + <arguments> + <argument>apply</argument> + <argument>--ignore-whitespace</argument> + <argument>--whitespace=nowarn</argument> + </arguments> </configuration> <executions> <execution> <id>patch-easeljs</id> <phase>validate</phase> <goals> - <goal>apply</goal> + <goal>exec</goal> </goals> <configuration> - <patches> - <patch>easeljs2.patch</patch> - </patches> - <ignoreWhitespace>true</ignoreWhitespace> - <targetDirectory>${project.build.directory}/downloads/EaselJS-${createjs.version}/src</targetDirectory> + <arguments combine.children="append"> + <argument>${basedir}/src/main/patch/easeljs.patch</argument> + </arguments> </configuration> </execution> <execution> <id>patch-tweenjs</id> <phase>validate</phase> <goals> - <goal>apply</goal> + <goal>exec</goal> </goals> <configuration> - <patches> - <patch>tweenjs2.patch</patch> - </patches> - <targetDirectory>${project.build.directory}/downloads/TweenJS-${tweenjs.version}/src</targetDirectory> + <arguments combine.children="append"> + <argument>${basedir}/src/main/patch/tweenjs.patch</argument> + </arguments> </configuration> </execution> </executions> @@ -136,8 +137,8 @@ <include>**/*.js</include> </includes> <excludes> - <exclude>version.js</exclude> - <exclude>version_movieclip.js</exclude> + <exclude>easeljs/version.js</exclude> + <exclude>easeljs/version_movieclip.js</exclude> </excludes> </fileSet> <fileSet>
