flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [3/3] git commit: [flex-falcon] [refs/heads/develop] - - 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
Date Wed, 01 Jun 2016 18:08:52 GMT
- 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-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2ff93a10
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2ff93a10
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2ff93a10

Branch: refs/heads/develop
Commit: 2ff93a10f0706f5ea7ac37ae77b753132cdc1865
Parents: b158ecb
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Wed Jun 1 20:08:36 2016 +0200
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Wed Jun 1 20:08:36 2016 +0200

----------------------------------------------------------------------
 externs/createjs/pom.xml                       |   39 +-
 externs/createjs/src/main/patch/easeljs2.patch | 8636 -------------------
 externs/createjs/src/main/patch/tweenjs2.patch | 1462 ----
 externs/google_maps/pom.xml                    |   26 +-
 externs/jquery/pom.xml                         |   28 +-
 externs/js/pom.xml                             |   29 +-
 6 files changed, 64 insertions(+), 10156 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2ff93a10/externs/createjs/pom.xml
----------------------------------------------------------------------
diff --git a/externs/createjs/pom.xml b/externs/createjs/pom.xml
index d2f5dd0..26d726f 100644
--- a/externs/createjs/pom.xml
+++ b/externs/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>


Mime
View raw message