diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 66bfb1c18..406ac2077 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -5,7 +5,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/docs/src/main/asciidoc/ghpages.sh b/docs/src/main/asciidoc/ghpages.sh
index 4ff53f18e..ded935365 100755
--- a/docs/src/main/asciidoc/ghpages.sh
+++ b/docs/src/main/asciidoc/ghpages.sh
@@ -40,7 +40,7 @@ function check_if_anything_to_sync() {
 
 function retrieve_current_branch() {
     # Code getting the name of the current branch. For master we want to publish as we did until now
-    # http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
+    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
     # If there is a branch already passed will reuse it - otherwise will try to find it
     CURRENT_BRANCH=${BRANCH}
     if [[ -z "${CURRENT_BRANCH}" ]] ; then
@@ -147,7 +147,7 @@ function copy_docs_for_current_version() {
         COMMIT_CHANGES="yes"
     else
         echo -e "Current branch is [${CURRENT_BRANCH}]"
-        # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
+        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
         if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
             mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
             echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
diff --git a/mvnw b/mvnw
index 25f750cb4..a08b219e3 100755
--- a/mvnw
+++ b/mvnw
@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#    https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
diff --git a/mvnw.cmd b/mvnw.cmd
index b0dc0e7e9..7ecd01d80 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -7,7 +7,7 @@
 @REM "License"); you may not use this file except in compliance
 @REM with the License.  You may obtain a copy of the License at
 @REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    https://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing,
 @REM software distributed under the License is distributed on an
diff --git a/pom.xml b/pom.xml
index 016a51174..9f80d2eda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,6 +244,12 @@
 				<version>3.8.0</version>
 				<scope>test</scope>
 			</dependency>
+			<dependency>
+				<groupId>net.jcip</groupId>
+				<artifactId>jcip-annotations</artifactId>
+				<version>1.0</version>
+				<scope>test</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml
index 4df8d6814..deb9b763c 100644
--- a/spring-cloud-sleuth-core/pom.xml
+++ b/spring-cloud-sleuth-core/pom.xml
@@ -340,6 +340,11 @@
 			<version>20.0</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>net.jcip</groupId>
+			<artifactId>jcip-annotations</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<profiles>
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java
index b3faf4ee5..9a385aa81 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import brave.Span;
 import brave.Tracing;
 import brave.sampler.Sampler;
+import net.jcip.annotations.NotThreadSafe;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Before;
@@ -47,6 +48,7 @@ import static org.awaitility.Awaitility.await;
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { ScheduledTestConfiguration.class })
 @DirtiesContext
+@NotThreadSafe
 public class TracingOnScheduledTests {
 
 	@Autowired
diff --git a/spring-cloud-sleuth-core/src/test/resources/beans/applicationContext.xml b/spring-cloud-sleuth-core/src/test/resources/beans/applicationContext.xml
index e5400eddd..30df663a8 100644
--- a/spring-cloud-sleuth-core/src/test/resources/beans/applicationContext.xml
+++ b/spring-cloud-sleuth-core/src/test/resources/beans/applicationContext.xml
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2013-2018 the original author or authors.
-  ~  
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~  
-  ~      https://www.apache.org/licenses/LICENSE-2.0
-  ~  
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:task="http://www.springframework.org/schema/task"
-	   xmlns:int="http://www.springframework.org/schema/integration"
-	   xmlns="http://www.springframework.org/schema/beans"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
-	    https://www.springframework.org/schema/beans/spring-beans.xsd
-	    http://www.springframework.org/schema/integration
-		http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd">
-
-	<int:channel id="messagingChannel"/>
-
-	<int:channel id="splitterOutChannel">
-		<int:queue capacity="10"/>
-	</int:channel>
-
-	<int:channel id="messagingProcessedChannel">
-		<int:queue capacity="10"/>
-	</int:channel>
-
-	<int:channel id="messagingOutputChannel">
-		<int:queue capacity="10"/>
-	</int:channel>
-
-	<int:service-activator input-channel="splitterOutChannel"
-						   method="invokeProcessor"
-						   output-channel="messagingProcessedChannel"
-						   ref="helloWorldImpl">
-		<int:poller max-messages-per-poll="1" fixed-rate="1"
-					task-executor="requestExecutor"/>
-	</int:service-activator>
-
-	<int:aggregator input-channel="messagingProcessedChannel"
-					output-channel="messagingOutputChannel"
-					message-store="messageStore"
-					send-partial-result-on-expiry="true">
-		<int:poller max-messages-per-poll="1" fixed-rate="1"
-					task-executor="requestExecutor"/>
-	</int:aggregator>
-
-	<!-- Define a store for our search results and set up a reaper that will 
-		periodically expire those results. -->
-	<bean id="messageStore"
-		  class="org.springframework.integration.store.SimpleMessageStore"/>
-
-	<bean id="messageStoreReaper"
-		  class="org.springframework.integration.store.MessageGroupStoreReaper">
-		<property name="messageGroupStore" ref="messageStore"/>
-		<property name="timeout" value="2000"/>
-	</bean>
-
-	<int:gateway id="messagingGateway"
-				 service-interface="org.springframework.cloud.sleuth.instrument.messaging.issues.issue_943.MessagingGateway"
-				 default-request-channel="messagingChannel" default-reply-timeout="10000"
-				 default-reply-channel="splitterOutChannel"/>
-
-	<task:executor id="requestExecutor" pool-size="10"/>
-
-	<int:splitter ref="helloWorldImpl" method="splitMessage"
-				  input-channel="messagingChannel" output-channel="splitterOutChannel"/>
-
-	<bean id="helloWorldImpl"
-		  class="org.springframework.cloud.sleuth.instrument.messaging.issues.issue_943.HelloWorldImpl"/>
-</beans>
-		
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2013-2018 the original author or authors.
+  ~  
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~  
+  ~      https://www.apache.org/licenses/LICENSE-2.0
+  ~  
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:task="http://www.springframework.org/schema/task"
+	   xmlns:int="http://www.springframework.org/schema/integration"
+	   xmlns="http://www.springframework.org/schema/beans"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+	    https://www.springframework.org/schema/beans/spring-beans.xsd
+	    http://www.springframework.org/schema/integration
+		http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/task https://www.springframework.org/schema/task/spring-task.xsd">
+
+	<int:channel id="messagingChannel"/>
+
+	<int:channel id="splitterOutChannel">
+		<int:queue capacity="10"/>
+	</int:channel>
+
+	<int:channel id="messagingProcessedChannel">
+		<int:queue capacity="10"/>
+	</int:channel>
+
+	<int:channel id="messagingOutputChannel">
+		<int:queue capacity="10"/>
+	</int:channel>
+
+	<int:service-activator input-channel="splitterOutChannel"
+						   method="invokeProcessor"
+						   output-channel="messagingProcessedChannel"
+						   ref="helloWorldImpl">
+		<int:poller max-messages-per-poll="1" fixed-rate="1"
+					task-executor="requestExecutor"/>
+	</int:service-activator>
+
+	<int:aggregator input-channel="messagingProcessedChannel"
+					output-channel="messagingOutputChannel"
+					message-store="messageStore"
+					send-partial-result-on-expiry="true">
+		<int:poller max-messages-per-poll="1" fixed-rate="1"
+					task-executor="requestExecutor"/>
+	</int:aggregator>
+
+	<!-- Define a store for our search results and set up a reaper that will 
+		periodically expire those results. -->
+	<bean id="messageStore"
+		  class="org.springframework.integration.store.SimpleMessageStore"/>
+
+	<bean id="messageStoreReaper"
+		  class="org.springframework.integration.store.MessageGroupStoreReaper">
+		<property name="messageGroupStore" ref="messageStore"/>
+		<property name="timeout" value="2000"/>
+	</bean>
+
+	<int:gateway id="messagingGateway"
+				 service-interface="org.springframework.cloud.sleuth.instrument.messaging.issues.issue_943.MessagingGateway"
+				 default-request-channel="messagingChannel" default-reply-timeout="10000"
+				 default-reply-channel="splitterOutChannel"/>
+
+	<task:executor id="requestExecutor" pool-size="10"/>
+
+	<int:splitter ref="helloWorldImpl" method="splitMessage"
+				  input-channel="messagingChannel" output-channel="splitterOutChannel"/>
+
+	<bean id="helloWorldImpl"
+		  class="org.springframework.cloud.sleuth.instrument.messaging.issues.issue_943.HelloWorldImpl"/>
+</beans>
+