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
#	spring-cloud-netflix-hystrix-dashboard/pom.xml
#	spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftlh
#	spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftlh
#	spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java
This commit is contained in:
Olga Maciaszek-Sharma
2020-10-06 20:58:57 +02:00
parent 036685e153 6ce8123be1
commit 0e2cd26a4a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -29,8 +29,8 @@
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
<sonar.language>java</sonar.language>
<eureka-jersey.version>1.19.1</eureka-jersey.version>
<xstream.version>1.4.11.1</xstream.version>
<eureka-jersey.version>1.19.4</eureka-jersey.version>
<xstream.version>1.4.13</xstream.version>
</properties>
<build>
<plugins>

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.9.25</eureka.version>
<eureka.version>1.10.4</eureka.version>
</properties>
<dependencyManagement>
<dependencies>

2
spring-cloud-netflix-eureka-client-tls-tests/pom.xml
View File

@@ -90,7 +90,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.64</version>
<version>1.66</version>
<scope>test</scope>
</dependency>
<dependency>

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

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

2
spring-cloud-netflix-eureka-server/src/main/wro/wro.xml
View File

@@ -2,7 +2,7 @@
<group name="wro">
<css>webjar:bootstrap/3.2.0/less/bootstrap.less</css>
<css>file:@.project.basedir.@/src/main/wro/main.less</css>
<js>webjar:jquery/3.4.1/jquery.min.js</js>
<js>webjar:jquery/3.5.1/jquery.min.js</js>
<js>webjar:bootstrap/3.2.0/js/bootstrap.min.js</js>
</group>
</groups>