refactor(auto-configuration): replace spring.factories with AutoConfi…

…guration.imports file to enable auto-configuration during upgrade to spring boot 2.7.x (#1039) In spring boot 2.7.x, major change has been introduced for auto-configuration registration. The registration has been moved from spring.factories under the org.springframework.boot.autoconfigure.EnableAutoConfiguration key to a new file named META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.7-Release-Notes#changes-to-auto-configuration So, replacing the registration of auto-configuration classes from spring.factories to META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports. Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
spinnaker · Jun 13, 2024 · bf94a08 · bf94a08
1 parent 0013ba4
commit bf94a08
Show file tree

Hide file tree

Showing 41 changed files with 21 additions and 42 deletions.
diff --git a/kayenta-atlas/src/main/resources/META-INF/spring.factories b/kayenta-atlas/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.atlas.config.AtlasConfiguration
diff --git a/kayenta-aws/src/main/resources/META-INF/spring.factories b/kayenta-aws/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.aws.config.AwsConfiguration
diff --git a/kayenta-azure/src/main/resources/META-INF/spring.factories b/kayenta-azure/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.azure.config.AzureConfiguration
diff --git a/kayenta-blobs/src/main/resources/META-INF/spring.factories b/kayenta-blobs/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.blobs.config.BlobsConfiguration
diff --git a/kayenta-datadog/src/main/resources/META-INF/spring.factories b/kayenta-datadog/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.datadog.config.DatadogConfiguration
diff --git a/kayenta-gcs/src/main/resources/META-INF/spring.factories b/kayenta-gcs/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.gcs.config.GcsConfiguration
diff --git a/kayenta-google/src/main/resources/META-INF/spring.factories b/kayenta-google/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.google.config.GoogleConfiguration
diff --git a/kayenta-graphite/src/main/resources/META-INF/spring.factories b/kayenta-graphite/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.graphite.config.GraphiteConfiguration
diff --git a/kayenta-influxdb/src/main/resources/META-INF/spring.factories b/kayenta-influxdb/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.influxdb.config.InfluxDbConfiguration
diff --git a/kayenta-judge/src/main/resources/META-INF/spring.factories b/kayenta-judge/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+com.netflix.kayenta.judge.config.NetflixJudgeConfiguration
+com.netflix.kayenta.judge.config.RemoteJudgeConfiguration
diff --git a/kayenta-newrelic-insights/src/main/resources/META-INF/spring.factories b/kayenta-newrelic-insights/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.newrelic.config.NewRelicConfiguration
diff --git a/kayenta-objectstore-configbin/src/main/resources/META-INF/spring.factories b/kayenta-objectstore-configbin/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.configbin.config.ConfigBinConfiguration
diff --git a/kayenta-objectstore-memory/src/main/resources/META-INF/spring.factories b/kayenta-objectstore-memory/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.memory.config.MemoryConfiguration
diff --git a/kayenta-orca/src/main/resources/META-INF/spring.factories b/kayenta-orca/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.config.OrcaConfiguration
diff --git a/kayenta-prometheus/src/main/resources/META-INF/spring.factories b/kayenta-prometheus/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.prometheus.config.PrometheusConfiguration
diff --git a/kayenta-s3/src/main/resources/META-INF/spring.factories b/kayenta-s3/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.s3.config.S3Configuration
diff --git a/kayenta-signalfx/src/main/resources/META-INF/spring.factories b/kayenta-signalfx/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.signalfx.config.SignalFxConfiguration
diff --git a/kayenta-sql/src/main/resources/META-INF/spring.factories b/kayenta-sql/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.sql.config.SqlConfiguration
diff --git a/kayenta-stackdriver/src/main/resources/META-INF/spring.factories b/kayenta-stackdriver/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.stackdriver.config.StackdriverConfiguration
diff --git a/.../main/resources/META-INF/spring.factories → ...t.autoconfigure.AutoConfiguration.imports b/.../main/resources/META-INF/spring.factories → ...t.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
 com.netflix.kayenta.standalonecanaryanalysis.config.StandaloneCanaryAnalysisModuleConfiguration
diff --git a/kayenta-wavefront/src/main/resources/META-INF/spring.factories b/kayenta-wavefront/src/main/resources/META-INF/spring.factories
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.netflix.kayenta.wavefront.config.WavefrontConfiguration