Skip to content

Commit

Permalink
Merge branch 'master' into test-2.479.1-pr
Browse files Browse the repository at this point in the history
  • Loading branch information
basil authored Oct 7, 2024
2 parents 1c48e69 + 2fa3ae9 commit aa475a3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@
<!-- upper bounds conflict -->
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.113.Final</version>
<version>4.1.114.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-bom</artifactId>
<version>9.7</version>
<version>9.7.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -167,7 +167,7 @@ and
<dependency>
<groupId>com.cloudbees</groupId>
<artifactId>extensibility</artifactId>
<version>1.7</version>
<version>1.8</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/jacoco/test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.0</version>
<version>3.5.1</version>
<configuration>
<includes>
<include>**/*TestDummy.java</include>
Expand Down

0 comments on commit aa475a3

Please sign in to comment.