Skip to content

Commit

Permalink
Merge branch 'master' of github.com:OpenFeign/feign into dependabot/m…
Browse files Browse the repository at this point in the history
…aven/springboot.version-3.4.0
  • Loading branch information
velo committed Jan 7, 2025
2 parents 3e44474 + 50bfa17 commit 4ec98ee
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<extension>
<groupId>com.gradle</groupId>
<artifactId>develocity-maven-extension</artifactId>
<version>1.22.2</version>
<version>1.23</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
Expand Down
2 changes: 1 addition & 1 deletion benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<jmh.version>1.37</jmh.version>
<rx.netty.version>0.5.3</rx.netty.version>
<rx.java.version>1.3.8</rx.java.version>
<netty.version>4.1.115.Final</netty.version>
<netty.version>4.1.116.Final</netty.version>
<moditect.skip>true</moditect.skip>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>6.2.0</version>
<version>6.2.1</version>
<scope>test</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions form-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down Expand Up @@ -137,13 +137,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.14.2</version>
<version>5.15.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.14.2</version>
<version>5.15.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions form/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.12.0</version>
<version>1.13.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -99,13 +99,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.14.2</version>
<version>5.15.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.14.2</version>
<version>5.15.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion kotlin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<properties>
<kotlin.version>2.1.0</kotlin.version>
<kotlinx.coroutines.version>1.9.0</kotlinx.coroutines.version>
<kotlinx.coroutines.version>1.10.1</kotlinx.coroutines.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion micrometer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<description>Feign Micrometer Application Metrics</description>

<properties>
<micrometer.version>1.14.1</micrometer.version>
<micrometer.version>1.14.2</micrometer.version>
</properties>

<dependencies>
Expand Down
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,25 +169,25 @@
<maven.compiler.target>${main.java.version}</maven.compiler.target>

<okhttp3.version>4.12.0</okhttp3.version>
<guava.version>33.3.1-jre</guava.version>
<googlehttpclient.version>1.45.2</googlehttpclient.version>
<guava.version>33.4.0-jre</guava.version>
<googlehttpclient.version>1.45.3</googlehttpclient.version>
<gson.version>2.11.0</gson.version>
<moshi.version>1.15.2</moshi.version>
<slf4j.version>2.0.16</slf4j.version>
<json.version>20240303</json.version>
<json.version>20241224</json.version>
<springboot.version>3.4.0</springboot.version>

<junit5.version>5.11.3</junit5.version>
<junit5.version>5.11.4</junit5.version>
<jackson.version>2.18.2</jackson.version>
<assertj.version>3.26.3</assertj.version>
<mockito.version>5.14.2</mockito.version>
<assertj.version>3.27.2</assertj.version>
<mockito.version>5.15.2</mockito.version>
<fastjson2.version>2.0.53</fastjson2.version>

<git-code-format-maven-plugin.version>5.3</git-code-format-maven-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-install-plugin.version>3.1.3</maven-install-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
<license-maven-plugin.version>4.6</license-maven-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
Expand Down Expand Up @@ -991,18 +991,18 @@
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>5.46.1</version>
<version>5.47.3</version>

<dependencies>
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-testing-frameworks</artifactId>
<version>2.23.1</version>
<version>2.24.0</version>
</dependency>
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-migrate-java</artifactId>
<version>2.30.1</version>
<version>2.31.0</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion reactive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<description>Reactive Wrapper for Feign Clients</description>

<properties>
<reactor.version>3.7.0</reactor.version>
<reactor.version>3.7.1</reactor.version>
<reactive.streams.version>1.0.4</reactive.streams.version>
<reactivex.version>2.2.21</reactivex.version>
</properties>
Expand Down

0 comments on commit 4ec98ee

Please sign in to comment.