Repository: flex-falcon Updated Branches: refs/heads/feature/maven-migration e4fa439cb -> 5e58d7e22
- Added the maven extension to activate the sdk-converter - Added some global flex, flash and air version properties - Added some test-dependencies to the compiler project - Added some system properties to the surefire plugin so they are available in the unit-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/5e58d7e2 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/5e58d7e2 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/5e58d7e2 Branch: refs/heads/feature/maven-migration Commit: 5e58d7e22050d4ed94834d6fa8be63ad4a53c487 Parents: e4fa439 Author: Christofer Dutz <[email protected]> Authored: Wed Feb 24 09:19:42 2016 +0100 Committer: Christofer Dutz <[email protected]> Committed: Wed Feb 24 09:19:42 2016 +0100 ---------------------------------------------------------------------- .mvn/extensions.xml | 11 ++++++++++ compiler/pom.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 4 ++++ 3 files changed, 71 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5e58d7e2/.mvn/extensions.xml ---------------------------------------------------------------------- diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000..1a1890b --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,11 @@ +<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd";> + + <extension> + <groupId>org.apache.flex.utilities.converter</groupId> + <artifactId>flex-sdk-converter-maven-extension</artifactId> + <version>1.0.0-SNAPSHOT</version> + </extension> + +</extensions> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5e58d7e2/compiler/pom.xml ---------------------------------------------------------------------- diff --git a/compiler/pom.xml b/compiler/pom.xml index 211d34c..95f0c2b 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -304,6 +304,13 @@ <includes> <include>**/*Tests.java</include> </includes> + <systemPropertyVariables> + <buildType>Maven</buildType> + <flexVersion>${flex.version}</flexVersion> + <flashVersion>${flash.version}</flashVersion> + <airVersion>${air.version}</airVersion> + <mavenLocalRepoDir>${settings.localRepository}</mavenLocalRepoDir> + </systemPropertyVariables> </configuration> </plugin> </plugins> @@ -362,6 +369,55 @@ <version>4.10</version> <scope>test</scope> </dependency> + <!-- + + Importing SWCs will add them to the test classpath. + This might sound strange for a java maven project to + have swc files in its classpath, but this way the + files are automatically downloaded and eventually + even generated/converted by the sdk-converter and we + don't have to think about where to get them from. + + --> + <!-- Import the playerglobal --> + <dependency> + <groupId>com.adobe.flash.framework</groupId> + <artifactId>playerglobal</artifactId> + <version>${flash.version}</version> + <type>swc</type> + <scope>test</scope> + </dependency> + <!-- Import a part of the Flex sdk --> + <dependency> + <groupId>org.apache.flex.framework</groupId> + <artifactId>framework</artifactId> + <version>${flex.version}</version> + <type>swc</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.flex.framework</groupId> + <artifactId>rpc</artifactId> + <version>${flex.version}</version> + <type>swc</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.flex.framework</groupId> + <artifactId>spark</artifactId> + <version>${flex.version}</version> + <type>swc</type> + <scope>test</scope> + </dependency> + <!-- Make sure the framework config-zip is available --> + <dependency> + <groupId>org.apache.flex.framework</groupId> + <artifactId>framework</artifactId> + <version>${flex.version}</version> + <type>zip</type> + <classifier>configs</classifier> + <scope>test</scope> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5e58d7e2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0a2a491..decfcfd 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,10 @@ <properties> <java.version>1.6</java.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + <flex.version>4.15.0</flex.version> + <flash.version>20.0</flash.version> + <air.version>20.0</air.version> </properties> <modules>
