You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/02/10 22:47:54 UTC

[04/10] isis git commit: ISIS-1288: update to Cucumber

ISIS-1288: update to Cucumber


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/05f13152
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/05f13152
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/05f13152

Branch: refs/heads/master
Commit: 05f13152076ce75885747e75f941851f458c66ae
Parents: 8d7c878
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Feb 10 18:23:44 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Feb 10 18:24:59 2016 +0000

----------------------------------------------------------------------
 core/pom.xml                                                  | 2 +-
 .../apache/isis/core/specsupport/specs/CukeSpecsAbstract.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/05f13152/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 57d5fe7..9365da8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -144,7 +144,7 @@
         <junit.version>4.12</junit.version>
         <jmock.version>2.6.0</jmock.version>
         <easymock.version>2.5.2</easymock.version>
-        <cucumber.version>1.1.5</cucumber.version>
+        <cucumber.version>1.2.4</cucumber.version>
 
         <geronimo-jsp_2.1_spec.version>1.0.1</geronimo-jsp_2.1_spec.version>
         <geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>

http://git-wip-us.apache.org/repos/asf/isis/blob/05f13152/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
----------------------------------------------------------------------
diff --git a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
index 7d6295d..07f72e3 100644
--- a/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
+++ b/core/specsupport/src/main/java/org/apache/isis/core/specsupport/specs/CukeSpecsAbstract.java
@@ -16,15 +16,16 @@
  */
 package org.apache.isis.core.specsupport.specs;
 
-import cucumber.api.junit.Cucumber;
-
 import org.junit.runner.RunWith;
 
+import cucumber.api.CucumberOptions;
+import cucumber.api.junit.Cucumber;
+
 /**
  * Base class for all Cucumber specs run at unit-scope; runs the spec as a JUnit test.
  */
 @RunWith(Cucumber.class)
-@Cucumber.Options(
+@CucumberOptions(
         format = {
                 "html:target/cucumber-html-report"
                 // addHook causes an exception to be thrown if this reporter is registered...