This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 86e3b341beca569f2c2b862f2749b9e332e70ea0 Author: Josh Tynjala <[email protected]> AuthorDate: Wed Mar 24 10:30:32 2021 -0700 Maven Distribution: does not require Adobe artifacts to create a distribution If distributionTargetFolder is specified, Adobe artifacts are still required. The change is that a zip/tar.gz distribution does not include Adobe dependencies because they were not actually used. We could potentially use the Apache playerglobal for distributionTargetFolder, but we don't have a full alternative to the AIR SDK (only to airglobal). --- distribution/pom.xml | 113 ++++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index cc64fbb..f3dbf63 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -960,7 +960,64 @@ <artifactId>swfobject</artifactId> <version>2.2</version> </dependency> + </dependencies> + </profile> + <profile> + <id>_create-distribution-in-folder</id> + <activation> + <property> + <name>distributionTargetFolder</name> + </property> + </activation> + <build> + <plugins> + <!-- Not clean since this removes unpacked closure-library from temp folder and prevents the copy to js/lib/google folder --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <executions> + <execution> + <id>clean-distribution-target-folder</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory>${distributionTargetFolder}</directory> + </fileset> + </filesets> + <failOnError>false</failOnError> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-distribution-folder</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>./</finalName> + <appendAssemblyId>false</appendAssemblyId> + <attach>false</attach> + <outputDirectory>${distributionTargetFolder}</outputDirectory> + <descriptors> + <descriptor>src/main/assembly/${assembly.dir}</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>com.adobe.flash</groupId> <artifactId>framework</artifactId> @@ -1037,62 +1094,6 @@ </dependency> </dependencies> </profile> - - <profile> - <id>_create-distribution-in-folder</id> - <activation> - <property> - <name>distributionTargetFolder</name> - </property> - </activation> - <build> - <plugins> - <!-- Not clean since this removes unpacked closure-library from temp folder and prevents the copy to js/lib/google folder --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <executions> - <execution> - <id>clean-distribution-target-folder</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <filesets> - <fileset> - <directory>${distributionTargetFolder}</directory> - </fileset> - </filesets> - <failOnError>false</failOnError> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-distribution-folder</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>./</finalName> - <appendAssemblyId>false</appendAssemblyId> - <attach>false</attach> - <outputDirectory>${distributionTargetFolder}</outputDirectory> - <descriptors> - <descriptor>src/main/assembly/${assembly.dir}</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> <!-- <profile> <id>_os-windows</id> <activation>
