From 17b9002fef8a924f165a5e1079f105ed8d5c1e09 Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Fri, 10 Apr 2020 17:35:43 +0200
Subject: [PATCH] Upgrade jQuery. Fixes gh-3773.

---
 spring-cloud-netflix-eureka-server/pom.xml                      | 2 +-
 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 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index 3b6114233..b2a22bbe9 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -201,7 +201,7 @@
 					<dependency>
 						<groupId>org.webjars</groupId>
 						<artifactId>jquery</artifactId>
-						<version>2.1.1</version>
+						<version>3.4.1</version>
 					</dependency>
 					<dependency>
 						<groupId>org.webjars</groupId>
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 47f1a5f35..b64e39e94 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 @@
   <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/2.1.1/jquery.min.js</js>
+    <js>webjar:jquery/3.4.1/jquery.min.js</js>
     <js>webjar:bootstrap/3.2.0/js/bootstrap.min.js</js>
   </group>
 </groups>
\ 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 76dfca190..ddd3212be 100644
--- a/spring-cloud-netflix-hystrix-dashboard/pom.xml
+++ b/spring-cloud-netflix-hystrix-dashboard/pom.xml
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>jquery</artifactId>
-			<version>2.1.1</version>
+			<version>3.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
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 d9d62a692..e1a4e570e 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 @@
 <title>Hystrix Dashboard</title>
 
 	<!-- Javascript to monitor and display -->
-	<script src="<@spring.url '/webjars/jquery/2.1.1/jquery.min.js'/>" type="text/javascript"></script>
+	<script src="<@spring.url '/webjars/jquery/3.4.1/jquery.min.js'/>" type="text/javascript"></script>
 	
 	<script>
 		function sendToMonitor() {
diff --git a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftlh b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftlh
index 373a2f2ee..36b67a640 100644
--- a/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftlh
+++ b/spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftlh
@@ -17,7 +17,7 @@
     <script type="text/javascript" src="<@spring.url '/webjars/d3js/3.4.11/d3.min.js'/>" ></script>
 	
 	<!-- Javascript to monitor and display -->
-    <script type="text/javascript" src="<@spring.url '/webjars/jquery/2.1.1/jquery.min.js'/>" ></script>
+    <script type="text/javascript" src="<@spring.url '/webjars/jquery/3.4.1/jquery.min.js'/>" ></script>
 	<script type="text/javascript" src="js/jquery.tinysort.min.js"></script>
 	<script type="text/javascript" src="js/tmpl.js"></script>
 	
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 19aeebaa5..6f34d4713 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/2.1.1/jquery.min.js";
+	public static final String JQUERY_PATH = "/context/webjars/jquery/3.4.1/jquery.min.js";
 
 	@LocalServerPort
 	private int port = 0;