Merge branch 'main' into cleanup-otel-provider

jenkinsci · Jun 18, 2024 · a702d36 · a702d36
2 parents 34102f2 + 61564d5
commit a702d36
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,15 +19,13 @@
     <properties>
         <revision>3</revision>
         <changelist>999999-SNAPSHOT</changelist>
-        <jenkins.version>2.401.3</jenkins.version>
+        <jenkins.version>2.440.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <opentelemetry.version>1.39.0</opentelemetry.version>
-        <opentelemetry-alpha.version>1.39.0-alpha</opentelemetry-alpha.version>
-        <opentelemetry-instrumentation-alpha.version>2.4.0-alpha</opentelemetry-instrumentation-alpha.version>
+        <opentelemetry-instrumentation.version>2.5.0</opentelemetry-instrumentation.version>
         <opentelemetry-contrib.version>1.36.0-alpha</opentelemetry-contrib.version>
-        <opentelemetry-semconv>1.25.0-alpha</opentelemetry-semconv>
         <useBeta>true</useBeta>
-        <elasticstack.version>8.14.0</elasticstack.version>
+        <elasticstack.version>8.14.1</elasticstack.version>
         <error-prone.version>2.28.0</error-prone.version>
     </properties>
     <name>OpenTelemetry Plugin</name>
@@ -41,8 +39,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.401.x</artifactId>
-                <version>2745.vc7b_fe4c876fa_</version>
+                <artifactId>bom-2.440.x</artifactId>
+                <version>3120.v4d898e1e9fc4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -56,7 +54,21 @@
             <dependency>
                 <groupId>io.opentelemetry</groupId>
                 <artifactId>opentelemetry-bom-alpha</artifactId>
-                <version>${opentelemetry-alpha.version}</version>
+                <version>${opentelemetry.version}-alpha</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.opentelemetry.instrumentation</groupId>
+                <artifactId>opentelemetry-instrumentation-bom</artifactId>
+                <version>${opentelemetry-instrumentation.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.opentelemetry.instrumentation</groupId>
+                <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
+                <version>${opentelemetry-instrumentation.version}-alpha</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -81,9 +93,11 @@
     </dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>io.opentelemetry</groupId>
+            <groupId>io.jenkins.plugins</groupId>
             <artifactId>opentelemetry-api</artifactId>
+            <version>1.39.0-8.vfb_39d89a_2812</version>
         </dependency>
+
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-api-incubator</artifactId>
@@ -92,16 +106,6 @@
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.opentelemetry.semconv</groupId>
-            <artifactId>opentelemetry-semconv</artifactId>
-            <version>${opentelemetry-semconv}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry.semconv</groupId>
-            <artifactId>opentelemetry-semconv-incubating</artifactId>
-            <version>${opentelemetry-semconv}</version>
-        </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk-trace</artifactId>
@@ -125,12 +129,10 @@
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-resources</artifactId>
-            <version>${opentelemetry-instrumentation-alpha.version}</version>
         </dependency>
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
-            <version>${opentelemetry-instrumentation-alpha.version}</version>
         </dependency>
         <!--
         Requires JDK17, compiled for JDK17