Change some remaining Cucumber.Options to CucumberOptions

Author: brasmusson

examples/java-webbit-websockets-selenium/src/test/java/cucumber/examples/java/websockets/RunCukesTest.java

@@ -1,9 +1,10 @@
 package cucumber.examples.java.websockets;
 
+import cucumber.api.CucumberOptions;
 import cucumber.api.junit.Cucumber;
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-@Cucumber.Options(format = {"html:target/cukes"})
+@CucumberOptions(format = {"html:target/cukes"})
 public class RunCukesTest {
 }

examples/spring-txn/src/test/java/cucumber/examples/spring/txn/RunCukesTest.java

@@ -1,9 +1,10 @@
 package cucumber.examples.spring.txn;
 
+import cucumber.api.CucumberOptions;
 import cucumber.api.junit.Cucumber;
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-@Cucumber.Options(glue = {"cucumber.examples.spring.txn", "cucumber.runtime.java.spring.hooks"})
+@CucumberOptions(glue = {"cucumber.examples.spring.txn", "cucumber.runtime.java.spring.hooks"})
 public class RunCukesTest {
 }

java/src/test/java/cucumber/runtime/java/formatter/RerunFormatterTest.java

@@ -62,7 +62,7 @@ private class RerunFormatterSampleFeatures {
 
     }
 
-    @Cucumber.Options(format = "rerun:target/sample.txt", features = {"classpath:cucumber/runtime/java/formatter/passing.feature"})
+    @CucumberOptions(format = "rerun:target/sample.txt", features = {"classpath:cucumber/runtime/java/formatter/passing.feature"})
     private class RerunFormatterPassingFeature {
 
     }

junit/src/test/java/cucumber/runtime/junit/CucumberTest.java

@@ -1,6 +1,7 @@
 package cucumber.runtime.junit;
 
 import cucumber.annotation.DummyWhen;
+import cucumber.api.CucumberOptions;
 import cucumber.api.junit.Cucumber;
 import cucumber.runtime.CucumberException;
 import org.junit.After;
@@ -97,15 +98,15 @@ public void no_stepdefs_in_cucumber_runner_invalid() {
     private class ImplicitFeatureAndGluePath {
     }
 
-    @Cucumber.Options(features = {"classpath:cucumber/runtime/junit"})
+    @CucumberOptions(features = {"classpath:cucumber/runtime/junit"})
     private class ExplicitFeaturePath {
     }
 
-    @Cucumber.Options(features = {"classpath:gibber/ish"})
+    @CucumberOptions(features = {"classpath:gibber/ish"})
     private class ExplicitFeaturePathWithNoFeatures {
     }
 
-    @Cucumber.Options(features = {"classpath:cucumber/runtime/error/lexer_error.feature"})
+    @CucumberOptions(features = {"classpath:cucumber/runtime/error/lexer_error.feature"})
     private class LexerErrorFeature {
 
     }

picocontainer/src/test/java/cucumber/runtime/java/picocontainer/RunCukesTest.java

@@ -4,6 +4,5 @@
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-//@Cucumber.Options(features = "classpath:cucumber/runtime/java/picocontainer/dates.feature:3:11")
 public class RunCukesTest {
 }