From 1070ace4650453d518aeb03e7a9a36c9d264a8e7 Mon Sep 17 00:00:00 2001
From: Luke Inman-Semerau <luke.semerau@gmail.com>
Date: Wed, 27 Jan 2016 10:36:28 -0800
Subject: [PATCH] updating java changelog and version number bump for 2.50

---
 Rakefile                                      |  2 +-
 java/CHANGELOG                                | 22 +++++++++++++++++++
 .../org/openqa/selenium/server/VERSION.txt    |  8 +++----
 .../firefox-driver/extension/install.rdf      |  2 +-
 .../selenium-core/scripts/selenium-version.js |  4 ++--
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/Rakefile b/Rakefile
index 428b2862a1870..91c6ccfbd1642 100644
--- a/Rakefile
+++ b/Rakefile
@@ -50,7 +50,7 @@ end
 verbose($DEBUG)
 
 def version
-  "2.49.1"
+  "2.50.0"
 end
 ide_version = "2.8.0"
 
diff --git a/java/CHANGELOG b/java/CHANGELOG
index 01c6d2c67c9db..bccf441b1c283 100644
--- a/java/CHANGELOG
+++ b/java/CHANGELOG
@@ -1,3 +1,24 @@
+v2.50.0
+=======
+
+WebDriver:
+    * Firefox: fixing sendKeys throwing "cross-process JS call failed " in FF45
+    * Firefox: fixing click to multirect elements broken by the previous PR
+    * Check element corners and middle for clickability
+    * Fix keyCodes for some characters in the FirefoxDriver.
+    * Firefox: fixing malformed URL handling. Fixed issue #1248
+    * Prevent Firefox from opening a page on a second or later run and/or after some amount of time
+    * Fixing executable finder on Windows
+    * Fixing HtmlUnit driver to pass recently added tests
+    * Firefox: fixing appending to contenteditable elements. Fixes issue 1419
+    * correct javascript remote client ui executor to use new promise based execute introduced by 0fa587 Fixes #1521
+    * Firefox: Adding an extra check to result wrapper. Fixes issue #1426
+    * Changes to simplify the execution of finding elements.
+    * Fixing issue #1479. The only reasonable thing we can do for select elements is to disable clickability checking, see https://gist.github.com/p0deje/c549e93fa19bf7aaee49
+
+Grid: 
+    * Found a better place to convert seconds to milliseconds
+
 v2.49.1
 =======
 
@@ -2033,3 +2054,4 @@ Grid:
   * Track when a session has become orphaned.  I.e., when the client sends no
     commands after the initial session creation.  This almost always indicates
     the client is no longer connected and the session is unusable immediately.
+----
diff --git a/java/server/src/org/openqa/selenium/server/VERSION.txt b/java/server/src/org/openqa/selenium/server/VERSION.txt
index a90c55d55ac19..8fe0f1f5d1eb5 100644
--- a/java/server/src/org/openqa/selenium/server/VERSION.txt
+++ b/java/server/src/org/openqa/selenium/server/VERSION.txt
@@ -1,4 +1,4 @@
-selenium.rc.version=2.49
-selenium.rc.revision=.1
-selenium.core.version=2.49
-selenium.core.revision=.1
+selenium.rc.version=2.50
+selenium.rc.revision=.0
+selenium.core.version=2.50
+selenium.core.revision=.0
diff --git a/javascript/firefox-driver/extension/install.rdf b/javascript/firefox-driver/extension/install.rdf
index 6e7adc1a51d96..9f85b261ad0c3 100644
--- a/javascript/firefox-driver/extension/install.rdf
+++ b/javascript/firefox-driver/extension/install.rdf
@@ -3,7 +3,7 @@
 
     <Description about="urn:mozilla:install-manifest">
         <em:id>fxdriver@googlecode.com</em:id>
-        <em:version>2.49.1</em:version>
+        <em:version>2.50.0</em:version>
         <em:type>2</em:type>
         <em:name>Firefox WebDriver</em:name>
         <em:description>WebDriver implementation for Firefox</em:description>
diff --git a/javascript/selenium-core/scripts/selenium-version.js b/javascript/selenium-core/scripts/selenium-version.js
index a5339579a07b5..23e8d4cd7f927 100644
--- a/javascript/selenium-core/scripts/selenium-version.js
+++ b/javascript/selenium-core/scripts/selenium-version.js
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-Selenium.version = "2.49";
-Selenium.revision = ".1";
+Selenium.version = "2.50";
+Selenium.revision = ".0";
 
 window.top.document.title += " v" + Selenium.version + Selenium.revision;