You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/12/16 01:48:15 UTC
[1/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Update
version to 4.15.0
Repository: flex-sdk
Updated Branches:
refs/heads/release4.14.0 74225b253 -> 7a0515845
Update version to 4.15.0
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
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 <er...@ixsoftware.nl>
Authored: Fri Dec 12 10:33:01 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
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";
/**
[6/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Merge
commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0
Posted by bi...@apache.org.
Merge commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7a051584
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7a051584
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7a051584
Branch: refs/heads/release4.14.0
Commit: 7a051584552d332fc27e743b6ef83864a0737e53
Parents: 74225b2 1884960
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Mon Dec 15 16:46:35 2014 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Mon Dec 15 16:46:35 2014 -0800
----------------------------------------------------------------------
build.properties | 4 +-
.../advancedgrids/src/mx/core/Version.as | 2 +-
.../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 +-
.../automation_air/src/mx/core/Version.as | 2 +-
.../automation_dmv/src/mx/core/Version.as | 2 +-
.../src/mx/core/Version.as | 2 +-
.../automation_spark/src/mx/core/Version.as | 2 +-
.../automation_spark/src/spark/core/Version.as | 2 +-
.../projects/charts/src/mx/core/Version.as | 2 +-
.../projects/framework/src/FrameworkClasses.as | 1 +
.../framework/src/mx/core/FlexVersion.as | 16 ++++++-
.../projects/framework/src/mx/core/Version.as | 2 +-
.../src/mx/resources/ResourceManagerImpl.as | 3 ++
.../src/mx/utils/LegacyMobileThemeOverride.as | 47 ++++++++++++++++++++
frameworks/projects/mx/src/mx/core/Version.as | 2 +-
frameworks/projects/rpc/src/mx/core/Version.as | 2 +-
.../projects/spark/src/spark/core/Version.as | 2 +-
.../spark_dmv/src/spark/core/Version.as | 2 +-
frameworks/projects/tool/src/mx/core/Version.as | 2 +-
.../projects/tool_air/src/mx/core/Version.as | 2 +-
.../compiler/common/MxmlConfiguration.java | 5 ++-
.../src/java/flex2/tools/VersionInfo.java | 2 +-
.../ResourceManager_Methods_getString.mxml | 13 ++++++
27 files changed, 104 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7a051584/build.properties
----------------------------------------------------------------------
[2/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Fix Maven
URL to avoid 'SSL' error due to redirect
Posted by bi...@apache.org.
Fix Maven URL to avoid 'SSL' error due to redirect
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3213c1b1
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3213c1b1
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3213c1b1
Branch: refs/heads/release4.14.0
Commit: 3213c1b1de1a33997b22dde9880f8683c53620f3
Parents: c2628a2
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Fri Dec 12 14:09:50 2014 +0100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Fri Dec 12 14:11:10 2014 +0100
----------------------------------------------------------------------
modules/downloads.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3213c1b1/modules/downloads.xml
----------------------------------------------------------------------
diff --git a/modules/downloads.xml b/modules/downloads.xml
index 82a0e6b..291b110 100644
--- a/modules/downloads.xml
+++ b/modules/downloads.xml
@@ -43,7 +43,7 @@
<property name="velocity.zip.dir" value="velocity-1.4"/>
<property name="velocity.dir" value="thirdparty/velocity"/>
- <property name="maven.search.url" value="http://search.maven.org/remotecontent?filepath="/>
+ <property name="maven.search.url" value="https://search.maven.org/remotecontent?filepath="/>
<property name="flexToolApi.name" value="flex-tool-api"/>
<property name="flexToolApi.version" value="1.0.0"/>
[3/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - FLEX-25045
getString now returns null as expected if supplied a valid locale but not a
valid resourceName
Posted by bi...@apache.org.
FLEX-25045 getString now returns null as expected if supplied a valid locale but not a valid resourceName
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a3f73798
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a3f73798
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a3f73798
Branch: refs/heads/release4.14.0
Commit: a3f73798d4c81a761d81f0ad154d1958b8aa1254
Parents: 3213c1b
Author: chrsmrtn <ch...@apache.org>
Authored: Fri Dec 12 14:22:50 2014 -0700
Committer: chrsmrtn <ch...@apache.org>
Committed: Fri Dec 12 14:29:35 2014 -0700
----------------------------------------------------------------------
.../projects/framework/src/mx/resources/ResourceManagerImpl.as | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a3f73798/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
index 3e9c6fa..b5816a0 100644
--- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
+++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as
@@ -940,6 +940,9 @@ public class ResourceManagerImpl extends EventDispatcher implements IResourceMan
findBundle(bundleName, resourceName, locale);
if (!resourceBundle)
return null;
+
+ if(!(resourceName in resourceBundle.content))
+ return null;
var value:String = String(resourceBundle.content[resourceName]);
[4/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - FLEX-25045
added mustella test for issue
Posted by bi...@apache.org.
FLEX-25045 added mustella test for issue
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/15e2b611
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/15e2b611
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/15e2b611
Branch: refs/heads/release4.14.0
Commit: 15e2b6112bf374dab3dc8f2085b6dd0f41a569fa
Parents: a3f7379
Author: chrsmrtn <ch...@apache.org>
Authored: Fri Dec 12 14:23:46 2014 -0700
Committer: chrsmrtn <ch...@apache.org>
Committed: Fri Dec 12 14:29:36 2014 -0700
----------------------------------------------------------------------
.../Methods/ResourceManager_Methods_getString.mxml | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/15e2b611/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_getString.mxml
----------------------------------------------------------------------
diff --git a/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_getString.mxml b/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_getString.mxml
index ce97954..43b74dd 100644
--- a/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_getString.mxml
+++ b/mustella/tests/resources/ResourceManager/Methods/ResourceManager_Methods_getString.mxml
@@ -65,6 +65,19 @@
<Pause timeout="1"/>
</body>
</TestCase>
+
+ <TestCase frequency="all" testID="ResourceManager_getString_NO_SUCH_KEY_withLocale_FLEX25045" description="Tests that the getString() method of ResourceManager returns null when accessing a non-existent resource but a valid locale reference" keywords="[resources,ResourceManager,getString]">
+ <setup>
+ <RunCode code="application.setup()"/>
+ <RunCode code="application.doAddResourceBundle('fr_FR', 'bundle1')" />
+
+ <RunCode code="ResourceManager.getInstance().localeChain = ['fr_FR']" />
+ </setup>
+ <body>
+ <AssertMethodValue method="value=testGetString('NO_SUCH_KEY', null, null, 'fr_FR')" value="true"/>
+ <Pause timeout="1"/>
+ </body>
+ </TestCase>
<TestCase frequency="all" testID="ResourceManager_getString_STRING" description="Tests the getString() method of ResourceManager for a resource value which is a typical String" keywords="[resources,ResourceManager,getString]">
<setup>
[5/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Add ability
to use legacy mobile theme. Fixes
https://issues.apache.org/jira/browse/FLEX-34685
Posted by bi...@apache.org.
Add ability to use legacy mobile theme.
Fixes https://issues.apache.org/jira/browse/FLEX-34685
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/18849602
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/18849602
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/18849602
Branch: refs/heads/release4.14.0
Commit: 1884960242f835879f5ca6504659072a2305f120
Parents: 15e2b61
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Mon Dec 15 16:18:58 2014 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Mon Dec 15 16:25:40 2014 -0800
----------------------------------------------------------------------
.../projects/framework/src/FrameworkClasses.as | 1 +
.../src/mx/utils/LegacyMobileThemeOverride.as | 47 ++++++++++++++++++++
2 files changed, 48 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/18849602/frameworks/projects/framework/src/FrameworkClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/FrameworkClasses.as b/frameworks/projects/framework/src/FrameworkClasses.as
index 51e1c64..bb622d3 100644
--- a/frameworks/projects/framework/src/FrameworkClasses.as
+++ b/frameworks/projects/framework/src/FrameworkClasses.as
@@ -165,6 +165,7 @@ internal class FrameworkClasses
import mx.utils.GetTimerUtil; GetTimerUtil;
import mx.utils.HSBColor; HSBColor;
import mx.utils.IOSPlatformVersionOverride; IOSPlatformVersionOverride;
+ import mx.utils.LegacyMobileThemeOverride; LegacyMobileThemeOverride;
import mx.utils.LinkedList; LinkedList;
import mx.utils.LinkedListNode; LinkedListNode;
import mx.utils.OnDemandEventDispatcher; OnDemandEventDispatcher;
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/18849602/frameworks/projects/framework/src/mx/utils/LegacyMobileThemeOverride.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/utils/LegacyMobileThemeOverride.as b/frameworks/projects/framework/src/mx/utils/LegacyMobileThemeOverride.as
new file mode 100644
index 0000000..31e1621
--- /dev/null
+++ b/frameworks/projects/framework/src/mx/utils/LegacyMobileThemeOverride.as
@@ -0,0 +1,47 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package mx.utils
+{
+
+ import flash.display.DisplayObject;
+ import flash.system.Capabilities;
+
+ import mx.core.mx_internal;
+
+ [Mixin]
+ /**
+ * Set OS version to older values to force legacy mobile theme
+ */
+ public class LegacyMobileThemeOverride
+ {
+ public static function init(root:DisplayObject):void
+ {
+ var c:Class = Capabilities;
+ if(c.version.indexOf("AND") > -1)
+ {
+ Platform.mx_internal::androidVersionOverride = "2.0.0";
+ }
+ else if(c.version.indexOf("IOS") > -1)
+ {
+ Platform.mx_internal::iosVersionOverride = "6.0.0";
+ }
+ }
+ }
+}
\ No newline at end of file
Re: [1/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Update
version to 4.15.0
Posted by Erik de Bruin <er...@ixsoftware.nl>.
>> I see it as a feature rather than a fix, as it addresses a lack of
>> functionality rather than a incorrect functioning.
>
> Just to be clear, I am adding an option to enable the old mibile skins
> which have been around 4.6.
OK, I must have misunderstood. Let me summarize how I understand this
after reading your last email, and re-reading some previous ones and
looking at the commit:
The new mobile skins 'overrule' the old skins, currently without an
option to go back to the way it was. This means that people who rely
on the old skins now have to go into their app and make changes. Your
fix reduces these changes to just adding compiler arg, that then
instantiates a class that tricks the version check to 'read' the
current platform as an older version.
That sounds like a fix to me, that will prevent users of 4.14 not
having the option to use the legacy skins which their apps may rely
on.
You may proceed ;-) Without carrying the extra commits!
> On a larger point, what is the point of asking users to test the nightlies
> if we are only going to fix things in the next release?
The point of asking people to test is to make sure that we're
releasing a stable and good quality SDK, without any regressions or
new blocking bugs. Everything else is regular development, takes place
on 'develop' and unfortunately must wait for the next release. Which
does nothing to diminish the value of the contribution of testers
whose bugs are not fixed in the current release, as they will be a
valuable contribution to the next one.
EdB
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: [1/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Update
version to 4.15.0
Posted by OmPrakash Muppirala <bi...@gmail.com>.
On Dec 15, 2014 6:08 PM, "Erik de Bruin" <er...@ixsoftware.nl> wrote:
>
> Thanks for the reverts, never mind the tree (I thinks it looks nice
> when it has some depth ;-))
>
> I'm afraid that I'm going to be strict on applying this type of commit
> to 'release', as this is the first release we're doing with the new
> process:
>
> I see it as a feature rather than a fix, as it addresses a lack of
> functionality rather than a incorrect functioning.
Just to be clear, I am adding an option to enable the old mibile skins
which have been around 4.6.
And even if it was
> a bug fix, it is not aimed at increasing the stability/quality of the
> release branch, rather, it puts it at risk by introducing new,
> untested code (exaggerating for effect here, I'm not commenting on the
> quality of your contribution!).
Again, no untested code. The changes I made are minimal, but crucial to
keep backwards compatibility.
On a larger point, what is the point of asking users to test the nightlies
if we are only going to fix things in the next release?
I am afraid that this policy will affect the enthusiasm of the testers.
Quite frankly, I too was waiting for people to test this thoroughly before
we shipped the release. Right now seems to be the best time to address
these issues.
Please reconsider :-)
Thanks,
Om
>
> EdB
>
>
>
> On Tue, Dec 16, 2014 at 2:47 AM, OmPrakash Muppirala
> <bi...@gmail.com> wrote:
> > Okay, I have reverted the changes to release4.14.0. Sorry for messing
up
> > the tree.
> >
> > Please advice on what to do with
> > https://issues.apache.org/jira/browse/FLEX-34685
> > https://issues.apache.org/jira/browse/FLEX-34688
> > https://issues.apache.org/jira/browse/FLEX-34686
> >
> > All dealing with the new mobile skins.
> >
> > Thanks,
> > Om
> >
> > On Mon, Dec 15, 2014 at 5:37 PM, OmPrakash Muppirala <
bigosmallm@gmail.com>
> > wrote:
> >>
> >> Okay, I may have messed up something.
> >>
> >> Here is the bug I was fixing:
> >> https://issues.apache.org/jira/browse/FLEX-34685
> >> Do you consider this as a new feature?
> >>
> >> I checked in the fix into develop and cherry-picked the commit into
the release4.14.0
> >> branch. Everything else you see is a result of the merge (i.e. no new
> >> code was added)
> >>
> >> Please advice what I need to do.
> >>
> >> Thanks,
> >> Om
> >>
> >> On Mon, Dec 15, 2014 at 5:30 PM, Erik de Bruin <er...@ixsoftware.nl>
wrote:
> >>>
> >>> Also, you seem to be introducing a new feature into the release
branch.
> >>> I'm
> >>> sorry, but you cannot do that. The release branch is for stabilization
> >>> fixes only.
> >>>
> >>> EdB
> >>>
> >>>
> >>>
> >>> On Tuesday, December 16, 2014, Erik de Bruin <er...@ixsoftware.nl>
wrote:
> >>>
> >>> > Om, you are committing stuff from develop into release. Please
revert.
> >>> >
> >>> > EdB
> >>> >
> >>> >
> >>> >
> >>> > On Tuesday, December 16, 2014, <bigosmallm@apache.org
> >>> > <javascript:_e(%7B%7D,'cvml','bigosmallm@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 <er...@ixsoftware.nl>
> >>> >>
> >>> >>
> >>> >> 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 <er...@ixsoftware.nl>
> >>> >> Authored: Fri Dec 12 10:33:01 2014 +0100
> >>> >> Committer: Erik de Bruin <er...@ixsoftware.nl>
> >>> >> 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
> >>> >
> >>>
> >>>
> >>> --
> >>> Ix Multimedia Software
> >>>
> >>> Jan Luykenstraat 27
> >>> 3521 VB Utrecht
> >>>
> >>> T. 06-51952295
> >>> I. www.ixsoftware.nl
> >>>
> >>
>
>
>
> --
> Ix Multimedia Software
>
> Jan Luykenstraat 27
> 3521 VB Utrecht
>
> T. 06-51952295
> I. www.ixsoftware.nl
Re: [1/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Update
version to 4.15.0
Posted by Erik de Bruin <er...@ixsoftware.nl>.
Thanks for the reverts, never mind the tree (I thinks it looks nice
when it has some depth ;-))
I'm afraid that I'm going to be strict on applying this type of commit
to 'release', as this is the first release we're doing with the new
process:
I see it as a feature rather than a fix, as it addresses a lack of
functionality rather than a incorrect functioning. And even if it was
a bug fix, it is not aimed at increasing the stability/quality of the
release branch, rather, it puts it at risk by introducing new,
untested code (exaggerating for effect here, I'm not commenting on the
quality of your contribution!).
EdB
On Tue, Dec 16, 2014 at 2:47 AM, OmPrakash Muppirala
<bi...@gmail.com> wrote:
> Okay, I have reverted the changes to release4.14.0. Sorry for messing up
> the tree.
>
> Please advice on what to do with
> https://issues.apache.org/jira/browse/FLEX-34685
> https://issues.apache.org/jira/browse/FLEX-34688
> https://issues.apache.org/jira/browse/FLEX-34686
>
> All dealing with the new mobile skins.
>
> Thanks,
> Om
>
> On Mon, Dec 15, 2014 at 5:37 PM, OmPrakash Muppirala <bi...@gmail.com>
> wrote:
>>
>> Okay, I may have messed up something.
>>
>> Here is the bug I was fixing:
>> https://issues.apache.org/jira/browse/FLEX-34685
>> Do you consider this as a new feature?
>>
>> I checked in the fix into develop and cherry-picked the commit into the release4.14.0
>> branch. Everything else you see is a result of the merge (i.e. no new
>> code was added)
>>
>> Please advice what I need to do.
>>
>> Thanks,
>> Om
>>
>> On Mon, Dec 15, 2014 at 5:30 PM, Erik de Bruin <er...@ixsoftware.nl> wrote:
>>>
>>> Also, you seem to be introducing a new feature into the release branch.
>>> I'm
>>> sorry, but you cannot do that. The release branch is for stabilization
>>> fixes only.
>>>
>>> EdB
>>>
>>>
>>>
>>> On Tuesday, December 16, 2014, Erik de Bruin <er...@ixsoftware.nl> wrote:
>>>
>>> > Om, you are committing stuff from develop into release. Please revert.
>>> >
>>> > EdB
>>> >
>>> >
>>> >
>>> > On Tuesday, December 16, 2014, <bigosmallm@apache.org
>>> > <javascript:_e(%7B%7D,'cvml','bigosmallm@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 <er...@ixsoftware.nl>
>>> >>
>>> >>
>>> >> 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 <er...@ixsoftware.nl>
>>> >> Authored: Fri Dec 12 10:33:01 2014 +0100
>>> >> Committer: Erik de Bruin <er...@ixsoftware.nl>
>>> >> 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
>>> >
>>>
>>>
>>> --
>>> Ix Multimedia Software
>>>
>>> Jan Luykenstraat 27
>>> 3521 VB Utrecht
>>>
>>> T. 06-51952295
>>> I. www.ixsoftware.nl
>>>
>>
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: [1/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Update
version to 4.15.0
Posted by OmPrakash Muppirala <bi...@gmail.com>.
Okay, I have reverted the changes to release4.14.0. Sorry for messing up
the tree.
Please advice on what to do with
https://issues.apache.org/jira/browse/FLEX-34685
https://issues.apache.org/jira/browse/FLEX-34688
https://issues.apache.org/jira/browse/FLEX-34686
All dealing with the new mobile skins.
Thanks,
Om
On Mon, Dec 15, 2014 at 5:37 PM, OmPrakash Muppirala <bi...@gmail.com>
wrote:
>
> Okay, I may have messed up something.
>
> Here is the bug I was fixing:
> https://issues.apache.org/jira/browse/FLEX-34685
> Do you consider this as a new feature?
>
> I checked in the fix into develop and cherry-picked the commit into the release4.14.0
> branch. Everything else you see is a result of the merge (i.e. no new
> code was added)
>
> Please advice what I need to do.
>
> Thanks,
> Om
>
> On Mon, Dec 15, 2014 at 5:30 PM, Erik de Bruin <er...@ixsoftware.nl> wrote:
>>
>> Also, you seem to be introducing a new feature into the release branch.
>> I'm
>> sorry, but you cannot do that. The release branch is for stabilization
>> fixes only.
>>
>> EdB
>>
>>
>>
>> On Tuesday, December 16, 2014, Erik de Bruin <er...@ixsoftware.nl> wrote:
>>
>> > Om, you are committing stuff from develop into release. Please revert.
>> >
>> > EdB
>> >
>> >
>> >
>> > On Tuesday, December 16, 2014, <bigosmallm@apache.org
>> > <javascript:_e(%7B%7D,'cvml','bigosmallm@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 <er...@ixsoftware.nl>
>> >>
>> >>
>> >> 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 <er...@ixsoftware.nl>
>> >> Authored: Fri Dec 12 10:33:01 2014 +0100
>> >> Committer: Erik de Bruin <er...@ixsoftware.nl>
>> >> 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
>> >
>>
>>
>> --
>> Ix Multimedia Software
>>
>> Jan Luykenstraat 27
>> 3521 VB Utrecht
>>
>> T. 06-51952295
>> I. www.ixsoftware.nl
>>
>
Re: [1/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Update
version to 4.15.0
Posted by OmPrakash Muppirala <bi...@gmail.com>.
Okay, I may have messed up something.
Here is the bug I was fixing:
https://issues.apache.org/jira/browse/FLEX-34685
Do you consider this as a new feature?
I checked in the fix into develop and cherry-picked the commit into
the release4.14.0
branch. Everything else you see is a result of the merge (i.e. no new code
was added)
Please advice what I need to do.
Thanks,
Om
On Mon, Dec 15, 2014 at 5:30 PM, Erik de Bruin <er...@ixsoftware.nl> wrote:
>
> Also, you seem to be introducing a new feature into the release branch. I'm
> sorry, but you cannot do that. The release branch is for stabilization
> fixes only.
>
> EdB
>
>
>
> On Tuesday, December 16, 2014, Erik de Bruin <er...@ixsoftware.nl> wrote:
>
> > Om, you are committing stuff from develop into release. Please revert.
> >
> > EdB
> >
> >
> >
> > On Tuesday, December 16, 2014, <bigosmallm@apache.org
> > <javascript:_e(%7B%7D,'cvml','bigosmallm@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 <er...@ixsoftware.nl>
> >>
> >>
> >> 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 <er...@ixsoftware.nl>
> >> Authored: Fri Dec 12 10:33:01 2014 +0100
> >> Committer: Erik de Bruin <er...@ixsoftware.nl>
> >> 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
> >
>
>
> --
> Ix Multimedia Software
>
> Jan Luykenstraat 27
> 3521 VB Utrecht
>
> T. 06-51952295
> I. www.ixsoftware.nl
>
Re: [1/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Update
version to 4.15.0
Posted by Erik de Bruin <er...@ixsoftware.nl>.
Also, you seem to be introducing a new feature into the release branch. I'm
sorry, but you cannot do that. The release branch is for stabilization
fixes only.
EdB
On Tuesday, December 16, 2014, Erik de Bruin <er...@ixsoftware.nl> wrote:
> Om, you are committing stuff from develop into release. Please revert.
>
> EdB
>
>
>
> On Tuesday, December 16, 2014, <bigosmallm@apache.org
> <javascript:_e(%7B%7D,'cvml','bigosmallm@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 <er...@ixsoftware.nl>
>>
>>
>> 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 <er...@ixsoftware.nl>
>> Authored: Fri Dec 12 10:33:01 2014 +0100
>> Committer: Erik de Bruin <er...@ixsoftware.nl>
>> 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
>
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: [1/6] git commit: [flex-sdk] [refs/heads/release4.14.0] - Update
version to 4.15.0
Posted by Erik de Bruin <er...@ixsoftware.nl>.
Om, you are committing stuff from develop into release. Please revert.
EdB
On Tuesday, December 16, 2014, <bi...@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 <erik@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 <erik@ixsoftware.nl <javascript:;>>
> Authored: Fri Dec 12 10:33:01 2014 +0100
> Committer: Erik de Bruin <erik@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