Skip to content

Commit

Permalink
Merge pull request #109 from lightstep/opentelemetry-1.1.0
Browse files Browse the repository at this point in the history
update opentelemetry to 1.1.0
  • Loading branch information
Sergei Malafeev authored Apr 15, 2021
2 parents 4e8a9fc + 80c1320 commit 99fadd5
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<a name="Pending Release"></a>
## [Pending Release](https://github.com/lightstep/otel-launcher-java/compare/1.0.4...master)
* Use OpenTelemetry Java API version 1.1.0
* Use OpenTelemetry Java Instrumentation version 1.1.0

<a name="1.0.4"></a>
## [1.0.4](https://github.com/lightstep/otel-launcher-java/compare/1.0.1...1.0.4)
Expand Down
2 changes: 1 addition & 1 deletion agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<Agent-Class>com.lightstep.opentelemetry.agent.LightstepBootstrap</Agent-Class>
<Premain-Class>com.lightstep.opentelemetry.agent.LightstepBootstrap
</Premain-Class>
<Implementation-Version>1.0.1</Implementation-Version>
<Implementation-Version>1.1.0</Implementation-Version>
<Can-Redefine-Classes>true</Can-Redefine-Classes>
<Can-Retransform-Classes>true</Can-Retransform-Classes>
</manifestEntries>
Expand Down
4 changes: 2 additions & 2 deletions examples/agent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ make run
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-extension-annotations</artifactId>
<version>1.0.1</version>
<version>1.1.0</version>
</dependency>

<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.0.1</version>
<version>1.1.0</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions examples/agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-extension-annotations</artifactId>
<version>1.0.1</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.0.1</version>
<version>1.1.0</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions launcher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>1.35.0</version>
<version>1.36.1</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>2.0.36.Final</version>
<version>2.0.38.Final</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<opentelemetry.version>1.0.1</opentelemetry.version>
<opentelemetry.instrumentation.version>1.0.1</opentelemetry.instrumentation.version>
<opentelemetry.version>1.1.0</opentelemetry.version>
<opentelemetry.instrumentation.version>1.1.0</opentelemetry.instrumentation.version>
<powermock.version>2.0.7</powermock.version>
<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
Expand Down

0 comments on commit 99fadd5

Please sign in to comment.