From 4d9714a0cba0cabe6b195ad8a70418e59eb30634 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 19 Oct 2018 17:24:22 +0100
Subject: [PATCH] Start building against Micrometer snapshots for 1.1.0

See gh-14890
---
 .../export/appoptics/AppOpticsPropertiesConfigAdapter.java | 7 +++++--
 .../appoptics/AppOpticsPropertiesConfigAdapterTests.java   | 2 +-
 spring-boot-project/spring-boot-dependencies/pom.xml       | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapter.java
index 283ebd1cc5..46a638407d 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapter.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapter.java
@@ -33,14 +33,17 @@ class AppOpticsPropertiesConfigAdapter
 		super(properties);
 	}
 
+	@Override
 	public String uri() {
 		return get(AppOpticsProperties::getUri, AppOpticsConfig.super::uri);
 	}
 
-	public String token() {
-		return get(AppOpticsProperties::getApiToken, AppOpticsConfig.super::token);
+	@Override
+	public String apiToken() {
+		return get(AppOpticsProperties::getApiToken, AppOpticsConfig.super::apiToken);
 	}
 
+	@Override
 	public String hostTag() {
 		return get(AppOpticsProperties::getHostTag, AppOpticsConfig.super::hostTag);
 	}
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java
index 39149acf8e..225a434840 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/appoptics/AppOpticsPropertiesConfigAdapterTests.java
@@ -53,7 +53,7 @@ public class AppOpticsPropertiesConfigAdapterTests extends
 	public void whenPropertiesApiTokenIsSetAdapterApiTokenReturnsIt() {
 		AppOpticsProperties properties = createProperties();
 		properties.setApiToken("ABC123");
-		assertThat(createConfigAdapter(properties).token()).isEqualTo("ABC123");
+		assertThat(createConfigAdapter(properties).apiToken()).isEqualTo("ABC123");
 	}
 
 	@Test
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 40b73dd796..ce677bb6c2 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -130,7 +130,7 @@
 		<logback.version>1.2.3</logback.version>
 		<lombok.version>1.18.2</lombok.version>
 		<mariadb.version>2.3.0</mariadb.version>
-		<micrometer.version>1.1.0-rc.1</micrometer.version>
+		<micrometer.version>1.1.0-SNAPSHOT</micrometer.version>
 		<mockito.version>2.23.0</mockito.version>
 		<mongo-driver-reactivestreams.version>1.9.2</mongo-driver-reactivestreams.version>
 		<mongodb.version>3.8.2</mongodb.version>