From 96c322871e93ac43ed35dcff524414cac5d9a6c9 Mon Sep 17 00:00:00 2001
From: Luke Inman-Semerau <luke.semerau@gmail.com>
Date: Tue, 3 Jun 2014 10:51:16 -0700
Subject: [PATCH] bumping versions for 2.42.2 adding changelog entry

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

diff --git a/Rakefile b/Rakefile
index 6ea1ce063c807..3c18e36972735 100644
--- a/Rakefile
+++ b/Rakefile
@@ -49,7 +49,7 @@ end
 verbose($DEBUG)
 
 def version
-  "2.42.1"
+  "2.42.2"
 end
 ide_version = "1.10.0"
 
diff --git a/java/CHANGELOG b/java/CHANGELOG
index 589e1733c1b7d..dc33faec1d3bb 100644
--- a/java/CHANGELOG
+++ b/java/CHANGELOG
@@ -1,3 +1,9 @@
+v2.42.2
+=======
+WebDriver:
+
+  * errorHandler needs to be instantiated. Fixing NPE with IEDriver Issue #7415
+
 v2.42.1
 =======
 WebDriver:
diff --git a/java/server/src/org/openqa/selenium/server/VERSION.txt b/java/server/src/org/openqa/selenium/server/VERSION.txt
index 86e05cf803e18..862d198579dd1 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.42
-selenium.rc.revision=.1
+selenium.rc.revision=.2
 selenium.core.version=2.42
-selenium.core.revision=.1
+selenium.core.revision=.2
diff --git a/javascript/firefox-driver/extension/install.rdf b/javascript/firefox-driver/extension/install.rdf
index 01bdba6c8a916..b001c7ce4efc7 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.42.1</em:version>
+        <em:version>2.42.2</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 089d9a913b1ea..1e9011b6fa2a1 100644
--- a/javascript/selenium-core/scripts/selenium-version.js
+++ b/javascript/selenium-core/scripts/selenium-version.js
@@ -1,5 +1,5 @@
 Selenium.version = "2.42";
-Selenium.revision = ".1";
+Selenium.revision = ".2";
 
 window.top.document.title += " v" + Selenium.version + Selenium.revision;