diff --git a/src/main/java/io/dropwizard/discovery/AbstractDiscoveryBundle.java b/src/main/java/io/dropwizard/discovery/AbstractDiscoveryBundle.java
index b784e5f..bf35f12 100644
--- a/src/main/java/io/dropwizard/discovery/AbstractDiscoveryBundle.java
+++ b/src/main/java/io/dropwizard/discovery/AbstractDiscoveryBundle.java
@@ -1,7 +1,9 @@
 package io.dropwizard.discovery;
 
-import io.dropwizard.Configuration;
-import io.dropwizard.ConfiguredBundle;
+import io.dropwizard.core.Configuration;
+import io.dropwizard.core.ConfiguredBundle;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 import io.dropwizard.discovery.client.DiscoveryClient;
 import io.dropwizard.discovery.core.CuratorAdvertisementListener;
 import io.dropwizard.discovery.core.CuratorAdvertiser;
@@ -9,9 +11,7 @@
 import io.dropwizard.discovery.core.JacksonInstanceSerializer;
 import io.dropwizard.discovery.manage.CuratorAdvertiserManager;
 import io.dropwizard.discovery.manage.ServiceDiscoveryManager;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.x.discovery.DownInstancePolicy;
 import org.apache.curator.x.discovery.ProviderStrategy;
@@ -31,13 +31,13 @@ public abstract class AbstractDiscoveryBundle<T extends Configuration, V>
     public abstract Class<V> getPayloadClass();
 
     @Override
-    public void initialize(@Nonnull final Bootstrap<?> bootstrap) {
+    public void initialize(@NonNull final Bootstrap<?> bootstrap) {
         mapper = bootstrap.getObjectMapper();
     }
 
     @Override
-    public void run(@Nonnull final T configuration,
-            @Nonnull final Environment environment) throws Exception {
+    public void run(@NonNull final T configuration,
+            @NonNull final Environment environment) throws Exception {
 
         final DiscoveryFactory discoveryConfig = getDiscoveryFactory(configuration);
         // Allow disabling all discovery functionality
@@ -77,13 +77,13 @@ public void run(@Nonnull final T configuration,
      * Return a new {@link DiscoveryClient} instance that uses a
      * {@link RoundRobinStrategy} when selecting a instance to return and the
      * default {@link DownInstancePolicy}.
-     * 
+     *
      * @param serviceName
      *            name of the service to monitor
      * @return {@link DiscoveryClient}
      */
     public DiscoveryClient<V> newDiscoveryClient(
-            @Nonnull final String serviceName) {
+            @NonNull final String serviceName) {
         return newDiscoveryClient(serviceName, new RoundRobinStrategy<V>());
     }
 
@@ -91,7 +91,7 @@ public DiscoveryClient<V> newDiscoveryClient(
      * Return a new {@link DiscoveryClient} instance uses a default
      * {@link DownInstancePolicy} and the provided {@link ProviderStrategy} for
      * selecting an instance.
-     * 
+     *
      * @param serviceName
      *            name of the service to monitor
      * @param providerStrategy
@@ -100,8 +100,8 @@ public DiscoveryClient<V> newDiscoveryClient(
      * @return {@link DiscoveryClient}
      */
     public DiscoveryClient<V> newDiscoveryClient(
-            @Nonnull final String serviceName,
-            @Nonnull final ProviderStrategy<V> providerStrategy) {
+            @NonNull final String serviceName,
+            @NonNull final ProviderStrategy<V> providerStrategy) {
         return new DiscoveryClient<V>(serviceName, discovery,
                 new DownInstancePolicy(), providerStrategy);
     }
diff --git a/src/main/java/io/dropwizard/discovery/DiscoveryBundle.java b/src/main/java/io/dropwizard/discovery/DiscoveryBundle.java
index 605e4c2..dc08ea5 100644
--- a/src/main/java/io/dropwizard/discovery/DiscoveryBundle.java
+++ b/src/main/java/io/dropwizard/discovery/DiscoveryBundle.java
@@ -1,6 +1,6 @@
 package io.dropwizard.discovery;
 
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 import io.dropwizard.discovery.core.CuratorAdvertiser;
 import io.dropwizard.discovery.core.DefaultServiceInstanceFactory;
 import io.dropwizard.discovery.core.InstanceMetadata;
@@ -11,12 +11,12 @@
  * <code>DiscoveryBundle</code> provides a more completed implementation of
  * <code>AbstractDiscoveryBundle</code>, using <code>InstanceMetadata</code> as
  * payload for <code>ServiceInstance</code>
- * 
+ *
  * <p>
  * Users should extend <code>AbstractDiscoveryBundle</code> if more fine-grain
  * control is necessary of the <code>ServiceInstance</code> payload.
  * </p>
- * 
+ *
  * @see io.dropwizard.discovery.core.InstanceMetadata
  * @see io.dropwizard.discovery.DiscoveryBundle
  */
diff --git a/src/main/java/io/dropwizard/discovery/DiscoveryConfiguration.java b/src/main/java/io/dropwizard/discovery/DiscoveryConfiguration.java
index 9cbf569..671f0c5 100644
--- a/src/main/java/io/dropwizard/discovery/DiscoveryConfiguration.java
+++ b/src/main/java/io/dropwizard/discovery/DiscoveryConfiguration.java
@@ -1,6 +1,6 @@
 package io.dropwizard.discovery;
 
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 import io.dropwizard.discovery.core.CuratorAdvertiser;
 import org.apache.curator.x.discovery.ServiceDiscovery;
 
diff --git a/src/main/java/io/dropwizard/discovery/DiscoveryFactory.java b/src/main/java/io/dropwizard/discovery/DiscoveryFactory.java
index fc62e7a..bb8f32e 100644
--- a/src/main/java/io/dropwizard/discovery/DiscoveryFactory.java
+++ b/src/main/java/io/dropwizard/discovery/DiscoveryFactory.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
@@ -38,7 +38,7 @@ enum CompressionCodec {
 
         final private CompressionProvider provider;
 
-        CompressionCodec(@Nonnull final CompressionProvider provider) {
+        CompressionCodec(@NonNull final CompressionProvider provider) {
             this.provider = provider;
         }
 
@@ -125,7 +125,7 @@ public String getServiceName() {
     }
 
     @JsonProperty
-    public void setServiceName(@Nonnull final String serviceName) {
+    public void setServiceName(@NonNull final String serviceName) {
         this.serviceName = checkNotNull(serviceName);
     }
 
@@ -135,7 +135,7 @@ public String getNamespace() {
     }
 
     @JsonProperty
-    public void setNamespace(@Nonnull final String namespace) {
+    public void setNamespace(@NonNull final String namespace) {
         this.namespace = checkNotNull(namespace);
     }
 
@@ -145,7 +145,7 @@ public String getBasePath() {
     }
 
     @JsonProperty
-    public void setBasePath(@Nonnull final String basePath) {
+    public void setBasePath(@NonNull final String basePath) {
         this.basePath = checkNotNull(basePath);
     }
 
@@ -155,7 +155,7 @@ public String getListenAddress() {
     }
 
     @JsonProperty
-    public void setListenAddress(@Nonnull final String listenAddress) {
+    public void setListenAddress(@NonNull final String listenAddress) {
         this.listenAddress = checkNotNull(listenAddress);
     }
 
@@ -166,7 +166,7 @@ public Duration getConnectionTimeout() {
 
     @JsonProperty
     public void setConnectionTimeout(
-            @Nonnull final Duration connectionTimeout) {
+            @NonNull final Duration connectionTimeout) {
         this.connectionTimeout = checkNotNull(connectionTimeout);
     }
 
@@ -176,7 +176,7 @@ public Duration getSessionTimeout() {
     }
 
     @JsonProperty
-    public void setSessionTimeout(@Nonnull final Duration sessionTimeout) {
+    public void setSessionTimeout(@NonNull final Duration sessionTimeout) {
         this.sessionTimeout = checkNotNull(sessionTimeout);
     }
 
@@ -216,7 +216,7 @@ public Duration getBaseSleepTime() {
     }
 
     @JsonProperty
-    public void setBaseSleepTime(@Nonnull final Duration baseSleepTime) {
+    public void setBaseSleepTime(@NonNull final Duration baseSleepTime) {
         this.baseSleepTime = checkNotNull(baseSleepTime);
     }
 
diff --git a/src/main/java/io/dropwizard/discovery/client/DiscoveryClient.java b/src/main/java/io/dropwizard/discovery/client/DiscoveryClient.java
index b59903a..07b270c 100644
--- a/src/main/java/io/dropwizard/discovery/client/DiscoveryClient.java
+++ b/src/main/java/io/dropwizard/discovery/client/DiscoveryClient.java
@@ -5,8 +5,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Collection;
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.ThreadSafe;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.apache.curator.x.discovery.DownInstancePolicy;
 import org.apache.curator.x.discovery.ProviderStrategy;
 import org.apache.curator.x.discovery.ServiceCache;
@@ -16,7 +15,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@ThreadSafe
 public class DiscoveryClient<T> implements Closeable {
 
     private static final Logger LOGGER = LoggerFactory
@@ -27,7 +25,7 @@ public class DiscoveryClient<T> implements Closeable {
 
     /**
      * Constructor
-     * 
+     *
      * @param serviceName
      *            name of the service to monitor
      * @param discovery
@@ -38,10 +36,10 @@ public class DiscoveryClient<T> implements Closeable {
      * @param providerStrategy
      *            {@link ProviderStrategy} to use when selecting an instance
      */
-    public DiscoveryClient(@Nonnull final String serviceName,
-            @Nonnull final ServiceDiscovery<T> discovery,
-            @Nonnull final DownInstancePolicy downInstancePolicy,
-            @Nonnull final ProviderStrategy<T> providerStrategy) {
+    public DiscoveryClient(@NonNull final String serviceName,
+            @NonNull final ServiceDiscovery<T> discovery,
+            @NonNull final DownInstancePolicy downInstancePolicy,
+            @NonNull final ProviderStrategy<T> providerStrategy) {
         checkNotNull(serviceName);
         checkArgument(!serviceName.isEmpty(), "serviceName cannot be empty");
         checkNotNull(providerStrategy);
@@ -58,7 +56,7 @@ public DiscoveryClient(@Nonnull final String serviceName,
 
     /**
      * Return a list of discoverable services
-     * 
+     *
      * @return Collection of service names
      */
     public Collection<String> getServices() throws Exception {
@@ -67,17 +65,17 @@ public Collection<String> getServices() throws Exception {
 
     /**
      * Return the running instances for the service.
-     * 
+     *
      * @return Collection of service instances
      */
     public Collection<ServiceInstance<T>> getInstances(
-            @Nonnull final String serviceName) throws Exception {
+            @NonNull final String serviceName) throws Exception {
         return discovery.queryForInstances(serviceName);
     }
 
     /**
      * Return a cached list of the running instances for the service.
-     * 
+     *
      * @return Collection of service instances
      */
     public Collection<ServiceInstance<T>> getInstances() {
@@ -86,7 +84,7 @@ public Collection<ServiceInstance<T>> getInstances() {
 
     /**
      * Return an instance of this service.
-     * 
+     *
      * @return ServiceInstance
      * @throws Exception
      */
@@ -96,17 +94,17 @@ public ServiceInstance<T> getInstance() throws Exception {
 
     /**
      * Note an error when connecting to a service instance.
-     * 
+     *
      * @param instance
      *            {@link ServiceInstance} that is causing the error.
      */
-    public void noteError(@Nonnull final ServiceInstance<T> instance) {
+    public void noteError(@NonNull final ServiceInstance<T> instance) {
         provider.noteError(instance);
     }
 
     /**
      * Start the internal {@link ServiceProvider} and {@link ServiceCache}
-     * 
+     *
      * @throws Exception
      */
     public void start() throws Exception {
diff --git a/src/main/java/io/dropwizard/discovery/client/DiscoveryClientManager.java b/src/main/java/io/dropwizard/discovery/client/DiscoveryClientManager.java
index 639049f..6db6b97 100644
--- a/src/main/java/io/dropwizard/discovery/client/DiscoveryClientManager.java
+++ b/src/main/java/io/dropwizard/discovery/client/DiscoveryClientManager.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import io.dropwizard.lifecycle.Managed;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class DiscoveryClientManager<T> implements Managed {
 
@@ -14,7 +14,7 @@ public class DiscoveryClientManager<T> implements Managed {
      * @param client
      *            {@link DiscoveryClient}
      */
-    public DiscoveryClientManager(@Nonnull final DiscoveryClient<T> client) {
+    public DiscoveryClientManager(@NonNull final DiscoveryClient<T> client) {
         this.client = checkNotNull(client);
     }
 
diff --git a/src/main/java/io/dropwizard/discovery/core/CuratorAdvertisementListener.java b/src/main/java/io/dropwizard/discovery/core/CuratorAdvertisementListener.java
index 9b661aa..0df0205 100644
--- a/src/main/java/io/dropwizard/discovery/core/CuratorAdvertisementListener.java
+++ b/src/main/java/io/dropwizard/discovery/core/CuratorAdvertisementListener.java
@@ -1,7 +1,7 @@
 package io.dropwizard.discovery.core;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.eclipse.jetty.server.Server;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +21,7 @@ public class CuratorAdvertisementListener<T>
      *            {@link CuratorAdvertiser}
      */
     public CuratorAdvertisementListener(
-            @Nonnull final CuratorAdvertiser<T> advertiser) {
+            @NonNull final CuratorAdvertiser<T> advertiser) {
         this.advertiser = checkNotNull(advertiser);
     }
 
diff --git a/src/main/java/io/dropwizard/discovery/core/CuratorAdvertiser.java b/src/main/java/io/dropwizard/discovery/core/CuratorAdvertiser.java
index afa0ad6..bc54f4e 100644
--- a/src/main/java/io/dropwizard/discovery/core/CuratorAdvertiser.java
+++ b/src/main/java/io/dropwizard/discovery/core/CuratorAdvertiser.java
@@ -6,10 +6,9 @@
 import java.util.Collection;
 import java.util.Optional;
 import java.util.UUID;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.state.ConnectionState;
 import org.apache.curator.framework.state.ConnectionStateListener;
@@ -21,7 +20,6 @@
 import com.google.common.base.Strings;
 import io.dropwizard.discovery.DiscoveryFactory;
 
-@ThreadSafe
 public class CuratorAdvertiser<T> implements ConnectionStateListener {
     private static final Logger LOGGER = LoggerFactory
             .getLogger(CuratorAdvertiser.class);
@@ -48,15 +46,15 @@ public class CuratorAdvertiser<T> implements ConnectionStateListener {
 
     /**
      * Constructor
-     * 
+     *
      * @param configuration
      *            {@link DiscoveryFactory}
      * @param discovery
      *            {@link ServiceDiscovery}
      */
-    public CuratorAdvertiser(@Nonnull final DiscoveryFactory configuration,
-            @Nonnull final ServiceDiscovery<T> discovery,
-            @Nonnull final ServiceInstanceFactory<T> serviceInstanceFactory) {
+    public CuratorAdvertiser(@NonNull final DiscoveryFactory configuration,
+            @NonNull final ServiceDiscovery<T> discovery,
+            @NonNull final ServiceInstanceFactory<T> serviceInstanceFactory) {
         this.configuration = checkNotNull(configuration);
         this.discovery = checkNotNull(discovery);
         this.serviceInstanceFactory = checkNotNull(serviceInstanceFactory);
@@ -65,7 +63,7 @@ public CuratorAdvertiser(@Nonnull final DiscoveryFactory configuration,
     /**
      * Set the listen port and set the listen address from the configuration
      * file or attempt to auto-detect the first IPv4 address that is found.
-     * 
+     *
      * @param port
      *            port this instance is listening on
      * @param adminPort
@@ -111,7 +109,7 @@ public synchronized void initListenInfo(final int port,
 
     /**
      * Register the instance in Zookeeper
-     * 
+     *
      * @throws Exception
      */
     public synchronized void registerAvailability() throws Exception {
@@ -120,13 +118,13 @@ public synchronized void registerAvailability() throws Exception {
 
     /**
      * Register a specific instance in Zookeeper
-     * 
+     *
      * @param instance
      *            Service Instance
      * @throws Exception
      */
     public synchronized void registerAvailability(
-            @Nonnull final ServiceInstance<T> instance) throws Exception {
+            @NonNull final ServiceInstance<T> instance) throws Exception {
         checkInitialized();
         LOGGER.info("Registering service ({}) at <{}:{}>",
                 configuration.getServiceName(), listenAddress, listenPort);
@@ -138,7 +136,7 @@ public synchronized void registerAvailability(
 
     /**
      * Remove the instance from Zookeeper
-     * 
+     *
      * @throws Exception
      */
     public synchronized void unregisterAvailability() throws Exception {
@@ -147,13 +145,13 @@ public synchronized void unregisterAvailability() throws Exception {
 
     /**
      * Remove the specific instance from Zookeeper
-     * 
+     *
      * @param instance
      *            Service Instance
      * @throws Exception
      */
     public synchronized void unregisterAvailability(
-            @Nonnull final ServiceInstance<T> instance) throws Exception {
+            @NonNull final ServiceInstance<T> instance) throws Exception {
         checkInitialized();
         LOGGER.info("Unregistering service ({}) at <{}:{}>",
                 configuration.getServiceName(), listenAddress, listenPort);
@@ -165,7 +163,7 @@ public synchronized void unregisterAvailability(
 
     /**
      * Return the instance ID
-     * 
+     *
      * @return {@link UUID}
      */
     public UUID getInstanceId() {
@@ -174,7 +172,7 @@ public UUID getInstanceId() {
 
     /**
      * Return the listening port
-     * 
+     *
      * @return port number
      */
     public synchronized int getListenPort() {
@@ -192,7 +190,7 @@ public synchronized Optional<Integer> getAdminPort() {
 
     /**
      * Return the listening IP address
-     * 
+     *
      * @return IP address
      */
     @Nullable
@@ -203,7 +201,7 @@ public synchronized String getListenAddress() {
     /**
      * Return the {@link ServiceInstance} that will be registered with the
      * {@link ServiceDiscovery} instance.
-     * 
+     *
      * @return {@link ServiceInstance}
      * @throws Exception
      */
@@ -219,7 +217,7 @@ public synchronized ServiceInstance<T> getInstance() throws Exception {
     /**
      * Check that the {@link #initListenInfo} method has been called by
      * validating that the listenPort is greater than 1.
-     * 
+     *
      * @throws IllegalStateException
      */
     public synchronized void checkInitialized() {
diff --git a/src/main/java/io/dropwizard/discovery/core/CuratorFactory.java b/src/main/java/io/dropwizard/discovery/core/CuratorFactory.java
index 8d9ba79..1e3fabb 100644
--- a/src/main/java/io/dropwizard/discovery/core/CuratorFactory.java
+++ b/src/main/java/io/dropwizard/discovery/core/CuratorFactory.java
@@ -4,8 +4,8 @@
 import io.dropwizard.discovery.DiscoveryFactory;
 import io.dropwizard.discovery.health.CuratorHealthCheck;
 import io.dropwizard.discovery.manage.CuratorManager;
-import io.dropwizard.setup.Environment;
-import javax.annotation.Nonnull;
+import io.dropwizard.core.setup.Environment;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 
@@ -15,23 +15,23 @@ public class CuratorFactory {
 
     /**
      * Constructor
-     * 
+     *
      * @param environment
      *            {@link Environment}
      */
-    public CuratorFactory(@Nonnull final Environment environment) {
+    public CuratorFactory(@NonNull final Environment environment) {
         this.environment = checkNotNull(environment);
     }
 
     /**
      * Build a new instance of a {@link CuratorFramework} and register a health
      * check and make sure it's properly managed.
-     * 
+     *
      * @param config
      *            {@link DiscoveryFactory}
      * @return {@link CuratorFramework}
      */
-    public CuratorFramework build(@Nonnull final DiscoveryFactory config) {
+    public CuratorFramework build(@NonNull final DiscoveryFactory config) {
         final CuratorFramework framework = CuratorFrameworkFactory
                 .builder()
                 .connectionTimeoutMs(
diff --git a/src/main/java/io/dropwizard/discovery/core/InstanceMetadata.java b/src/main/java/io/dropwizard/discovery/core/InstanceMetadata.java
index b40f409..697d410 100644
--- a/src/main/java/io/dropwizard/discovery/core/InstanceMetadata.java
+++ b/src/main/java/io/dropwizard/discovery/core/InstanceMetadata.java
@@ -3,8 +3,8 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.Immutable;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import com.google.errorprone.annotations.Immutable;
 import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.NotEmpty;
 import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/src/main/java/io/dropwizard/discovery/core/JacksonInstanceSerializer.java b/src/main/java/io/dropwizard/discovery/core/JacksonInstanceSerializer.java
index e7f1a4f..5c13b49 100644
--- a/src/main/java/io/dropwizard/discovery/core/JacksonInstanceSerializer.java
+++ b/src/main/java/io/dropwizard/discovery/core/JacksonInstanceSerializer.java
@@ -1,7 +1,7 @@
 package io.dropwizard.discovery.core;
 
 import java.io.ByteArrayOutputStream;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.apache.curator.x.discovery.ServiceInstance;
 import org.apache.curator.x.discovery.details.InstanceSerializer;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -23,8 +23,8 @@ public class JacksonInstanceSerializer<T> implements InstanceSerializer<T> {
      * @param typeRef
      *            {@link TypeReference}
      */
-    public JacksonInstanceSerializer(@Nonnull final ObjectMapper mapper,
-            @Nonnull final TypeReference<ServiceInstance<T>> typeRef) {
+    public JacksonInstanceSerializer(@NonNull final ObjectMapper mapper,
+            @NonNull final TypeReference<ServiceInstance<T>> typeRef) {
         this.reader = mapper.reader();
         this.writer = mapper.writer();
         this.typeRef = typeRef;
diff --git a/src/main/java/io/dropwizard/discovery/health/CuratorHealthCheck.java b/src/main/java/io/dropwizard/discovery/health/CuratorHealthCheck.java
index b81165a..0ae524d 100644
--- a/src/main/java/io/dropwizard/discovery/health/CuratorHealthCheck.java
+++ b/src/main/java/io/dropwizard/discovery/health/CuratorHealthCheck.java
@@ -1,7 +1,7 @@
 package io.dropwizard.discovery.health;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.imps.CuratorFrameworkState;
 import com.codahale.metrics.health.HealthCheck;
@@ -16,7 +16,7 @@ public class CuratorHealthCheck extends HealthCheck {
      * @param framework
      *            {@link CuratorFramework}
      */
-    public CuratorHealthCheck(@Nonnull final CuratorFramework framework) {
+    public CuratorHealthCheck(@NonNull final CuratorFramework framework) {
         this.framework = checkNotNull(framework);
     }
 
diff --git a/src/main/java/io/dropwizard/discovery/manage/CuratorAdvertiserManager.java b/src/main/java/io/dropwizard/discovery/manage/CuratorAdvertiserManager.java
index f8666c5..7ce0d21 100644
--- a/src/main/java/io/dropwizard/discovery/manage/CuratorAdvertiserManager.java
+++ b/src/main/java/io/dropwizard/discovery/manage/CuratorAdvertiserManager.java
@@ -3,7 +3,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import io.dropwizard.discovery.core.CuratorAdvertiser;
 import io.dropwizard.lifecycle.Managed;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 public class CuratorAdvertiserManager<T> implements Managed {
 
@@ -16,7 +16,7 @@ public class CuratorAdvertiserManager<T> implements Managed {
      *            {@link CuratorAdvertiser}
      */
     public CuratorAdvertiserManager(
-            @Nonnull final CuratorAdvertiser<T> advertiser) {
+            @NonNull final CuratorAdvertiser<T> advertiser) {
         this.advertiser = checkNotNull(advertiser);
     }
 
diff --git a/src/main/java/io/dropwizard/discovery/manage/CuratorManager.java b/src/main/java/io/dropwizard/discovery/manage/CuratorManager.java
index 2617b47..5bb7bd2 100644
--- a/src/main/java/io/dropwizard/discovery/manage/CuratorManager.java
+++ b/src/main/java/io/dropwizard/discovery/manage/CuratorManager.java
@@ -1,7 +1,7 @@
 package io.dropwizard.discovery.manage;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.imps.CuratorFrameworkState;
 import org.apache.zookeeper.data.Stat;
@@ -17,7 +17,7 @@ public class CuratorManager implements Managed {
      * @param framework
      *            {@link CuratorFramework}
      */
-    public CuratorManager(@Nonnull final CuratorFramework framework) {
+    public CuratorManager(@NonNull final CuratorFramework framework) {
         this.framework = checkNotNull(framework);
         // start framework directly to allow other bundles to interact with
         // zookeeper during their run() method.
diff --git a/src/main/java/io/dropwizard/discovery/manage/ServiceDiscoveryManager.java b/src/main/java/io/dropwizard/discovery/manage/ServiceDiscoveryManager.java
index a201f54..e0dca90 100644
--- a/src/main/java/io/dropwizard/discovery/manage/ServiceDiscoveryManager.java
+++ b/src/main/java/io/dropwizard/discovery/manage/ServiceDiscoveryManager.java
@@ -2,7 +2,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import io.dropwizard.lifecycle.Managed;
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.apache.curator.x.discovery.ServiceDiscovery;
 
 public class ServiceDiscoveryManager<T> implements Managed {
@@ -15,7 +15,7 @@ public class ServiceDiscoveryManager<T> implements Managed {
      * @param discovery
      *            {@link ServiceDiscovery}
      */
-    public ServiceDiscoveryManager(@Nonnull final ServiceDiscovery<T> discovery) {
+    public ServiceDiscoveryManager(@NonNull final ServiceDiscovery<T> discovery) {
         this.discovery = checkNotNull(discovery);
     }
 
diff --git a/src/test/java/io/dropwizard/discovery/core/CuratorFactoryTest.java b/src/test/java/io/dropwizard/discovery/core/CuratorFactoryTest.java
index 234b9f0..8af5647 100644
--- a/src/test/java/io/dropwizard/discovery/core/CuratorFactoryTest.java
+++ b/src/test/java/io/dropwizard/discovery/core/CuratorFactoryTest.java
@@ -21,7 +21,7 @@
 import io.dropwizard.discovery.health.CuratorHealthCheck;
 import io.dropwizard.discovery.manage.CuratorManager;
 import io.dropwizard.lifecycle.setup.LifecycleEnvironment;
-import io.dropwizard.setup.Environment;
+import io.dropwizard.core.setup.Environment;
 import io.dropwizard.util.Duration;
 
 public class CuratorFactoryTest {
@@ -119,4 +119,4 @@ void testNamespace() {
         CuratorFramework curatorFramework = factory.build(discoveryFactory);
         assertThat(curatorFramework.getNamespace()).isEqualTo(namespace);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/io/dropwizard/discovery/testutil/TestApplication.java b/src/test/java/io/dropwizard/discovery/testutil/TestApplication.java
index 0c0c750..33e5de7 100644
--- a/src/test/java/io/dropwizard/discovery/testutil/TestApplication.java
+++ b/src/test/java/io/dropwizard/discovery/testutil/TestApplication.java
@@ -2,11 +2,11 @@
 
 import org.apache.curator.test.TestingServer;
 
-import io.dropwizard.Application;
+import io.dropwizard.core.Application;
+import io.dropwizard.core.setup.Bootstrap;
+import io.dropwizard.core.setup.Environment;
 import io.dropwizard.discovery.DiscoveryBundle;
 import io.dropwizard.discovery.DiscoveryFactory;
-import io.dropwizard.setup.Bootstrap;
-import io.dropwizard.setup.Environment;
 
 public class TestApplication extends Application<TestConfiguration> {
     private TestingServer testingServer;
@@ -44,4 +44,4 @@ public void run(TestConfiguration configuration, Environment environment) throws
         // use the configuration to pass this application's testing server to the test
         configuration.setTestingServer(testingServer);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/io/dropwizard/discovery/testutil/TestConfiguration.java b/src/test/java/io/dropwizard/discovery/testutil/TestConfiguration.java
index cb721d2..f9b86e6 100644
--- a/src/test/java/io/dropwizard/discovery/testutil/TestConfiguration.java
+++ b/src/test/java/io/dropwizard/discovery/testutil/TestConfiguration.java
@@ -5,7 +5,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import io.dropwizard.Configuration;
+import io.dropwizard.core.Configuration;
 
 public class TestConfiguration extends Configuration {
     @NotBlank
@@ -36,4 +36,4 @@ public TestingServer getTestingServer() {
     public void setTestingServer(TestingServer testingServer) {
         this.testingServer = testingServer;
     }
-}
\ No newline at end of file
+}