Skip to content

Commit 34ec498

Browse files
authored
HPCC4J Fix pom mismerge MASTER (hpcc-systems#718)
Signed-off-by: Rodrigo Pastrana <[email protected]>
1 parent 3603b8e commit 34ec498

File tree

1 file changed

+39
-1
lines changed

1 file changed

+39
-1
lines changed

pom.xml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
<groups>org.hpccsystems.commons.annotations.BaseTests</groups>
6464
<codehaus.template.version>1.0.0</codehaus.template.version>
6565
<project.benchmarking>false</project.benchmarking>
66+
<opentelemetry.bom.version>1.38.0</opentelemetry.bom.version>
67+
<opentelemetry.semconv.version>1.25.0-alpha</opentelemetry.semconv.version>
6668
</properties>
6769

6870
<scm>
@@ -98,8 +100,44 @@
98100
</snapshots>
99101
</repository>
100102
</repositories>
101-
103+
<dependencyManagement>
104+
<dependencies>
105+
<dependency>
106+
<groupId>io.opentelemetry</groupId>
107+
<artifactId>opentelemetry-bom</artifactId>
108+
<version>${opentelemetry.bom.version}</version>
109+
<type>pom</type>
110+
<scope>import</scope>
111+
</dependency>
112+
</dependencies>
113+
</dependencyManagement>
102114
<dependencies>
115+
<dependency>
116+
<groupId>io.opentelemetry</groupId>
117+
<artifactId>opentelemetry-api</artifactId>
118+
</dependency>
119+
<dependency>
120+
<groupId>io.opentelemetry</groupId>
121+
<artifactId>opentelemetry-sdk</artifactId>
122+
</dependency>
123+
<dependency>
124+
<groupId>io.opentelemetry</groupId>
125+
<artifactId>opentelemetry-exporter-logging</artifactId>
126+
</dependency>
127+
<dependency>
128+
<groupId>io.opentelemetry</groupId>
129+
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
130+
</dependency>
131+
<dependency>
132+
<groupId>io.opentelemetry</groupId>
133+
<artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
134+
</dependency>
135+
<dependency>
136+
<!-- Not managed by opentelemetry-bom -->
137+
<groupId>io.opentelemetry.semconv</groupId>
138+
<artifactId>opentelemetry-semconv</artifactId>
139+
<version>${opentelemetry.semconv.version}</version>
140+
</dependency>
103141
<dependency>
104142
<groupId>junit</groupId>
105143
<artifactId>junit</artifactId>

0 commit comments

Comments
 (0)