From 0980856b78c5668fdd212522e5988dc8925074dc Mon Sep 17 00:00:00 2001 From: j-sandy <30489233+j-sandy@users.noreply.github.com> Date: Fri, 31 May 2024 19:31:53 +0530 Subject: [PATCH] refactor(auto-configuration): replace spring.factories with AutoConfiguration.imports file to enable auto-configuration during upgrade to spring boot 2.7.x 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. --- kayenta-atlas/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-aws/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-azure/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-blobs/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-datadog/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-gcs/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-google/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-graphite/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-influxdb/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-judge/src/main/resources/META-INF/spring.factories | 3 --- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 2 ++ .../src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-orca/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-s3/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-signalfx/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + kayenta-sql/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + .../src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + ...ringframework.boot.autoconfigure.AutoConfiguration.imports} | 1 - kayenta-wavefront/src/main/resources/META-INF/spring.factories | 2 -- ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 1 + 41 files changed, 21 insertions(+), 42 deletions(-) delete mode 100644 kayenta-atlas/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-atlas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-aws/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-aws/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-azure/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-azure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-blobs/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-blobs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-datadog/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-datadog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-gcs/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-gcs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-google/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-google/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-graphite/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-graphite/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-influxdb/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-influxdb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-judge/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-judge/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-newrelic-insights/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-newrelic-insights/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-objectstore-configbin/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-objectstore-configbin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-objectstore-memory/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-objectstore-memory/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-orca/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-orca/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-prometheus/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-prometheus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-s3/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-s3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-signalfx/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-signalfx/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-sql/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-sql/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 kayenta-stackdriver/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-stackdriver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename kayenta-standalone-canary-analysis/src/main/resources/META-INF/{spring.factories => spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (59%) delete mode 100644 kayenta-wavefront/src/main/resources/META-INF/spring.factories create mode 100644 kayenta-wavefront/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/kayenta-atlas/src/main/resources/META-INF/spring.factories b/kayenta-atlas/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 269e24349..000000000 --- a/kayenta-atlas/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.atlas.config.AtlasConfiguration \ No newline at end of file diff --git a/kayenta-atlas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-atlas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..75edcce27 --- /dev/null +++ b/kayenta-atlas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.atlas.config.AtlasConfiguration \ No newline at end of file diff --git a/kayenta-aws/src/main/resources/META-INF/spring.factories b/kayenta-aws/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 2286e7275..000000000 --- a/kayenta-aws/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.aws.config.AwsConfiguration \ No newline at end of file diff --git a/kayenta-aws/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-aws/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..cf3981f62 --- /dev/null +++ b/kayenta-aws/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.aws.config.AwsConfiguration \ No newline at end of file diff --git a/kayenta-azure/src/main/resources/META-INF/spring.factories b/kayenta-azure/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 2f9956b95..000000000 --- a/kayenta-azure/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.azure.config.AzureConfiguration \ No newline at end of file diff --git a/kayenta-azure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-azure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..1ffb20dff --- /dev/null +++ b/kayenta-azure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.azure.config.AzureConfiguration \ No newline at end of file diff --git a/kayenta-blobs/src/main/resources/META-INF/spring.factories b/kayenta-blobs/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 66b943ccb..000000000 --- a/kayenta-blobs/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.blobs.config.BlobsConfiguration \ No newline at end of file diff --git a/kayenta-blobs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-blobs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..579b9880e --- /dev/null +++ b/kayenta-blobs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.blobs.config.BlobsConfiguration \ No newline at end of file diff --git a/kayenta-datadog/src/main/resources/META-INF/spring.factories b/kayenta-datadog/src/main/resources/META-INF/spring.factories deleted file mode 100644 index f82d68896..000000000 --- a/kayenta-datadog/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.datadog.config.DatadogConfiguration \ No newline at end of file diff --git a/kayenta-datadog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-datadog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..2ca4a8c72 --- /dev/null +++ b/kayenta-datadog/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.datadog.config.DatadogConfiguration \ No newline at end of file diff --git a/kayenta-gcs/src/main/resources/META-INF/spring.factories b/kayenta-gcs/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 37563a4ee..000000000 --- a/kayenta-gcs/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.gcs.config.GcsConfiguration \ No newline at end of file diff --git a/kayenta-gcs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-gcs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..9f28ea636 --- /dev/null +++ b/kayenta-gcs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.gcs.config.GcsConfiguration \ No newline at end of file diff --git a/kayenta-google/src/main/resources/META-INF/spring.factories b/kayenta-google/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 55087380a..000000000 --- a/kayenta-google/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.google.config.GoogleConfiguration \ No newline at end of file diff --git a/kayenta-google/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-google/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..84d51401f --- /dev/null +++ b/kayenta-google/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.google.config.GoogleConfiguration \ No newline at end of file diff --git a/kayenta-graphite/src/main/resources/META-INF/spring.factories b/kayenta-graphite/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 00bc957af..000000000 --- a/kayenta-graphite/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.graphite.config.GraphiteConfiguration \ No newline at end of file diff --git a/kayenta-graphite/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-graphite/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..39a314e26 --- /dev/null +++ b/kayenta-graphite/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.graphite.config.GraphiteConfiguration \ No newline at end of file diff --git a/kayenta-influxdb/src/main/resources/META-INF/spring.factories b/kayenta-influxdb/src/main/resources/META-INF/spring.factories deleted file mode 100644 index ce365bbe5..000000000 --- a/kayenta-influxdb/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.influxdb.config.InfluxDbConfiguration \ No newline at end of file diff --git a/kayenta-influxdb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-influxdb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..5db54e978 --- /dev/null +++ b/kayenta-influxdb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.influxdb.config.InfluxDbConfiguration \ No newline at end of file diff --git a/kayenta-judge/src/main/resources/META-INF/spring.factories b/kayenta-judge/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 35182e82e..000000000 --- a/kayenta-judge/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.judge.config.NetflixJudgeConfiguration,\ -com.netflix.kayenta.judge.config.RemoteJudgeConfiguration \ No newline at end of file diff --git a/kayenta-judge/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-judge/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..75c90a9c3 --- /dev/null +++ b/kayenta-judge/src/main/resources/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 \ No newline at end of file diff --git a/kayenta-newrelic-insights/src/main/resources/META-INF/spring.factories b/kayenta-newrelic-insights/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 590a79cf9..000000000 --- a/kayenta-newrelic-insights/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.newrelic.config.NewRelicConfiguration \ No newline at end of file diff --git a/kayenta-newrelic-insights/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-newrelic-insights/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..602b0eeb7 --- /dev/null +++ b/kayenta-newrelic-insights/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.newrelic.config.NewRelicConfiguration \ No newline at end of file diff --git a/kayenta-objectstore-configbin/src/main/resources/META-INF/spring.factories b/kayenta-objectstore-configbin/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 5a61a1290..000000000 --- a/kayenta-objectstore-configbin/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.configbin.config.ConfigBinConfiguration \ No newline at end of file diff --git a/kayenta-objectstore-configbin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-objectstore-configbin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..356b8e8f1 --- /dev/null +++ b/kayenta-objectstore-configbin/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.configbin.config.ConfigBinConfiguration \ No newline at end of file diff --git a/kayenta-objectstore-memory/src/main/resources/META-INF/spring.factories b/kayenta-objectstore-memory/src/main/resources/META-INF/spring.factories deleted file mode 100644 index af2767c7d..000000000 --- a/kayenta-objectstore-memory/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.memory.config.MemoryConfiguration \ No newline at end of file diff --git a/kayenta-objectstore-memory/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-objectstore-memory/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..1dccdb68f --- /dev/null +++ b/kayenta-objectstore-memory/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.memory.config.MemoryConfiguration \ No newline at end of file diff --git a/kayenta-orca/src/main/resources/META-INF/spring.factories b/kayenta-orca/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 2d296002d..000000000 --- a/kayenta-orca/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.config.OrcaConfiguration \ No newline at end of file diff --git a/kayenta-orca/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-orca/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..c5a440301 --- /dev/null +++ b/kayenta-orca/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.config.OrcaConfiguration \ No newline at end of file diff --git a/kayenta-prometheus/src/main/resources/META-INF/spring.factories b/kayenta-prometheus/src/main/resources/META-INF/spring.factories deleted file mode 100644 index ed619f84d..000000000 --- a/kayenta-prometheus/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.prometheus.config.PrometheusConfiguration \ No newline at end of file diff --git a/kayenta-prometheus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-prometheus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..f8a783e66 --- /dev/null +++ b/kayenta-prometheus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.prometheus.config.PrometheusConfiguration \ No newline at end of file diff --git a/kayenta-s3/src/main/resources/META-INF/spring.factories b/kayenta-s3/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 52d87e79a..000000000 --- a/kayenta-s3/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.s3.config.S3Configuration \ No newline at end of file diff --git a/kayenta-s3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-s3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..d3dbbc95d --- /dev/null +++ b/kayenta-s3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.s3.config.S3Configuration \ No newline at end of file diff --git a/kayenta-signalfx/src/main/resources/META-INF/spring.factories b/kayenta-signalfx/src/main/resources/META-INF/spring.factories deleted file mode 100644 index ee97710f3..000000000 --- a/kayenta-signalfx/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.signalfx.config.SignalFxConfiguration \ No newline at end of file diff --git a/kayenta-signalfx/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-signalfx/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..587858814 --- /dev/null +++ b/kayenta-signalfx/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.signalfx.config.SignalFxConfiguration \ No newline at end of file diff --git a/kayenta-sql/src/main/resources/META-INF/spring.factories b/kayenta-sql/src/main/resources/META-INF/spring.factories deleted file mode 100644 index acce2c099..000000000 --- a/kayenta-sql/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.netflix.kayenta.sql.config.SqlConfiguration diff --git a/kayenta-sql/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-sql/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..bc7b2cb6d --- /dev/null +++ b/kayenta-sql/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.sql.config.SqlConfiguration \ No newline at end of file diff --git a/kayenta-stackdriver/src/main/resources/META-INF/spring.factories b/kayenta-stackdriver/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 48c6b4bf8..000000000 --- a/kayenta-stackdriver/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.stackdriver.config.StackdriverConfiguration \ No newline at end of file diff --git a/kayenta-stackdriver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-stackdriver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..74ee36a39 --- /dev/null +++ b/kayenta-stackdriver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.stackdriver.config.StackdriverConfiguration \ No newline at end of file diff --git a/kayenta-standalone-canary-analysis/src/main/resources/META-INF/spring.factories b/kayenta-standalone-canary-analysis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 59% rename from kayenta-standalone-canary-analysis/src/main/resources/META-INF/spring.factories rename to kayenta-standalone-canary-analysis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 790bfb404..fa391b186 100644 --- a/kayenta-standalone-canary-analysis/src/main/resources/META-INF/spring.factories +++ b/kayenta-standalone-canary-analysis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.netflix.kayenta.standalonecanaryanalysis.config.StandaloneCanaryAnalysisModuleConfiguration \ No newline at end of file diff --git a/kayenta-wavefront/src/main/resources/META-INF/spring.factories b/kayenta-wavefront/src/main/resources/META-INF/spring.factories deleted file mode 100644 index b7b91adc5..000000000 --- a/kayenta-wavefront/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.netflix.kayenta.wavefront.config.WavefrontConfiguration \ No newline at end of file diff --git a/kayenta-wavefront/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kayenta-wavefront/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..a4f51bb61 --- /dev/null +++ b/kayenta-wavefront/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.netflix.kayenta.wavefront.config.WavefrontConfiguration \ No newline at end of file