From 931cca4f444e5503facd86c056d3493ef2d3c629 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 6 Oct 2020 17:43:46 +0200 Subject: [PATCH 1/8] Upgrade eureka-jersey to 1.19.4. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 744afb7e3..c0a2223d3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ reuseReports ${project.basedir}/../target/jacoco.exec java - 1.19.1 + 1.19.4 1.4.11.1 From be57fe3d8b52760b4056b8a80a7d88fcb1d052fa Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 6 Oct 2020 18:03:38 +0200 Subject: [PATCH 2/8] Upgrade jquery to 3.5.1. --- spring-cloud-netflix-eureka-server/src/main/wro/wro.xml | 2 +- spring-cloud-netflix-hystrix-dashboard/pom.xml | 2 +- .../src/main/resources/templates/hystrix/index.ftlh | 2 +- .../src/main/resources/templates/hystrix/monitor.ftlh | 2 +- .../netflix/hystrix/dashboard/HystrixDashboardContextTests.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-netflix-eureka-server/src/main/wro/wro.xml b/spring-cloud-netflix-eureka-server/src/main/wro/wro.xml index b64e39e94..6a48e9720 100644 --- a/spring-cloud-netflix-eureka-server/src/main/wro/wro.xml +++ b/spring-cloud-netflix-eureka-server/src/main/wro/wro.xml @@ -2,7 +2,7 @@ webjar:bootstrap/3.2.0/less/bootstrap.less file:@.project.basedir.@/src/main/wro/main.less - webjar:jquery/3.4.1/jquery.min.js + webjar:jquery/3.5.1/jquery.min.js webjar:bootstrap/3.2.0/js/bootstrap.min.js \ No newline at end of file diff --git a/spring-cloud-netflix-hystrix-dashboard/pom.xml b/spring-cloud-netflix-hystrix-dashboard/pom.xml index 3482353c1..5bfc2bf1b 100644 --- a/spring-cloud-netflix-hystrix-dashboard/pom.xml +++ b/spring-cloud-netflix-hystrix-dashboard/pom.xml @@ -48,7 +48,7 @@ org.webjars jquery - 3.4.1 + 3.5.1 org.webjars diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftlh b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftlh index e1a4e570e..028c9ad19 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftlh +++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftlh @@ -7,7 +7,7 @@ Hystrix Dashboard - + - + diff --git a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java index 1d2ed313c..53318d61d 100644 --- a/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java +++ b/spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; "server.servlet.context-path=/context" }) public class HystrixDashboardContextTests { - public static final String JQUERY_PATH = "/context/webjars/jquery/3.4.1/jquery.min.js"; + public static final String JQUERY_PATH = "/context/webjars/jquery/3.5.1/jquery.min.js"; @LocalServerPort private int port = 0; From 6e70f55049c9bd73d3c955e857b5459c7797c531 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 6 Oct 2020 18:13:48 +0200 Subject: [PATCH 3/8] Upgrade wro4j to 1.9.0. --- spring-cloud-netflix-eureka-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 09c089c0b..89f6f9696 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -12,7 +12,7 @@ Spring Cloud Netflix Eureka Server https://projects.spring.io/spring-cloud/ - 1.8.0 + 1.9.0 From 4bdb799c8c2069d7c90f964ea7979ddbe0eee4ef Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 6 Oct 2020 18:36:18 +0200 Subject: [PATCH 4/8] Revert "Upgrade wro4j to 1.9.0." This reverts commit 6e70f55049c9bd73d3c955e857b5459c7797c531. --- spring-cloud-netflix-eureka-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 89f6f9696..09c089c0b 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -12,7 +12,7 @@ Spring Cloud Netflix Eureka Server https://projects.spring.io/spring-cloud/ - 1.9.0 + 1.8.0 From 02973043973e567e449c0647136badbeb4c21c27 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 6 Oct 2020 19:23:15 +0200 Subject: [PATCH 5/8] Upgrade bcpkix-jdk15on to 1.66. --- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 09fd234a2..6a3792981 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -90,7 +90,7 @@ org.bouncycastle bcpkix-jdk15on - 1.64 + 1.66 test From 57053ed7eb1730409c19069054e309e60a62c02c Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 6 Oct 2020 19:46:21 +0200 Subject: [PATCH 6/8] Upgrade xstream to 1.4.13. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0a2223d3..9e65c3621 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ ${project.basedir}/../target/jacoco.exec java 1.19.4 - 1.4.11.1 + 1.4.13 From d11f91cdb1bf64fd23fbfddf7fb293017f606442 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 6 Oct 2020 20:06:08 +0200 Subject: [PATCH 7/8] Upgrade mockito-core to 3.5.13. --- spring-cloud-netflix-eureka-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 09c089c0b..b4aa3d175 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -211,7 +211,7 @@ org.mockito mockito-core - 2.18.0 + 3.5.13 From 6ce8123be1481c95b2ffee21619fde4d0f7a6a7f Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 6 Oct 2020 20:32:08 +0200 Subject: [PATCH 8/8] Upgrade eureka to 1.10.4. --- spring-cloud-netflix-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 5877179c2..2a5c8439c 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -16,7 +16,7 @@ 0.7.6 0.1.12 - 1.9.25 + 1.10.4 0.3.0 1.5.18 2.3.0