SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.2.x'

Browse Source 
# Conflicts:
#	spring-cloud-netflix-dependencies/pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2020-10-30 17:22:16 +01:00
parent c1352a8132 08add768d0
commit 99ebcfb79a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-netflix-dependencies/pom.xml
View File

@@ -14,7 +14,7 @@
<name>spring-cloud-netflix-dependencies</name>
<description>Spring Cloud Netflix Dependencies</description>
<properties>
<eureka.version>1.10.4</eureka.version>
<eureka.version>1.10.7</eureka.version>
</properties>
<dependencyManagement>
<dependencies>

2
spring-cloud-netflix-eureka-server/pom.xml
View File

@@ -203,7 +203,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.5.13</version>
<version>3.6.0</version>
</dependency>
</dependencies>
</plugin>