Om, you are committing stuff from develop into release. Please revert. EdB
On Tuesday, December 16, 2014, <bigosma...@apache.org> wrote: > Repository: flex-sdk > Updated Branches: > refs/heads/release4.14.0 74225b253 -> 7a0515845 > > > Update version to 4.15.0 > > Signed-off-by: Erik de Bruin <e...@ixsoftware.nl <javascript:;>> > > > Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo > Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c2628a26 > Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c2628a26 > Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c2628a26 > > Branch: refs/heads/release4.14.0 > Commit: c2628a26a89ca979e5e475f3e5c800eb67558394 > Parents: 51f7344 > Author: Erik de Bruin <e...@ixsoftware.nl <javascript:;>> > Authored: Fri Dec 12 10:33:01 2014 +0100 > Committer: Erik de Bruin <e...@ixsoftware.nl <javascript:;>> > Committed: Fri Dec 12 10:33:01 2014 +0100 > > ---------------------------------------------------------------------- > build.properties | 4 ++-- > .../projects/advancedgrids/src/mx/core/Version.as | 2 +- > .../projects/airframework/src/mx/core/Version.as | 2 +- > .../projects/airspark/src/spark/core/Version.as | 2 +- > frameworks/projects/apache/src/core/Version.as | 2 +- > .../projects/automation/src/mx/core/Version.as | 2 +- > .../automation_agent/src/mx/core/Version.as | 2 +- > .../projects/automation_air/src/mx/core/Version.as | 2 +- > .../projects/automation_dmv/src/mx/core/Version.as | 2 +- > .../automation_flashflexkit/src/mx/core/Version.as | 2 +- > .../automation_spark/src/mx/core/Version.as | 2 +- > .../automation_spark/src/spark/core/Version.as | 2 +- > frameworks/projects/charts/src/mx/core/Version.as | 2 +- > .../projects/framework/src/mx/core/FlexVersion.as | 16 +++++++++++++++- > .../projects/framework/src/mx/core/Version.as | 2 +- > frameworks/projects/mx/src/mx/core/Version.as | 2 +- > frameworks/projects/rpc/src/mx/core/Version.as | 2 +- > frameworks/projects/spark/src/spark/core/Version.as | 2 +- > .../projects/spark_dmv/src/spark/core/Version.as | 2 +- > frameworks/projects/tool/src/mx/core/Version.as | 2 +- > frameworks/projects/tool_air/src/mx/core/Version.as | 2 +- > .../flex2/compiler/common/MxmlConfiguration.java | 5 +++-- > .../compiler/src/java/flex2/tools/VersionInfo.java | 2 +- > 23 files changed, 40 insertions(+), 25 deletions(-) > ---------------------------------------------------------------------- > > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/build.properties > ---------------------------------------------------------------------- > diff --git a/build.properties b/build.properties > index 35fd073..2f07064 100644 > --- a/build.properties > +++ b/build.properties > @@ -18,8 +18,8 @@ > > > ################################################################################ > > # flex-sdk-description values > -release = Apache Flex 4.14.0 > -release.version = 4.14.0 > +release = Apache Flex 4.15.0 > +release.version = 4.15.0 > > # override on command line with -Dbuild.number=999 or in local.properties > build.number = 0 > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/advancedgrids/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/advancedgrids/src/mx/core/Version.as > b/frameworks/projects/advancedgrids/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/advancedgrids/src/mx/core/Version.as > +++ b/frameworks/projects/advancedgrids/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/airframework/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/airframework/src/mx/core/Version.as > b/frameworks/projects/airframework/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/airframework/src/mx/core/Version.as > +++ b/frameworks/projects/airframework/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/airspark/src/spark/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/airspark/src/spark/core/Version.as > b/frameworks/projects/airspark/src/spark/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/airspark/src/spark/core/Version.as > +++ b/frameworks/projects/airspark/src/spark/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/apache/src/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/apache/src/core/Version.as > b/frameworks/projects/apache/src/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/apache/src/core/Version.as > +++ b/frameworks/projects/apache/src/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/automation/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/automation/src/mx/core/Version.as > b/frameworks/projects/automation/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/automation/src/mx/core/Version.as > +++ b/frameworks/projects/automation/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/automation_agent/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/automation_agent/src/mx/core/Version.as > b/frameworks/projects/automation_agent/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/automation_agent/src/mx/core/Version.as > +++ b/frameworks/projects/automation_agent/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/automation_air/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/automation_air/src/mx/core/Version.as > b/frameworks/projects/automation_air/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/automation_air/src/mx/core/Version.as > +++ b/frameworks/projects/automation_air/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/automation_dmv/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/automation_dmv/src/mx/core/Version.as > b/frameworks/projects/automation_dmv/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/automation_dmv/src/mx/core/Version.as > +++ b/frameworks/projects/automation_dmv/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git > a/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as > b/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as > index 8d74c4e..4f4cefa 100644 > --- a/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as > +++ b/frameworks/projects/automation_flashflexkit/src/mx/core/Version.as > @@ -24,4 +24,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/automation_spark/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/automation_spark/src/mx/core/Version.as > b/frameworks/projects/automation_spark/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/automation_spark/src/mx/core/Version.as > +++ b/frameworks/projects/automation_spark/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/automation_spark/src/spark/core/Version.as > ---------------------------------------------------------------------- > diff --git > a/frameworks/projects/automation_spark/src/spark/core/Version.as > b/frameworks/projects/automation_spark/src/spark/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/automation_spark/src/spark/core/Version.as > +++ b/frameworks/projects/automation_spark/src/spark/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/charts/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/charts/src/mx/core/Version.as > b/frameworks/projects/charts/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/charts/src/mx/core/Version.as > +++ b/frameworks/projects/charts/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/framework/src/mx/core/FlexVersion.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/framework/src/mx/core/FlexVersion.as > b/frameworks/projects/framework/src/mx/core/FlexVersion.as > index f99b634..bce991b 100644 > --- a/frameworks/projects/framework/src/mx/core/FlexVersion.as > +++ b/frameworks/projects/framework/src/mx/core/FlexVersion.as > @@ -56,7 +56,21 @@ public class FlexVersion > * @playerversion AIR 1.1 > * @productversion Flex 3 > */ > - public static const CURRENT_VERSION:uint = 0x040E0000; > + public static const CURRENT_VERSION:uint = 0x040F0000; > + > + /** > + * The <code>compatibilityVersion</code> value of Flex 4.15, > + * encoded numerically as a <code>uint</code>. > + * Code can compare this constant against > + * the <code>compatibilityVersion</code> > + * to implement version-specific behavior. > + * > + * @langversion 3.0 > + * @playerversion Flash 11 > + * @playerversion AIR 3 > + * @productversion Apache Flex 4.14 > + */ > + public static const VERSION_4_15:uint = 0x040F0000; > > /** > * The <code>compatibilityVersion</code> value of Flex 4.14, > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/framework/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/framework/src/mx/core/Version.as > b/frameworks/projects/framework/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/framework/src/mx/core/Version.as > +++ b/frameworks/projects/framework/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/mx/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/mx/src/mx/core/Version.as > b/frameworks/projects/mx/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/mx/src/mx/core/Version.as > +++ b/frameworks/projects/mx/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/rpc/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/rpc/src/mx/core/Version.as > b/frameworks/projects/rpc/src/mx/core/Version.as > index 496ab63..731653d 100644 > --- a/frameworks/projects/rpc/src/mx/core/Version.as > +++ b/frameworks/projects/rpc/src/mx/core/Version.as > @@ -22,4 +22,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/spark/src/spark/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/spark/src/spark/core/Version.as > b/frameworks/projects/spark/src/spark/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/spark/src/spark/core/Version.as > +++ b/frameworks/projects/spark/src/spark/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/spark_dmv/src/spark/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/spark_dmv/src/spark/core/Version.as > b/frameworks/projects/spark_dmv/src/spark/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/spark_dmv/src/spark/core/Version.as > +++ b/frameworks/projects/spark_dmv/src/spark/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/tool/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/tool/src/mx/core/Version.as > b/frameworks/projects/tool/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/tool/src/mx/core/Version.as > +++ b/frameworks/projects/tool/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/frameworks/projects/tool_air/src/mx/core/Version.as > ---------------------------------------------------------------------- > diff --git a/frameworks/projects/tool_air/src/mx/core/Version.as > b/frameworks/projects/tool_air/src/mx/core/Version.as > index 647c056..f2edc26 100644 > --- a/frameworks/projects/tool_air/src/mx/core/Version.as > +++ b/frameworks/projects/tool_air/src/mx/core/Version.as > @@ -23,4 +23,4 @@ import mx.core.mx_internal; > * @private > * Version string for this class. > */ > -mx_internal static const VERSION:String = "4.14.0.0"; > +mx_internal static const VERSION:String = "4.15.0.0"; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java > ---------------------------------------------------------------------- > diff --git > a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java > b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java > index 228a50b..fea12b6 100644 > --- > a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java > +++ > b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java > @@ -48,6 +48,7 @@ public class MxmlConfiguration > // > // 'compiler.mxml.compatibility-version' option > // > + public static final int VERSION_4_15 = 0x040f0000; > public static final int VERSION_4_14 = 0x040e0000; > public static final int VERSION_4_13 = 0x040d0000; > public static final int VERSION_4_12_1 = 0x040c0001; > @@ -63,10 +64,10 @@ public class MxmlConfiguration > public static final int VERSION_3_0 = 0x03000000; > public static final int VERSION_2_0_1 = 0x02000001; > public static final int VERSION_2_0 = 0x02000000; > - public static final int CURRENT_VERSION = VERSION_4_14; > + public static final int CURRENT_VERSION = VERSION_4_15; > public static final int EARLIEST_MAJOR_VERSION = 3; > public static final int LATEST_MAJOR_VERSION = 4; > - public static final int LATEST_MINOR_VERSION = 14; > + public static final int LATEST_MINOR_VERSION = 15; > > private int major = LATEST_MAJOR_VERSION; > private int minor = LATEST_MINOR_VERSION; > > > http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c2628a26/modules/compiler/src/java/flex2/tools/VersionInfo.java > ---------------------------------------------------------------------- > diff --git a/modules/compiler/src/java/flex2/tools/VersionInfo.java > b/modules/compiler/src/java/flex2/tools/VersionInfo.java > index 8d7db5d..c90f66d 100644 > --- a/modules/compiler/src/java/flex2/tools/VersionInfo.java > +++ b/modules/compiler/src/java/flex2/tools/VersionInfo.java > @@ -32,7 +32,7 @@ import java.util.Properties; > public class VersionInfo > { > public static String FLEX_MAJOR_VERSION = "4"; > - public static String FLEX_MINOR_VERSION = "14"; > + public static String FLEX_MINOR_VERSION = "15"; > public static String FLEX_NANO_VERSION = "0"; > > /** > > -- Ix Multimedia Software Jan Luykenstraat 27 3521 VB Utrecht T. 06-51952295 I. www.ixsoftware.nl
