From 8983309b487675889fadf4d4591f0df250f97db0 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 22 Dec 2015 17:51:25 -0700 Subject: [PATCH] Fix bonehead mistake. That'll show me for trying to code right before the holidays. Not only was the auto-config in the WRONG package, I forgot to enable it in autoconfiguration! fixes gh-bonehead --- .../cloud/{ => util}/UtilAutoConfiguration.java | 4 +--- .../src/main/resources/META-INF/spring.factories | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) rename spring-cloud-commons/src/main/java/org/springframework/cloud/{ => util}/UtilAutoConfiguration.java (86%) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/UtilAutoConfiguration.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/util/UtilAutoConfiguration.java similarity index 86% rename from spring-cloud-commons/src/main/java/org/springframework/cloud/UtilAutoConfiguration.java rename to spring-cloud-commons/src/main/java/org/springframework/cloud/util/UtilAutoConfiguration.java index c38d3a5f..f61acbf8 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/UtilAutoConfiguration.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/util/UtilAutoConfiguration.java @@ -1,11 +1,9 @@ -package org.springframework.cloud; +package org.springframework.cloud.util; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.util.InetUtils; -import org.springframework.cloud.util.InetUtilsProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-commons/src/main/resources/META-INF/spring.factories b/spring-cloud-commons/src/main/resources/META-INF/spring.factories index 5499768a..df47a829 100644 --- a/spring-cloud-commons/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-commons/src/main/resources/META-INF/spring.factories @@ -2,7 +2,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.springframework.cloud.client.CommonsClientAutoConfiguration,\ org.springframework.cloud.client.discovery.noop.NoopDiscoveryClientAutoConfiguration,\ -org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration +org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration,\ +org.springframework.cloud.util.UtilAutoConfiguration # Environment Post Processors