diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/AuditEvent.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/AuditEvent.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/AuditEventRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventRepository.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/AuditEventRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventRepository.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/listener/AuditApplicationEvent.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditApplicationEvent.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/listener/AuditApplicationEvent.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditApplicationEvent.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/listener/AuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/listener/AuditListener.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ErrorMvcAutoConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ErrorMvcAutoConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/AbstractEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractEndpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/AbstractEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractEndpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/ActionEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ActionEndpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/ActionEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ActionEndpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DumpEndpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DumpEndpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/Endpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Endpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/Endpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Endpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InfoEndpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InfoEndpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/PublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/PublicMetrics.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/PublicMetrics.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/PublicMetrics.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/VanillaPublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetrics.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/VanillaPublicMetrics.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetrics.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapter.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapter.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapter.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMapping.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMapping.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/health/HealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicator.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/health/HealthIndicator.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicator.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/health/VanillaHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/VanillaHealthIndicator.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/health/VanillaHealthIndicator.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/VanillaHealthIndicator.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/CounterService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/CounterService.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/CounterService.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/CounterService.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/DefaultCounterService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultCounterService.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/DefaultCounterService.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultCounterService.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/DefaultGaugeService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultGaugeService.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/DefaultGaugeService.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultGaugeService.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/GaugeService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/GaugeService.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/GaugeService.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/GaugeService.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/InMemoryMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepository.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/InMemoryMetricRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepository.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/Measurement.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Measurement.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/Measurement.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Measurement.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/Metric.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/Metric.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/MetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricRepository.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/MetricRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricRepository.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/ManagementServerProperties.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/ManagementServerProperties.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/SecurityProperties.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/SecurityProperties.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/security/AuthenticationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/security/AuthenticationAuditListener.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/security/AuthorizationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/security/AuthorizationAuditListener.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/InMemoryTraceRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/InMemoryTraceRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/Trace.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/Trace.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/Trace.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/Trace.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/TraceRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceRepository.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/TraceRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceRepository.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/WebRequestTraceFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/WebRequestTraceFilter.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/ops/web/ErrorController.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/ErrorController.java similarity index 100% rename from spring-boot-actuator/src/main/java/org/springframework/boot/ops/web/ErrorController.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/ErrorController.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/AuditEventTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/AuditEventTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepositoryTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/listener/AuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/listener/AuditListenerTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/BeansEndpointTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/BeansEndpointTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/InfoEndpointTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/InfoEndpointTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/VanillaPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetricsTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/VanillaPublicMetricsTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetricsTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapterTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMappingTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMappingTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMappingTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/fixme/ErrorConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/fixme/ErrorConfigurationTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/fixme/ErrorConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/fixme/ErrorConfigurationTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/health/VanillaHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/health/VanillaHealthIndicatorTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/DefaultCounterServiceTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultCounterServiceTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/DefaultCounterServiceTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultCounterServiceTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/DefaultGaugeServiceTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultGaugeServiceTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/DefaultGaugeServiceTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultGaugeServiceTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/InMemoryMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepositoryTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/InMemoryMetricRepositoryTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepositoryTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/properties/SecurityPropertiesTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/properties/SecurityPropertiesTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/security/AuthenticationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/security/AuthenticationAuditListenerTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/security/AuthorizationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/security/AuthorizationAuditListenerTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/trace/InMemoryTraceRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/trace/InMemoryTraceRepositoryTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/ops/trace/WebRequestTraceFilterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java similarity index 100% rename from spring-boot-actuator/src/test/java/org/springframework/boot/ops/trace/WebRequestTraceFilterTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java index db7b8a30af0..ebc29f81f5f 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/RegistrationBean.java @@ -104,10 +104,12 @@ public abstract class RegistrationBean implements ServletContextInitializer { * Configure registration base settings. */ protected void configure(Registration.Dynamic registration) { + Assert.state(registration != null, + "Registration is null. Was something already registered for name=[" + + this.name + "]?"); registration.setAsyncSupported(this.asyncSupported); if (this.initParameters.size() > 0) { registration.setInitParameters(this.initParameters); } } - }