revert spring upgrade and update OpenTelemetry

inspectIT · Dec 11, 2023 · 6f6e1a3 · 6f6e1a3
1 parent 57cd1a9
commit 6f6e1a3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/gradle/configserverlibs.versions.toml b/gradle/configserverlibs.versions.toml
@@ -2,7 +2,7 @@
 ioJsonwebtoken = "0.12.3"
 orgEclipseJgit = "6.8.0.202311291450-r"
 orgMockito = "4.7.0"
-orgSpringframeworkBoot = { strictly = "3.2.0" }
+orgSpringframeworkBoot = { strictly = "3.1.6" }
 orgSpringframeworkSecurity = "6.1.5"
 
 [libraries]

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,8 @@ ioGithubNetmikeyLogunit = "1.1.3"
 ioGrpc = "1.43.3"
 # Ensure to adapt the netty version when changing the OpenCensus version
 ioOpencensus = "0.31.1"
-ioOpentelemetry = "1.25.0"
+ioOpentelemetry = "1.29.0"
+ioOpentelemetryAlpha = "1.29.0-alpha"
 orgApacheLoggingLog4j = "2.17.2"
 orgEclipseJetty = "9.4.53.v20231009"
 # @pin Starting with version 6.x requires Java 11
@@ -46,19 +47,19 @@ ioOpencensusOpencensusImpl = { module = "io.opencensus:opencensus-impl", version
 ioOpencensusOpencensusTesting = { module = "io.opencensus:opencensus-testing", version.ref = "ioOpencensus" }
 ioOpentelemetryOpentelemetryApi = { module = "io.opentelemetry:opentelemetry-api", version.ref = "ioOpentelemetry" }
 ioOpentelemetryOpentelemetryBom = { module = "io.opentelemetry:opentelemetry-bom", version.ref = "ioOpentelemetry" }
-ioOpentelemetryOpentelemetryBomAlpha = { module = "io.opentelemetry:opentelemetry-bom-alpha", version = { strictly = "1.25.0-alpha" } }
+ioOpentelemetryOpentelemetryBomAlpha = { module = "io.opentelemetry:opentelemetry-bom-alpha", version.ref = "ioOpentelemetryAlpha" }
 ioOpentelemetryOpentelemetryExporterJaeger = { module = "io.opentelemetry:opentelemetry-exporter-jaeger", version.ref = "ioOpentelemetry" }
 ioOpentelemetryOpentelemetryExporterJaegerThrift = { module = "io.opentelemetry:opentelemetry-exporter-jaeger-thrift", version.ref = "ioOpentelemetry" }
 ioOpentelemetryOpentelemetryExporterLogging = { module = "io.opentelemetry:opentelemetry-exporter-logging", version.ref = "ioOpentelemetry" }
 ioOpentelemetryOpentelemetryExporterOtlp = { module = "io.opentelemetry:opentelemetry-exporter-otlp", version.ref = "ioOpentelemetry" }
-ioOpentelemetryOpentelemetryExporterPrometheus = { module = "io.opentelemetry:opentelemetry-exporter-prometheus", version = { strictly = "1.25.0-alpha" } }
+ioOpentelemetryOpentelemetryExporterPrometheus = { module = "io.opentelemetry:opentelemetry-exporter-prometheus", version.ref = "ioOpentelemetryAlpha" }
 ioOpentelemetryOpentelemetryExporterZipkin = { module = "io.opentelemetry:opentelemetry-exporter-zipkin", version.ref = "ioOpentelemetry" }
-ioOpentelemetryOpentelemetryOpencensusShim = { module = "io.opentelemetry:opentelemetry-opencensus-shim", version = { strictly = "1.25.0-alpha" } }
+ioOpentelemetryOpentelemetryOpencensusShim = { module = "io.opentelemetry:opentelemetry-opencensus-shim", version.ref = "ioOpentelemetryAlpha" }
 ioOpentelemetryOpentelemetryProto = { module = "io.opentelemetry:opentelemetry-proto", version = { strictly = "1.7.1-alpha" } }
 ioOpentelemetryOpentelemetrySdk = { module = "io.opentelemetry:opentelemetry-sdk", version.ref = "ioOpentelemetry" }
 ioOpentelemetryOpentelemetrySdkMetrics = { module = "io.opentelemetry:opentelemetry-sdk-metrics", version.ref = "ioOpentelemetry" }
 ioOpentelemetryOpentelemetrySdkTesting = { module = "io.opentelemetry:opentelemetry-sdk-testing", version.ref = "ioOpentelemetry" }
-ioOpentelemetryOpentelemetrySemconv = { module = "io.opentelemetry:opentelemetry-semconv", version = { strictly = "1.25.0-alpha" } }
+ioOpentelemetryOpentelemetrySemconv = { module = "io.opentelemetry:opentelemetry-semconv", version.ref = "ioOpentelemetryAlpha" }
 ioPrometheusSimpleclientHttpserver = "io.prometheus:simpleclient_httpserver:0.15.0"
 javaxAnnotationJavaxAnnotationApi = "javax.annotation:javax.annotation-api:1.3.2"
 log4j = "log4j:log4j:1.2.17"