dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove conflict 

Signed-off-by: siri-varma <siri.varma@outlook.com>
This commit is contained in:
siri-varma 2025-08-12 12:03:17 -07:00
parent 05e56ec5ad
commit 7f3c1168c3
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/pom.xml
View File

@ -22,12 +22,8 @@
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target> <maven.compiler.target>${java.version}</maven.compiler.target>
<spotbugs.fail>false</spotbugs.fail> <spotbugs.fail>false</spotbugs.fail>
<<<<<<< HEAD
<opentelemetry.version>0.14.0</opentelemetry.version>
=======
<opentelemetry.version>1.41.0</opentelemetry.version> <opentelemetry.version>1.41.0</opentelemetry.version>
<zipkin.version>3.4.0</zipkin.version> <zipkin.version>3.4.0</zipkin.version>
>>>>>>> 3a8fd611 (Ensure OTEL version from examples aligns with SDK and ITs (#1403))
</properties> </properties>
<dependencies> <dependencies>
@ -88,8 +84,6 @@
<version>${opentelemetry.version}</version> <version>${opentelemetry.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<<<<<<< HEAD
=======
<groupId>io.opentelemetry</groupId> <groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-zipkin</artifactId> <artifactId>opentelemetry-exporter-zipkin</artifactId>
<version>${opentelemetry.version}</version> <version>${opentelemetry.version}</version>
@ -105,7 +99,6 @@
<version>${zipkin.version}</version> <version>${zipkin.version}</version>
</dependency> </dependency>
<dependency> <dependency>
>>>>>>> 3a8fd611 (Ensure OTEL version from examples aligns with SDK and ITs (#1403))
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId> <artifactId>junit-jupiter</artifactId>
<scope>test</scope> <scope>test</scope>