Completed update to Java 11

serenity-bdd · Aug 5, 2023 · c86ec5e · c86ec5e
1 parent ac40168
commit c86ec5e
Show file tree

Hide file tree

Showing 804 changed files with 43,693 additions and 524 deletions.
diff --git a/pom.xml b/pom.xml
@@ -672,6 +672,7 @@
                     <excludePackageNames>net.thucydides.core.batches.*</excludePackageNames>
                     <failOnWarnings>false</failOnWarnings>
                     <failOnError>false</failOnError>
+                    <doclint>all,-missing</doclint>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/serenity-cli/pom.xml b/serenity-cli/pom.xml
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
+            <version>1.4.9</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>

diff --git a/serenity-core/src/main/java/net/serenitybdd/core/pages/MatchingPageExpressions.java b/serenity-core/src/main/java/net/serenitybdd/core/pages/MatchingPageExpressions.java
@@ -1,6 +1,6 @@
 package net.serenitybdd.core.pages;
 
-import net.thucydides.core.annotations.At;
+import net.serenitybdd.annotations.At;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/serenity-core/src/main/java/net/serenitybdd/core/pages/PageObject.java b/serenity-core/src/main/java/net/serenitybdd/core/pages/PageObject.java
@@ -8,7 +8,7 @@
 import net.serenitybdd.model.environment.EnvironmentSpecificConfiguration;
 import net.serenitybdd.model.time.SystemClock;
 import net.thucydides.model.ThucydidesSystemProperty;
-import net.thucydides.core.annotations.WhenPageOpens;
+import net.serenitybdd.annotations.WhenPageOpens;
 import net.thucydides.model.environment.SystemEnvironmentVariables;
 import net.thucydides.core.fluent.ThucydidesFluentAdapter;
 import net.thucydides.core.pages.Pages;

diff --git a/serenity-core/src/main/java/net/serenitybdd/core/pages/PageUrls.java b/serenity-core/src/main/java/net/serenitybdd/core/pages/PageUrls.java
@@ -2,9 +2,9 @@
 
 import net.serenitybdd.model.environment.ConfiguredEnvironment;
 import net.serenitybdd.model.environment.EnvironmentSpecificConfiguration;
-import net.thucydides.core.annotations.DefaultUrl;
-import net.thucydides.core.annotations.NamedUrl;
-import net.thucydides.core.annotations.NamedUrls;
+import net.serenitybdd.annotations.DefaultUrl;
+import net.serenitybdd.annotations.NamedUrl;
+import net.serenitybdd.annotations.NamedUrls;
 import net.thucydides.model.environment.SystemEnvironmentVariables;
 import net.thucydides.model.util.EnvironmentVariables;
 import net.thucydides.model.webdriver.Configuration;

diff --git a/serenity-core/src/main/java/net/serenitybdd/core/pages/PagesAnnotatedField.java b/serenity-core/src/main/java/net/serenitybdd/core/pages/PagesAnnotatedField.java
@@ -1,7 +1,7 @@
 package net.serenitybdd.core.pages;
 
 import net.serenitybdd.annotations.Fields;
-import net.thucydides.core.annotations.ManagedPages;
+import net.serenitybdd.annotations.ManagedPages;
 import net.thucydides.core.pages.Pages;
 import net.thucydides.model.reflection.FieldSetter;
 import net.thucydides.core.steps.InvalidManagedPagesFieldException;

diff --git a/serenity-core/src/main/java/net/serenitybdd/core/photography/PhotoSession.java b/serenity-core/src/main/java/net/serenitybdd/core/photography/PhotoSession.java
@@ -2,7 +2,7 @@
 
 import net.thucydides.model.ThucydidesSystemProperty;
 import net.thucydides.model.environment.SystemEnvironmentVariables;
-import net.thucydides.core.screenshots.BlurLevel;
+import net.serenitybdd.annotations.BlurLevel;
 import net.thucydides.model.util.EnvironmentVariables;
 import org.openqa.selenium.UnhandledAlertException;
 import org.slf4j.Logger;

diff --git a/serenity-core/src/main/java/net/serenitybdd/core/photography/PhotoSessionBooking.java b/serenity-core/src/main/java/net/serenitybdd/core/photography/PhotoSessionBooking.java
@@ -1,7 +1,7 @@
 package net.serenitybdd.core.photography;
 
 import com.google.common.base.Preconditions;
-import net.thucydides.core.screenshots.BlurLevel;
+import net.serenitybdd.annotations.BlurLevel;
 import java.nio.file.Path;
 
 public class PhotoSessionBooking {

diff --git a/serenity-core/src/main/java/net/serenitybdd/core/photography/ScreenshotNegative.java b/serenity-core/src/main/java/net/serenitybdd/core/photography/ScreenshotNegative.java
@@ -1,6 +1,6 @@
 package net.serenitybdd.core.photography;
 
-import net.thucydides.core.screenshots.BlurLevel;
+import net.serenitybdd.annotations.BlurLevel;
 
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/serenity-core/src/main/java/net/serenitybdd/core/photography/bluring/AnnotatedBluring.java b/serenity-core/src/main/java/net/serenitybdd/core/photography/bluring/AnnotatedBluring.java
@@ -1,8 +1,8 @@
 package net.serenitybdd.core.photography.bluring;
 
-import net.thucydides.core.annotations.BlurScreenshots;
+import net.serenitybdd.annotations.BlurScreenshots;
 import net.thucydides.model.reflection.StackTraceAnalyser;
-import net.thucydides.core.screenshots.BlurLevel;
+import net.serenitybdd.annotations.BlurLevel;
 
 import java.lang.reflect.Method;
 

diff --git a/serenity-core/src/main/java/net/serenitybdd/core/photography/bluring/Blurer.java b/serenity-core/src/main/java/net/serenitybdd/core/photography/bluring/Blurer.java
@@ -4,7 +4,7 @@
 import net.serenitybdd.core.photography.AmendedPathBuilder;
 import net.serenitybdd.core.photography.PhotoFilter;
 import net.serenitybdd.core.photography.ScreenshotNegative;
-import net.thucydides.core.screenshots.BlurLevel;
+import net.serenitybdd.annotations.BlurLevel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ty-core/src/main/java/net/thucydides/core/annotations/ManagedWebDriverAnnotatedField.java b/...ty-core/src/main/java/net/thucydides/core/annotations/ManagedWebDriverAnnotatedField.java
@@ -1,5 +1,7 @@
 package net.thucydides.core.annotations;
 
+import net.serenitybdd.annotations.ClearCookiesPolicy;
+import net.serenitybdd.annotations.Managed;
 import net.thucydides.core.webdriver.WebDriverFacade;
 import net.serenitybdd.annotations.Fields;
 import org.openqa.selenium.WebDriver;

diff --git a/serenity-core/src/main/java/net/thucydides/core/annotations/TestCaseAnnotations.java b/serenity-core/src/main/java/net/thucydides/core/annotations/TestCaseAnnotations.java
@@ -1,5 +1,7 @@
 package net.thucydides.core.annotations;
 
+import net.serenitybdd.annotations.ClearCookiesPolicy;
+import net.serenitybdd.annotations.UsePersistantStepLibraries;
 import net.serenitybdd.core.environment.WebDriverConfiguredEnvironment;
 import net.thucydides.core.configuration.WebDriverConfiguration;
 import net.thucydides.model.requirements.SerenityTestCaseFinder;

diff --git a/serenity-core/src/main/java/net/thucydides/core/model/screenshots/ScreenshotPermission.java b/serenity-core/src/main/java/net/thucydides/core/model/screenshots/ScreenshotPermission.java
@@ -2,7 +2,7 @@
 
 import net.serenitybdd.markers.DisableScreenshots;
 import net.serenitybdd.markers.IsSilent;
-import net.thucydides.core.annotations.Screenshots;
+import net.serenitybdd.annotations.Screenshots;
 import net.thucydides.model.domain.TakeScreenshots;
 import net.thucydides.model.domain.TestResult;
 import net.thucydides.model.domain.screenshots.ScreenshotPreferencesByClass;

diff --git a/serenity-core/src/main/java/net/thucydides/core/screenshots/ScreenshotBlurCheck.java b/serenity-core/src/main/java/net/thucydides/core/screenshots/ScreenshotBlurCheck.java
@@ -1,6 +1,7 @@
 package net.thucydides.core.screenshots;
 
-import net.thucydides.core.annotations.BlurScreenshots;
+import net.serenitybdd.annotations.BlurLevel;
+import net.serenitybdd.annotations.BlurScreenshots;
 import net.thucydides.model.reflection.StackTraceAnalyser;
 
 import java.lang.reflect.Method;

diff --git a/serenity-core/src/main/java/net/thucydides/core/screenshots/ScreenshotDigest.java b/serenity-core/src/main/java/net/thucydides/core/screenshots/ScreenshotDigest.java
@@ -1,5 +1,6 @@
 package net.thucydides.core.screenshots;
 
+import net.serenitybdd.annotations.BlurLevel;
 import net.thucydides.model.ThucydidesSystemProperty;
 import net.thucydides.model.util.EnvironmentVariables;
 import org.apache.commons.codec.digest.DigestUtils;

diff --git a/serenity-core/src/main/java/net/thucydides/core/steps/PageObjectDependencyInjector.java b/serenity-core/src/main/java/net/thucydides/core/steps/PageObjectDependencyInjector.java
@@ -7,7 +7,7 @@
 import net.serenitybdd.core.pages.PageObject;
 import net.serenitybdd.core.steps.UIInteractionSteps;
 import net.serenitybdd.annotations.Fields;
-import net.thucydides.core.annotations.Steps;
+import net.serenitybdd.annotations.Steps;
 import net.thucydides.core.pages.PageFactory;
 import net.thucydides.core.pages.Pages;
 import net.thucydides.model.webdriver.Configuration;

diff --git a/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java b/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java
@@ -326,7 +326,7 @@ private List<StepListener> registeredListeners() {
     private Set<StepListener> getCustomListeners() {
 
         if (customListeners == null) {
-            customListeners = Collections.synchronizedSet(new HashSet<StepListener>());
+            customListeners = Collections.synchronizedSet(new HashSet<>());
 
             ServiceLoader<StepListener> stepListenerServiceLoader = ServiceLoader.load(StepListener.class);
             Iterator<StepListener> listenerImplementations = stepListenerServiceLoader.iterator();

diff --git a/serenity-core/src/main/java/net/thucydides/core/steps/StepsAnnotatedField.java b/serenity-core/src/main/java/net/thucydides/core/steps/StepsAnnotatedField.java
@@ -3,8 +3,8 @@
 import net.serenitybdd.core.steps.UIInteractionSteps;
 import net.serenitybdd.annotations.Fields;
 import net.thucydides.core.annotations.InvalidStepsFieldException;
-import net.thucydides.core.annotations.Shared;
-import net.thucydides.core.annotations.Steps;
+import net.serenitybdd.annotations.Shared;
+import net.serenitybdd.annotations.Steps;
 import net.thucydides.model.reflection.FieldSetter;
 import net.thucydides.model.util.Inflector;
 

diff --git a/.../src/main/resources/META-INF/services/net.thucydides.model.reports.AcceptanceTestReporter b/.../src/main/resources/META-INF/services/net.thucydides.model.reports.AcceptanceTestReporter
@@ -0,0 +1,2 @@
+net.thucydides.model.reports.json.JSONTestOutcomeReporter
+net.thucydides.core.reports.html.HtmlAcceptanceTestReporter
diff --git a/.../src/main/resources/META-INF/services/net.thucydides.model.statistics.service.TagProvider b/.../src/main/resources/META-INF/services/net.thucydides.model.statistics.service.TagProvider
@@ -0,0 +1,4 @@
+net.thucydides.model.statistics.service.AnnotationBasedTagProvider
+net.thucydides.model.statistics.service.FeatureStoryTagProvider
+net.thucydides.model.requirements.FileSystemRequirementsTagProvider
+net.thucydides.model.requirements.PackageAnnotationBasedTagProvider
diff --git a/...n/resources/META-INF/services/net.thucydides.model.statistics.service.TagProviderStrategy b/...n/resources/META-INF/services/net.thucydides.model.statistics.service.TagProviderStrategy
@@ -0,0 +1 @@
+net.thucydides.model.statistics.service.JUnitTagProviderStrategy
diff --git a/.../serenitybdd/core/annotations/findby/integration/WhenUsingSmartFindByOnPageObjects.groovy b/.../serenitybdd/core/annotations/findby/integration/WhenUsingSmartFindByOnPageObjects.groovy
@@ -3,11 +3,8 @@ package net.serenitybdd.core.annotations.findby.integration
 import net.serenitybdd.core.annotations.findby.FindBy
 import net.serenitybdd.core.pages.PageObject
 import net.serenitybdd.core.pages.WebElementFacade
-import net.thucydides.core.annotations.DefaultUrl
-import net.thucydides.core.pages.integration.StaticSitePageWithFacades
+import net.serenitybdd.annotations.DefaultUrl
 import net.thucydides.core.webdriver.DefaultPageObjectInitialiser
-import net.thucydides.core.webdriver.WebDriverFacade
-import net.thucydides.core.webdriver.WebDriverFactory
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.chrome.ChromeDriver
 import org.openqa.selenium.chrome.ChromeOptions

diff --git a/.../test/groovy/net/serenitybdd/core/steps/WhenInstantiatingAnInstrumentedStepLibrary.groovy b/.../test/groovy/net/serenitybdd/core/steps/WhenInstantiatingAnInstrumentedStepLibrary.groovy
@@ -1,7 +1,7 @@
 package net.serenitybdd.core.steps
 
 import net.serenitybdd.core.pages.PageObject
-import net.thucydides.core.annotations.Steps
+import net.serenitybdd.annotations.Steps
 import spock.lang.Specification
 
 class WhenInstantiatingAnInstrumentedStepLibrary extends Specification {

diff --git a/serenity-core/src/test/groovy/net/serenitybdd/core/steps/WhenUsingScenarioActors.groovy b/serenity-core/src/test/groovy/net/serenitybdd/core/steps/WhenUsingScenarioActors.groovy
@@ -2,7 +2,7 @@ package net.serenitybdd.core.steps
 
 import net.serenitybdd.core.Serenity
 import net.serenitybdd.annotations.Step
-import net.thucydides.core.annotations.Steps
+import net.serenitybdd.annotations.Steps
 import spock.lang.Specification
 
 class WhenUsingScenarioActors extends Specification {

diff --git a/...groovy/net/serenitybdd/core/webdriver/WhenInjectingWebdriverInstancesIntoATestCase.groovy b/...groovy/net/serenitybdd/core/webdriver/WhenInjectingWebdriverInstancesIntoATestCase.groovy
@@ -2,7 +2,7 @@ package net.serenitybdd.core.webdriver
 
 import net.serenitybdd.model.environment.ConfiguredEnvironment
 import net.serenitybdd.core.environment.WebDriverConfiguredEnvironment
-import net.thucydides.core.annotations.Managed
+import net.serenitybdd.annotations.Managed
 import net.thucydides.core.annotations.TestCaseAnnotations
 import net.thucydides.core.configuration.WebDriverConfiguration
 import net.thucydides.model.util.EnvironmentVariables

diff --git a/...core/src/test/groovy/net/serenitybdd/core/webdriver/WhenOpeningAPageOnASpecificUrl.groovy b/...core/src/test/groovy/net/serenitybdd/core/webdriver/WhenOpeningAPageOnASpecificUrl.groovy
@@ -2,7 +2,7 @@ package net.serenitybdd.core.webdriver
 
 
 import net.serenitybdd.core.pages.PageObject
-import net.thucydides.core.annotations.DefaultUrl
+import net.serenitybdd.annotations.DefaultUrl
 import net.thucydides.model.util.EnvironmentVariables
 import net.thucydides.model.environment.MockEnvironmentVariables
 import org.openqa.selenium.WebDriver

diff --git a/.../src/test/groovy/net/serenitybdd/core/webdriver/appium/WhenUsingAnAppiumDevicePool.groovy b/.../src/test/groovy/net/serenitybdd/core/webdriver/appium/WhenUsingAnAppiumDevicePool.groovy
@@ -1,7 +1,7 @@
 package net.serenitybdd.core.webdriver.appium
 
 import net.serenitybdd.core.webdriver.driverproviders.AppiumDriverProvider
-import net.thucydides.core.annotations.Shared
+import net.serenitybdd.annotations.Shared
 import net.thucydides.core.events.TestLifecycleEvents
 import net.thucydides.model.environment.MockEnvironmentVariables
 import net.thucydides.core.webdriver.WebDriverInstanceEvents

diff --git a/...ovy/net/serenitybdd/core/webdriver/integration/appium/WhenUsingAnAppiumServicePool.groovy b/...ovy/net/serenitybdd/core/webdriver/integration/appium/WhenUsingAnAppiumServicePool.groovy
@@ -2,7 +2,7 @@ package net.serenitybdd.core.webdriver.integration.appium
 
 import net.serenitybdd.core.webdriver.appium.AppiumDevicePool
 import net.serenitybdd.core.webdriver.appium.AppiumServerPool
-import net.thucydides.core.annotations.Shared
+import net.serenitybdd.annotations.Shared
 import net.thucydides.model.environment.MockEnvironmentVariables
 import spock.lang.Specification
 

diff --git a/serenity-core/src/test/groovy/net/thucydides/core/annotations/WhenAnnotatingTestCases.groovy b/serenity-core/src/test/groovy/net/thucydides/core/annotations/WhenAnnotatingTestCases.groovy
@@ -1,5 +1,6 @@
 package net.thucydides.core.annotations
 
+import net.serenitybdd.annotations.Managed
 import org.openqa.selenium.WebDriver
 import spock.lang.Shared
 import spock.lang.Specification

diff --git a/...t/thucydides/core/annotations/findby/integration/WhenUsingSmartFindByOnPageObjects.groovy b/...t/thucydides/core/annotations/findby/integration/WhenUsingSmartFindByOnPageObjects.groovy
@@ -1,11 +1,9 @@
 package net.thucydides.core.annotations.findby.integration
 
 import net.serenitybdd.core.pages.PageObject
-import net.thucydides.core.annotations.DefaultUrl
+import net.serenitybdd.annotations.DefaultUrl
 import net.thucydides.model.environment.TestLocalEnvironmentVariables
 import net.thucydides.core.pages.WebElementFacade
-import net.thucydides.model.util.EnvironmentVariables
-import net.thucydides.model.environment.MockEnvironmentVariables
 import net.thucydides.core.webdriver.DefaultPageObjectInitialiser
 import net.thucydides.core.webdriver.WebDriverFacade
 import net.thucydides.core.webdriver.WebDriverFactory

diff --git a/...groovy/net/thucydides/core/pages/integration/WhenConfiguringTheStartingUrlForAPage.groovy b/...groovy/net/thucydides/core/pages/integration/WhenConfiguringTheStartingUrlForAPage.groovy
@@ -1,9 +1,9 @@
 package net.thucydides.core.pages.integration
 
 import net.serenitybdd.core.pages.PageUrls
-import net.thucydides.core.annotations.DefaultUrl
-import net.thucydides.core.annotations.NamedUrl
-import net.thucydides.core.annotations.NamedUrls
+import net.serenitybdd.annotations.DefaultUrl
+import net.serenitybdd.annotations.NamedUrl
+import net.serenitybdd.annotations.NamedUrls
 import net.thucydides.model.configuration.SystemPropertiesConfiguration
 import net.thucydides.model.util.EnvironmentVariables
 import net.thucydides.model.environment.MockEnvironmentVariables

diff --git a/...nity-core/src/test/groovy/net/thucydides/core/requirements/WhenAnalysingClassPaths.groovy b/...nity-core/src/test/groovy/net/thucydides/core/requirements/WhenAnalysingClassPaths.groovy
@@ -1,6 +1,7 @@
 package net.thucydides.core.requirements
 
 import net.thucydides.model.requirements.PathStartsWith
+import net.thucydides.model.requirements.RequirementsPath
 import spock.lang.Specification
 
 class WhenAnalysingClassPaths extends Specification {

diff --git a/...est/groovy/net/thucydides/core/requirements/WhenCalculatingRequirementTestCoverage.groovy b/...est/groovy/net/thucydides/core/requirements/WhenCalculatingRequirementTestCoverage.groovy
@@ -1,5 +1,6 @@
 package net.thucydides.core.requirements
 
+import net.thucydides.core.model.SampleTestResults
 import net.thucydides.model.ThucydidesSystemProperty
 import net.thucydides.model.issues.IssueTracking
 import net.thucydides.model.domain.ReportType

diff --git a/.../test/groovy/net/thucydides/core/requirements/WhenGeneratingRequirementsReportData.groovy b/.../test/groovy/net/thucydides/core/requirements/WhenGeneratingRequirementsReportData.groovy
@@ -1,6 +1,7 @@
 package net.thucydides.core.requirements
 
 import com.google.common.collect.Lists
+import net.thucydides.core.model.SampleTestResults
 import net.thucydides.model.ThucydidesSystemProperty
 import net.thucydides.model.issues.IssueTracking
 import net.thucydides.model.domain.*

diff --git a/...ydides/core/requirements/WhenLoadingRequirementDefinitionDescriptionFromADirectory.groovy b/...ydides/core/requirements/WhenLoadingRequirementDefinitionDescriptionFromADirectory.groovy
@@ -1,5 +1,6 @@
 package net.thucydides.core.requirements
 
+import net.thucydides.model.requirements.DefaultCapabilityTypes
 import net.thucydides.model.requirements.FileSystemRequirements
 import net.thucydides.model.requirements.Requirements
 import net.thucydides.model.requirements.model.NarrativeReader

diff --git a/...y/net/thucydides/core/requirements/WhenLoadingRequirementOutcomesFromTheFileSystem.groovy b/...y/net/thucydides/core/requirements/WhenLoadingRequirementOutcomesFromTheFileSystem.groovy
@@ -1,5 +1,6 @@
 package net.thucydides.core.requirements
 
+import net.thucydides.model.requirements.DefaultCapabilityTypes
 import net.thucydides.model.requirements.FileSystemRequirements
 import net.thucydides.model.requirements.FileSystemRequirementsTagProvider
 import net.thucydides.model.requirements.Requirements

diff --git a/...oovy/net/thucydides/core/screenshots/integration/WhenDecidingWhenToBlurScreenshots.groovy b/...oovy/net/thucydides/core/screenshots/integration/WhenDecidingWhenToBlurScreenshots.groovy
@@ -1,7 +1,7 @@
 package net.thucydides.core.screenshots.integration
 
-import net.thucydides.core.annotations.BlurScreenshots
-import net.thucydides.core.screenshots.BlurLevel
+import net.serenitybdd.annotations.BlurScreenshots
+import net.serenitybdd.annotations.BlurLevel
 import net.thucydides.core.screenshots.ScreenshotBlurCheck
 import spock.lang.Specification
 

diff --git a/.../groovy/net/thucydides/core/screenshots/integration/WhenRecordingUniqueScreenshots.groovy b/.../groovy/net/thucydides/core/screenshots/integration/WhenRecordingUniqueScreenshots.groovy
@@ -1,6 +1,6 @@
 package net.thucydides.core.screenshots.integration
 
-import net.thucydides.core.screenshots.BlurLevel
+import net.serenitybdd.annotations.BlurLevel
 import net.thucydides.core.screenshots.ScreenshotDigest
 import net.thucydides.model.util.EnvironmentVariables
 import net.thucydides.model.util.FileSystemUtils

diff --git a/...y/net/thucydides/core/steps/WhenUsingMultipleInstancesOfTheSameStepsLibraryInATest.groovy b/...y/net/thucydides/core/steps/WhenUsingMultipleInstancesOfTheSameStepsLibraryInATest.groovy
@@ -1,6 +1,6 @@
 package net.thucydides.core.steps
 
-import net.thucydides.core.annotations.Steps
+import net.serenitybdd.annotations.Steps
 import net.thucydides.model.environment.MockEnvironmentVariables
 import spock.lang.Specification
 

diff --git a/...ore/src/test/groovy/net/thucydides/core/util/WhenDisplayingTagNamesInAReadableForm.groovy b/...ore/src/test/groovy/net/thucydides/core/util/WhenDisplayingTagNamesInAReadableForm.groovy
@@ -2,6 +2,7 @@ package net.thucydides.core.util
 
 import net.thucydides.model.util.Acronym
 import spock.lang.Specification
+import net.thucydides.model.util.Inflector
 
 class WhenDisplayingTagNamesInAReadableForm extends Specification {
 

diff --git a/...net/thucydides/core/webdriver/WhenProvidingWebdriverSupportForThucydidesExtensions.groovy b/...net/thucydides/core/webdriver/WhenProvidingWebdriverSupportForThucydidesExtensions.groovy
@@ -1,7 +1,7 @@
 package net.thucydides.core.webdriver
 
-import net.thucydides.core.annotations.Managed
-import net.thucydides.core.annotations.ManagedPages
+import net.serenitybdd.annotations.Managed
+import net.serenitybdd.annotations.ManagedPages
 import net.thucydides.core.pages.Pages
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.chrome.ChromeDriver

diff --git a/serenity-core/src/test/java/net/serenitybdd/core/WhenRunningTestsInIsolation.java b/serenity-core/src/test/java/net/serenitybdd/core/WhenRunningTestsInIsolation.java
@@ -1,9 +1,9 @@
 package net.serenitybdd.core;
 
-import net.thucydides.core.annotations.Managed;
-import net.thucydides.core.annotations.ManagedPages;
+import net.serenitybdd.annotations.Managed;
+import net.serenitybdd.annotations.ManagedPages;
 import net.serenitybdd.annotations.Step;
-import net.thucydides.core.annotations.Steps;
+import net.serenitybdd.annotations.Steps;
 import net.thucydides.core.pages.Pages;
 import net.thucydides.core.steps.ScenarioSteps;
 import net.thucydides.model.steps.StepListener;

diff --git a/...re/src/test/java/net/thucydides/core/annotations/WhenReadingManagedDriverAnnotations.java b/...re/src/test/java/net/thucydides/core/annotations/WhenReadingManagedDriverAnnotations.java
@@ -1,6 +1,7 @@
 package net.thucydides.core.annotations;
 
 
+import net.serenitybdd.annotations.Managed;
 import net.thucydides.core.webdriver.WebDriverFacade;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/serenity-core/src/test/java/net/thucydides/core/model/WhenInstanciatingStepLibraries.java b/serenity-core/src/test/java/net/thucydides/core/model/WhenInstanciatingStepLibraries.java
@@ -3,7 +3,7 @@
 import net.serenitybdd.core.Serenity;
 import net.thucydides.core.model.samples.MyInheritedStepLibrary;
 import net.serenitybdd.annotations.Step;
-import net.thucydides.core.annotations.Steps;
+import net.serenitybdd.annotations.Steps;
 import net.thucydides.core.pages.Pages;
 import net.thucydides.core.steps.RecursiveOrCyclicStepLibraryReferenceException;
 import net.thucydides.core.steps.ScenarioSteps;