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

Upgrade jQuery. Fixes gh-3773.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2020-04-10 17:35:43 +02:00
parent d6f375490a
commit 17b9002fef
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>

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/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>

2
spring-cloud-netflix-hystrix-dashboard/pom.xml
View File

@@ -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>

2
spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftlh
View File

@@ -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() {

2
spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftlh
View File

@@ -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>

2
spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardContextTests.java
View File

@@ -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;