Resolve merge conflict

cucumber · Mar 21, 2012 · 566962b · 566962b
2 parents d623c28 + 2a400fe
commit 566962b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,7 @@
+## [Git master](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC23...master)
+
+* The @Pending annotation no longer exists. Throw a PendingException instead ([#271](https://github.com/cucumber/cucumber-jvm/issues/271) Aslak Hellesøy)
+
 ## [1.0.0.RC23](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC22...v1.0.0.RC23)
 
 * [JUnit] CucumberException when running Cucumber with Jacoco code coverage ([#258](https://github.com/cucumber/cucumber-jvm/issues/258) Jan Stamer, Aslak Hellesøy)

diff --git a/java/src/main/java/cucumber/annotation/Pending.java b/java/src/main/java/cucumber/annotation/Pending.java
diff --git a/java/src/main/java/cucumber/runtime/java/JavaStepDefinition.java b/java/src/main/java/cucumber/runtime/java/JavaStepDefinition.java
@@ -1,10 +1,8 @@
 package cucumber.runtime.java;
 
-import cucumber.annotation.Pending;
 import cucumber.runtime.CucumberException;
 import cucumber.runtime.JdkPatternArgumentMatcher;
 import cucumber.runtime.ParameterType;
-import cucumber.runtime.PendingException;
 import cucumber.runtime.StepDefinition;
 import gherkin.I18n;
 import gherkin.formatter.Argument;
@@ -33,9 +31,6 @@ public JavaStepDefinition(Method method, Pattern pattern, ObjectFactory objectFa
     }
 
     public void execute(I18n i18n, Object[] args) throws Throwable {
-        if (method.isAnnotationPresent(Pending.class)) {
-            throw new PendingException(method.getAnnotation(Pending.class).value());
-        }
         Class<?> clazz = method.getDeclaringClass();
         Object target = objectFactory.getInstance(clazz);
         try {