Merge pull request 'Fix #24685: use webjars instead of CDN' (#48) from feature/24685 into develop

Author: fmichielssen

pom.xml

@@ -269,7 +269,17 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>jquery</artifactId>
-			<version>3.5.0</version>
+			<version>3.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars.bower</groupId>
+			<artifactId>bootstrap-social</artifactId>
+			<version>5.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars.bower</groupId>
+			<artifactId>fontawesome</artifactId>
+			<version>4.7.0</version>
 		</dependency>
 
 		<!-- Amazon S3 -->

src/main/java/eu/openanalytics/containerproxy/api/BaseController.java

@@ -43,7 +43,9 @@ protected void prepareMap(ModelMap map) {
 		map.put("title", environment.getProperty("proxy.title", "ShinyProxy"));
 		map.put("bootstrapCss", "/webjars/bootstrap/3.4.1/css/bootstrap.min.css");
 		map.put("bootstrapJs", "/webjars/bootstrap/3.4.1/js/bootstrap.min.js");
-		map.put("jqueryJs", "/webjars/jquery/3.5.0/jquery.min.js");
+		map.put("jqueryJs", "/webjars/jquery/3.5.1/jquery.min.js");
+		map.put("fontAwesomeCss", "/webjars/fontawesome/4.7.0/css/font-awesome.min.css");
+		map.put("bootstrapSocialCss", "/webjars/bootstrap-social/5.1.1/bootstrap-social.css");
 	}
 
 	public static class NotFoundException extends RuntimeException {

src/main/resources/templates/login.html

@@ -30,8 +30,8 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<link rel="stylesheet" media="screen" th:href="@{${bootstrapCss}}" />
 	<link rel="stylesheet" media="screen" th:href="@{/css/login.css}"/>
-	<link rel="stylesheet" media="screen" type="text/css" href="https://cdn.jsdelivr.net/bootstrap-social/5.1.1/bootstrap-social.css"/>
-	<link rel="stylesheet" media="screen" type="text/css" href="https://cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.min.css"/>
+	<link rel="stylesheet" media="screen" th:href="@{${bootstrapSocialCss}}"/>
+	<link rel="stylesheet" media="screen" th:href="@{${fontAwesomeCss}}"/>
 	<script th:src="@{${jqueryJs}}"></script>
 	<script th:src="@{${bootstrapJs}}"></script>
 </head>