Remove actuate from restructured metrics package names

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/AbstractJettyMetricsBinder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics;
+package org.springframework.boot.jetty.metrics;
 
 import org.eclipse.jetty.server.Server;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettyConnectionMetricsBinder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics;
+package org.springframework.boot.jetty.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettyServerThreadPoolMetricsBinder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics;
+package org.springframework.boot.jetty.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/JettySslHandshakeMetricsBinder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics;
+package org.springframework.boot.jetty.metrics;
 
 import java.util.Collections;
 

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/autoconfigure/JettyMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics.autoconfigure;
+package org.springframework.boot.jetty.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.jetty.JettyConnectionMetrics;
@@ -29,9 +29,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProp
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.jetty.actuate.metrics.JettyConnectionMetricsBinder;
-import org.springframework.boot.jetty.actuate.metrics.JettyServerThreadPoolMetricsBinder;
-import org.springframework.boot.jetty.actuate.metrics.JettySslHandshakeMetricsBinder;
+import org.springframework.boot.jetty.metrics.JettyConnectionMetricsBinder;
+import org.springframework.boot.jetty.metrics.JettyServerThreadPoolMetricsBinder;
+import org.springframework.boot.jetty.metrics.JettySslHandshakeMetricsBinder;
 import org.springframework.context.annotation.Bean;
 
 /**

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/autoconfigure/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Jetty actuator metrics.
  */
-package org.springframework.boot.jetty.actuate.metrics.autoconfigure;
+package org.springframework.boot.jetty.metrics.autoconfigure;

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/metrics/package-info.java

@@ -17,4 +17,4 @@
 /**
  * Actuator support for Jetty metrics.
  */
-package org.springframework.boot.jetty.actuate.metrics;
+package org.springframework.boot.jetty.metrics;

spring-boot-project/spring-boot-jetty/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,5 @@
 org.springframework.boot.jetty.actuate.autoconfigure.web.server.JettyReactiveManagementContextAutoConfiguration
 org.springframework.boot.jetty.actuate.autoconfigure.web.server.JettyServletManagementContextAutoConfiguration
-org.springframework.boot.jetty.actuate.metrics.autoconfigure.JettyMetricsAutoConfiguration
 org.springframework.boot.jetty.autoconfigure.reactive.JettyReactiveWebServerAutoConfiguration
-org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration
+org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration
+org.springframework.boot.jetty.metrics.autoconfigure.JettyMetricsAutoConfiguration

spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/metrics/autoconfigure/JettyMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.jetty.actuate.metrics.autoconfigure;
+package org.springframework.boot.jetty.metrics.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Tags;
@@ -25,11 +25,11 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.boot.jetty.actuate.metrics.JettyConnectionMetricsBinder;
-import org.springframework.boot.jetty.actuate.metrics.JettyServerThreadPoolMetricsBinder;
-import org.springframework.boot.jetty.actuate.metrics.JettySslHandshakeMetricsBinder;
 import org.springframework.boot.jetty.autoconfigure.reactive.JettyReactiveWebServerAutoConfiguration;
 import org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration;
+import org.springframework.boot.jetty.metrics.JettyConnectionMetricsBinder;
+import org.springframework.boot.jetty.metrics.JettyServerThreadPoolMetricsBinder;
+import org.springframework.boot.jetty.metrics.JettySslHandshakeMetricsBinder;
 import org.springframework.boot.jetty.reactive.JettyReactiveWebServerFactory;
 import org.springframework.boot.jetty.servlet.JettyServletWebServerFactory;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;