Skip to content

Commit

Permalink
Merge branch 'master' into micrometerObservations
Browse files Browse the repository at this point in the history
  • Loading branch information
marcingrzejszczak committed Oct 4, 2022
2 parents 61c49ab + 9a60ea6 commit 35129cc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion kotlin/pom.xml
Expand Up @@ -29,7 +29,7 @@

<properties>
<main.basedir>${project.basedir}/..</main.basedir>
<kotlin.version>1.7.10</kotlin.version>
<kotlin.version>1.7.20</kotlin.version>
<kotlinx.coroutines.version>1.6.4</kotlinx.coroutines.version>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Expand Up @@ -80,7 +80,7 @@
<guava.version>31.1-jre</guava.version>
<googlehttpclient.version>1.42.2</googlehttpclient.version>
<gson.version>2.9.1</gson.version>
<slf4j.version>2.0.2</slf4j.version>
<slf4j.version>2.0.3</slf4j.version>
<bouncy.version>1.70</bouncy.version>
<json.version>20220924</json.version>

Expand Down Expand Up @@ -444,7 +444,7 @@
<!-- surefire uses ASM to do some bytecode magic... need to bump version to be java 11 compatible -->
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.3</version>
<version>9.4</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -512,7 +512,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>9.3</version>
<version>9.4</version>
</dependency>
</dependencies>
</plugin>
Expand Down

0 comments on commit 35129cc

Please sign in to comment.