[royale-asjs] branch develop updated (024c280 -> b469a70)

[ca...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.


    from 024c280  Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
     new 56c88ae  - Bumped the version of the downloader-maven-plugin to avoid problems with newer maven versions. - Adjusted the distribution assemblies to not refer to the flashplayer resources in the config-descriptors (flex-config and royale-config) in the "without-swf" build
     new 055d8c9  - Bumped the version of the downloader-maven-plugin to avoid problems with newer maven versions.
     new b469a70  Merge pull request #756 from chrisdutz/develop

The 10602 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 distribution/src/main/assembly/bin.xml             |   1 +
 .../main/assembly/component-royale-with-swf.xml    |  10 +
 ...th-swf.xml => component-royale-without-swf.xml} |  19 +-
 distribution/src/main/assembly/dir.xml             |   1 +
 .../frameworks/flex-config-template.xml            |   0
 .../frameworks/flex-config.xml                     |   0
 .../frameworks/royale-config-template.xml          | 992 ++++++++++-----------
 .../frameworks/royale-config.xml                   | 992 ++++++++++-----------
 .../frameworks/flex-config-template.xml            |   2 -
 .../frameworks/flex-config.xml                     |   2 -
 .../frameworks/royale-config-template.xml}         |  17 +-
 .../frameworks/royale-config.xml}                  |  23 +-
 pom.xml                                            |   5 +-
 13 files changed, 1031 insertions(+), 1033 deletions(-)
 copy distribution/src/main/assembly/{component-royale-with-swf.xml => component-royale-without-swf.xml} (72%)
 copy distribution/src/main/{resources => resources-with-swf}/frameworks/flex-config-template.xml (100%)
 copy distribution/src/main/{resources => resources-with-swf}/frameworks/flex-config.xml (100%)
 rename distribution/src/main/{resources => resources-with-swf}/frameworks/royale-config-template.xml (97%)
 rename distribution/src/main/{resources => resources-with-swf}/frameworks/royale-config.xml (97%)
 copy distribution/src/main/{resources => resources-without-swf}/frameworks/flex-config-template.xml (98%)
 rename distribution/src/main/{resources => resources-without-swf}/frameworks/flex-config.xml (99%)
 copy distribution/src/main/{resources/frameworks/flex-config-template.xml => resources-without-swf/frameworks/royale-config-template.xml} (97%)
 rename distribution/src/main/{resources/frameworks/flex-config-template.xml => resources-without-swf/frameworks/royale-config.xml} (97%)