feat: update micrometer to 1.13.0, update copyright year

ExpediaGroup · May 21, 2024 · 6190aa9 · 6190aa9
1 parent 31f8963
commit 6190aa9
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/components/api/src/test/java/com/hotels/styx/api/extension/service/spi/MockContext.java b/components/api/src/test/java/com/hotels/styx/api/extension/service/spi/MockContext.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2021 Expedia Inc.
+  Copyright (C) 2013-2024 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/components/proxy/src/main/java/com/hotels/styx/StyxServer.java b/components/proxy/src/main/java/com/hotels/styx/StyxServer.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2023 Expedia Inc.
+  Copyright (C) 2013-2024 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -36,8 +36,8 @@
 import com.hotels.styx.server.netty.ServerConnector;
 import com.hotels.styx.startup.StyxServerComponents;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.netty.util.ResourceLeakDetector;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;

diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/AdminServerBuilder.java b/components/proxy/src/main/java/com/hotels/styx/admin/AdminServerBuilder.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2023 Expedia Inc.
+  Copyright (C) 2013-2024 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -65,7 +65,7 @@
 import com.hotels.styx.server.netty.WebServerConnectorFactory;
 import com.hotels.styx.server.track.CurrentRequestTracker;
 import com.hotels.styx.startup.StyxServerComponents;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import org.slf4j.Logger;
 
 import java.time.Duration;

diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PrometheusHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PrometheusHandler.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2023 Expedia Inc.
+  Copyright (C) 2013-2024 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
 import com.hotels.styx.api.WebServiceHandler;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import org.slf4j.Logger;
 
 import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;

diff --git a/demo/src/test/kotlin/com/hotels/styx/demo/DemoOriginTest.kt b/demo/src/test/kotlin/com/hotels/styx/demo/DemoOriginTest.kt
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2013-2023 Expedia Inc.
+  Copyright (C) 2013-2024 Expedia Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/distribution/conf/env-development/styx-env.sh b/distribution/conf/env-development/styx-env.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2013-2021 Expedia Inc.
+# Copyright (C) 2013-2024 Expedia Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/distribution/conf/env-perf-local/styx-env.sh b/distribution/conf/env-perf-local/styx-env.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2013-2021 Expedia Inc.
+# Copyright (C) 2013-2024 Expedia Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/distribution/conf/styx-env.sh b/distribution/conf/styx-env.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2013-2021 Expedia Inc.
+# Copyright (C) 2013-2024 Expedia Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/docker/styx-image/styx-env.sh b/docker/styx-image/styx-env.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (C) 2013-2021 Expedia Inc.
+# Copyright (C) 2013-2024 Expedia Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/pom.xml b/pom.xml
@@ -108,7 +108,7 @@
     <hdrhistogram.version>2.1.12</hdrhistogram.version>
     <jackson.version>2.15.4</jackson.version>
     <janino.version>3.1.12</janino.version>
-    <micrometer.version>1.12.3</micrometer.version>
+    <micrometer.version>1.13.0</micrometer.version>
     <netty.version>4.1.107.Final</netty.version>
     <okhttp.version>4.12.0</okhttp.version>
     <pcollections.version>3.0.5</pcollections.version>