diff --git a/.idea/libraries/cucumber_java.xml b/.idea/libraries/cucumber_java.xml
index 317a90d690cd..197af837c7b4 100644
--- a/.idea/libraries/cucumber_java.xml
+++ b/.idea/libraries/cucumber_java.xml
@@ -1,13 +1,11 @@
 <component name="libraryTable">
   <library name="cucumber-java">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/cucumber-core-1.0.14.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/cucumber-java-1.0.14.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cucumber-core-1.2.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cucumber-java-1.2.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cucumber-java8-1.2.2.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/cucumber-core-1.0.14-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/src/cucumber-java-1.0.14-sources.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/cucumber_jvm.xml b/.idea/libraries/cucumber_jvm.xml
index 5d75d68e2a11..f31f0aa6f76b 100644
--- a/.idea/libraries/cucumber_jvm.xml
+++ b/.idea/libraries/cucumber_jvm.xml
@@ -1,13 +1,11 @@
 <component name="libraryTable">
   <library name="cucumber-jvm">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/cucumber-core-1.0.14.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/gherkin-2.11.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cucumber-core-1.2.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/cucumber-jvm-deps-1.0.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/gherkin-2.12.2.jar!/" />
     </CLASSES>
     <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/cucumber-core-1.0.14-sources.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/src/gherkin-2.11.2-sources.jar!/" />
-    </SOURCES>
+    <SOURCES />
   </library>
 </component>
\ No newline at end of file
diff --git a/build/cucumber-test-runner/cucumber-test-runner.iml b/build/cucumber-test-runner/cucumber-test-runner.iml
index dc0cd4905ca3..fec4c99e596e 100644
--- a/build/cucumber-test-runner/cucumber-test-runner.iml
+++ b/build/cucumber-test-runner/cucumber-test-runner.iml
@@ -11,6 +11,6 @@
     <orderEntry type="module" module-name="testFramework" />
     <orderEntry type="library" name="cucumber-jvm" level="project" />
     <orderEntry type="module" module-name="cucumber-jvm-formatter" scope="RUNTIME" />
+    <orderEntry type="library" name="cucumber-java" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 97d79429471d..5a9119bbc0c3 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -263,6 +263,8 @@ libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "0.3.1"
 libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 libraryLicense(name: "Cucumber-JVM", libraryName: "cucumber-jvm", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
 libraryLicense(name: "Cucumber-Groovy", libraryName: "cucumber-groovy", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
+libraryLicense(name: "XStream", libraryName: "XStream", version: "1.4.2", license: "BSD License", url: "https://github.com/cucumber/cucumber-jvm-deps/", licenseUrl: "http://xstream.codehaus.org/license.html")
+libraryLicense(name: "Diffutils", libraryName: "Diffutils", version: "1.2.1", license: "The Apache Software License, Version 2.0", url: "http://www.apache.org/licenses/LICENSE-2.0", licenseUrl: "http://xstream.codehaus.org/license.html")
 libraryLicense(name: "proxy-vole", libraryName: "proxy-vole", version: "20131209", license: "New BSD License", url: "http://code.google.com/p/proxy-vole/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
 libraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino-js-1_7R4", version: "1.7R4", license: "MPL 1.1", url: "http://www.mozilla.org/rhino/", licenseUrl: "http://www.mozilla.org/MPL/MPL-1.1.html")
 libraryLicense(name: "asm-4.0-all", libraryName: "asm-4.0-all", version: "4.0", attachedTo: "ByteCodeViewer", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html")
diff --git a/lib/cucumber-core-1.0.14.jar b/lib/cucumber-core-1.0.14.jar
deleted file mode 100644
index 8937e83fefb9..000000000000
Binary files a/lib/cucumber-core-1.0.14.jar and /dev/null differ
diff --git a/lib/cucumber-core-1.2.2.jar b/lib/cucumber-core-1.2.2.jar
new file mode 100644
index 000000000000..e47c15323e6a
Binary files /dev/null and b/lib/cucumber-core-1.2.2.jar differ
diff --git a/lib/cucumber-java-1.0.14.jar b/lib/cucumber-java-1.0.14.jar
deleted file mode 100644
index 356af09cf14a..000000000000
Binary files a/lib/cucumber-java-1.0.14.jar and /dev/null differ
diff --git a/lib/cucumber-java-1.2.2.jar b/lib/cucumber-java-1.2.2.jar
new file mode 100644
index 000000000000..d39de623cf6c
Binary files /dev/null and b/lib/cucumber-java-1.2.2.jar differ
diff --git a/lib/cucumber-java8-1.2.2.jar b/lib/cucumber-java8-1.2.2.jar
new file mode 100644
index 000000000000..09c30ec3de52
Binary files /dev/null and b/lib/cucumber-java8-1.2.2.jar differ
diff --git a/lib/cucumber-jvm-deps-1.0.3.jar b/lib/cucumber-jvm-deps-1.0.3.jar
new file mode 100644
index 000000000000..b63b8641ed9e
Binary files /dev/null and b/lib/cucumber-jvm-deps-1.0.3.jar differ
diff --git a/lib/gherkin-2.11.2.jar b/lib/gherkin-2.11.2.jar
deleted file mode 100644
index 93085e6a8394..000000000000
Binary files a/lib/gherkin-2.11.2.jar and /dev/null differ
diff --git a/lib/gherkin-2.12.2.jar b/lib/gherkin-2.12.2.jar
new file mode 100644
index 000000000000..a08f4e6b361f
Binary files /dev/null and b/lib/gherkin-2.12.2.jar differ
diff --git a/lib/src/cucumber-core-1.0.14-sources.jar b/lib/src/cucumber-core-1.0.14-sources.jar
deleted file mode 100644
index 302afc557742..000000000000
Binary files a/lib/src/cucumber-core-1.0.14-sources.jar and /dev/null differ
diff --git a/lib/src/cucumber-java-1.0.14-sources.jar b/lib/src/cucumber-java-1.0.14-sources.jar
deleted file mode 100644
index 8fde5d133ae0..000000000000
Binary files a/lib/src/cucumber-java-1.0.14-sources.jar and /dev/null differ
diff --git a/lib/src/gherkin-2.11.2-sources.jar b/lib/src/gherkin-2.11.2-sources.jar
deleted file mode 100644
index f1622da667ea..000000000000
Binary files a/lib/src/gherkin-2.11.2-sources.jar and /dev/null differ
diff --git a/plugins/cucumber-jvm-formatter/cucumber-jvm-formatter.iml b/plugins/cucumber-jvm-formatter/cucumber-jvm-formatter.iml
index acf56ba72944..e6fece368439 100644
--- a/plugins/cucumber-jvm-formatter/cucumber-jvm-formatter.iml
+++ b/plugins/cucumber-jvm-formatter/cucumber-jvm-formatter.iml
@@ -8,6 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="cucumber-jvm" level="project" />
+    <orderEntry type="library" name="cucumber-java" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file