Prepare for release 1.2.5

aslakhellesoy · aslakhellesoy · commit 32887265c6ad · 2016-09-12T12:20:50.000+01:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -120,13 +120,13 @@ release will fail:
 mvn javadoc:javadoc
 ```
 
-Run `git commit -am "Release X.Y.Z"`
+Run `git commit -am "Prepare for release X.Y.Z"`
 
-Now release everything:
+Now release everything (replace X.Y.Z below with the next release number):
 
 ```
 mvn release:clean
-mvn --batch-mode -P release-sign-artifacts release:prepare -DautoVersionSubmodules=true -DdevelopmentVersion=1.1.5-SNAPSHOT
+mvn --batch-mode -P release-sign-artifacts release:prepare -DautoVersionSubmodules=true -DdevelopmentVersion=X.Y.Z-SNAPSHOT
 mvn -P release-sign-artifacts release:perform
 ```
 
diff --git a/History.md b/History.md
@@ -1,6 +1,8 @@
-## [1.2.5-SNAPSHOT](https://github.com/cucumber/cucumber-jvm/compare/v1.2.4...master) (In Git)
+## [1.2.6-SNAPSHOT](https://github.com/cucumber/cucumber-jvm/compare/v1.2.5...master) (In Git)
 
-* [Java8] Fix closing over local variables ([#916](https://github.com/cucumber/cucumber-jvm/issues/916), [#924](https://github.com/cucumber/cucumber-jvm/pull/924), [#929](https://github.com/cucumber/cucumber-jvm/pull/929) Alexander Torstling, Aslak Hellesøy) 
+## [1.2.5](https://github.com/cucumber/cucumber-jvm/compare/v1.2.4...v1.2.5) (2016-09-12)
+
+* [Java8] Fix closing over local variables ([#916](https://github.com/cucumber/cucumber-jvm/issues/916), [#924](https://github.com/cucumber/cucumber-jvm/pull/924), [#929](https://github.com/cucumber/cucumber-jvm/pull/929) Alexander Torstling, Aslak Hellesøy)
 * [Java8] Fix IllegalArgumentException on JDK 1.8.0_60 ([#912](https://github.com/cucumber/cucumber-jvm/issues/912), [#914](https://github.com/cucumber/cucumber-jvm/pull/914) Michael Wilkerson)
 * [Core] Double-check for directory exists in the ensureParentDirExists(File) ([#978](https://github.com/cucumber/cucumber-jvm/pull/978) Pavel Ordenko)
 * [picocontainer] Picocontainer lifecycle support([#994](https://github.com/cucumber/cucumber-jvm/pull/994), [#993](https://github.com/cucumber/cucumber-jvm/issues/993), [#992](https://github.com/cucumber/cucumber-jvm/pull/992) Richard Bradley)
diff --git a/examples/android/android-studio/Cukeulator/app/build.gradle b/examples/android/android-studio/Cukeulator/app/build.gradle
@@ -36,6 +36,6 @@ android {
 dependencies {
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.0'
     androidTestCompile 'com.android.support.test:testing-support-lib:0.1'
-    androidTestCompile 'info.cukes:cucumber-android:1.2.4'
-    androidTestCompile 'info.cukes:cucumber-picocontainer:1.2.4'
+    androidTestCompile 'info.cukes:cucumber-android:1.2.5'
+    androidTestCompile 'info.cukes:cucumber-picocontainer:1.2.5'
 }
diff --git a/examples/clojure_cukes/project.clj b/examples/clojure_cukes/project.clj
@@ -1,6 +1,6 @@
 (defproject clojure_cukes "1.0.X"
   :description "A demo of Cucumber with Clojure and Leiningen"
-  :dependencies [[org.clojure/clojure "1.6.0"]]
+  :dependencies [[org.clojure/clojure "1.8.0"]]
   :plugins [[lein-cucumber "1.0.2"]]
   :cucumber-feature-paths ["test/features/"]
   :profiles
diff --git a/examples/java-gradle/build.gradle b/examples/java-gradle/build.gradle
@@ -18,10 +18,10 @@ task cucumber() {
 }
 
 dependencies {
-    testCompile 'info.cukes:cucumber-java:1.2.4'
-    testCompile 'info.cukes:cucumber-junit:1.2.4'
+    testCompile 'info.cukes:cucumber-java:1.2.5'
+    testCompile 'info.cukes:cucumber-junit:1.2.5'
 
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
 }
 
 repositories {
diff --git a/testng/src/main/java/cucumber/api/testng/CucumberFeatureWrapper.java b/testng/src/main/java/cucumber/api/testng/CucumberFeatureWrapper.java
@@ -4,7 +4,7 @@
 
 /**
  * The only purpose of this interface is to be able to provide a custom
- * {@linkplain #toString()}, making TestNG reports look more descriptive.
+ * <pre>toString()</pre>, making TestNG reports look more descriptive.
  *
  * @see CucumberFeatureWrapperImpl
  */

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ android {`
`36`	`36`	`dependencies {`
`37`	`37`	`androidTestCompile 'com.android.support.test.espresso:espresso-core:2.0'`
`38`	`38`	`androidTestCompile 'com.android.support.test:testing-support-lib:0.1'`
`39`		`- androidTestCompile 'info.cukes:cucumber-android:1.2.4'`
`40`		`- androidTestCompile 'info.cukes:cucumber-picocontainer:1.2.4'`
	`39`	`+ androidTestCompile 'info.cukes:cucumber-android:1.2.5'`
	`40`	`+ androidTestCompile 'info.cukes:cucumber-picocontainer:1.2.5'`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@ task cucumber() {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`dependencies {`
`21`		`- testCompile 'info.cukes:cucumber-java:1.2.4'`
`22`		`- testCompile 'info.cukes:cucumber-junit:1.2.4'`
	`21`	`+ testCompile 'info.cukes:cucumber-java:1.2.5'`
	`22`	`+ testCompile 'info.cukes:cucumber-junit:1.2.5'`
`23`	`23`
`24`		`- testCompile 'junit:junit:4.11'`
	`24`	`+ testCompile 'junit:junit:4.12'`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`/**`
`6`	`6`	`* The only purpose of this interface is to be able to provide a custom`
`7`		`- * {@linkplain #toString()}, making TestNG reports look more descriptive.`
	`7`	`+ * <pre>toString()</pre>, making TestNG reports look more descriptive.`
`8`	`8`	`*`
`9`	`9`	`* @see CucumberFeatureWrapperImpl`
`10`	`10`	`*/`