Skip to content

Commit

Permalink
Merge branch 'develop' into feature/max_allowed_retries
Browse files Browse the repository at this point in the history
  • Loading branch information
Fameing authored Nov 2, 2023
2 parents ffd3cb9 + cf7eb26 commit 3de6c87
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion feign-reactor-benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<plugin>
<groupId>org.skife.maven</groupId>
<artifactId>really-executable-jar-maven-plugin</artifactId>
<version>1.5.0</version>
<version>2.1.1</version>
<configuration>
<programFile>benchmark</programFile>
</configuration>
Expand Down
3 changes: 2 additions & 1 deletion feign-reactor-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>

<maven.javadoc.plugin.version>3.3.2</maven.javadoc.plugin.version>
<maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
<maven.source.plugin.version>3.3.0</maven.source.plugin.version>


<!-- GPG -->
<gpg.keyname>3EEF24C7</gpg.keyname>
<gpg.defaultKeyring>false</gpg.defaultKeyring>
Expand Down

0 comments on commit 3de6c87

Please sign in to comment.