Repository: flex-falcon Updated Branches: refs/heads/feature/maven-migration 2ea20e71a -> f151cd603
- Added moving of the "feature-tests" and "functional-tests" into the compiler project - Added a maven-failsafe-plugin configuration to the build to run the integration-tests. Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f151cd60 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f151cd60 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f151cd60 Branch: refs/heads/feature/maven-migration Commit: f151cd60341d4f06a548cfabd951b2829ca775ca Parents: 2ea20e7 Author: Christofer Dutz <[email protected]> Authored: Wed Feb 24 12:49:21 2016 +0100 Committer: Christofer Dutz <[email protected]> Committed: Wed Feb 24 12:49:21 2016 +0100 ---------------------------------------------------------------------- compiler/pom.xml | 34 +++++++++++++++++++++++++++++++++- migrate-to-maven.sh | 4 ++++ 2 files changed, 37 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f151cd60/compiler/pom.xml ---------------------------------------------------------------------- diff --git a/compiler/pom.xml b/compiler/pom.xml index 4416749..45894d1 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -299,10 +299,12 @@ <!-- Make the surefire execute all unit-tests --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>2.19</version> <configuration> <includes> - <include>**/*Tests.java</include> + <include>org/**/*Tests.java</include> </includes> <systemPropertyVariables> <buildType>Maven</buildType> @@ -321,6 +323,36 @@ <enableAssertions>false</enableAssertions> </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.18.1</version> + <executions> + <execution> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + </execution> + </executions> + <configuration> + <includes> + <include>as/**/*Tests.java</include> + <include>mxml/**/*Tests.java</include> + <include>properties/**/*Tests.java</include> + <include>f/**/*Tests.java</include> + </includes> + <systemPropertyVariables> + <buildType>Maven</buildType> + <flexVersion>${flex.version}</flexVersion> + <flashVersion>${flash.version}</flashVersion> + <airVersion>${air.version}</airVersion> + <mavenLocalRepoDir>${settings.localRepository}</mavenLocalRepoDir> + <FLASHPLAYER_DEBUGGER>/Users/christoferdutz/Devtools/Adobe/Flash/19.0/Flash Player.app/Contents/MacOS/Flash Player Debugger</FLASHPLAYER_DEBUGGER> + </systemPropertyVariables> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f151cd60/migrate-to-maven.sh ---------------------------------------------------------------------- diff --git a/migrate-to-maven.sh b/migrate-to-maven.sh index 6ffd683..d2ee1de 100755 --- a/migrate-to-maven.sh +++ b/migrate-to-maven.sh @@ -63,6 +63,10 @@ mkdir -p compiler/temp mkdir -p compiler/results git mv compiler.tests/unit-tests/org compiler/src/test/java git mv compiler.tests/src/org/apache/flex/utils compiler/src/test/java/org/apache/flex +git mv compiler.tests/feature-tests/as compiler/src/test/java +git mv compiler.tests/feature-tests/mxml compiler/src/test/java +git mv compiler.tests/feature-tests/properties compiler/src/test/java +git mv compiler.tests/functional-tests/f compiler/src/test/java ############################################# ## Convert the compiler.jx module
