Skip to content

Commit b2f4774

Browse files
fmichielssenfmichielssen
committed
Merge pull request 'Update dependencies' (#11) from feature/18516 into develop
2 parents 3642ca2 + a06138e commit b2f4774

3 files changed

Lines changed: 60 additions & 10 deletions

File tree

‎pom.xml‎

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
<dependency>
189189
<groupId>org.springframework.security.extensions</groupId>
190190
<artifactId>spring-security-saml2-core</artifactId>
191-
<version>1.0.9.RELEASE</version>
191+
<version>1.0.10.RELEASE</version>
192192
</dependency>
193193

194194
<!-- Kerberos -->
@@ -207,7 +207,7 @@
207207
<dependency>
208208
<groupId>com.spotify</groupId>
209209
<artifactId>docker-client</artifactId>
210-
<version>8.15.2</version>
210+
<version>8.15.3</version>
211211
</dependency>
212212
<!-- Jersey, a dependency of docker-client with wonky version constraints -->
213213
<dependency>
@@ -244,12 +244,12 @@
244244
<dependency>
245245
<groupId>org.webjars</groupId>
246246
<artifactId>bootstrap</artifactId>
247-
<version>3.3.7</version>
247+
<version>3.4.1</version>
248248
</dependency>
249249
<dependency>
250250
<groupId>org.webjars</groupId>
251251
<artifactId>jquery</artifactId>
252-
<version>3.3.1</version>
252+
<version>3.5.0</version>
253253
</dependency>
254254

255255
<!-- Amazon S3 -->
@@ -297,6 +297,33 @@
297297
<scope>test</scope>
298298
</dependency>
299299

300+
301+
<!-- Recursive dependencies which are upgraded for security -->
302+
<dependency>
303+
<groupId>commons-collections</groupId>
304+
<artifactId>commons-collections</artifactId>
305+
<version>3.2.2</version>
306+
</dependency>
307+
<dependency>
308+
<groupId>org.apache.commons</groupId>
309+
<artifactId>commons-compress</artifactId>
310+
<version>1.19</version>
311+
</dependency>
312+
<dependency>
313+
<groupId>commons-beanutils</groupId>
314+
<artifactId>commons-beanutils</artifactId>
315+
<version>1.9.4</version>
316+
</dependency>
317+
<dependency>
318+
<groupId>com.google.guava</groupId>
319+
<artifactId>guava</artifactId>
320+
<version>25.0-jre</version>
321+
</dependency>
322+
<dependency>
323+
<groupId>org.springframework</groupId>
324+
<artifactId>spring-core</artifactId>
325+
<version>5.2.9.RELEASE</version>
326+
</dependency>
300327
</dependencies>
301328

302329
<build>
@@ -384,4 +411,27 @@
384411
</plugin>
385412
</plugins>
386413
</build>
414+
415+
<profiles>
416+
<profile>
417+
<id>owasp-dependency-check</id>
418+
<build>
419+
<plugins>
420+
<plugin>
421+
<groupId>org.owasp</groupId>
422+
<artifactId>dependency-check-maven</artifactId>
423+
<version>6.0.2</version>
424+
<executions>
425+
<execution>
426+
<goals>
427+
<goal>check</goal>
428+
</goals>
429+
</execution>
430+
</executions>
431+
</plugin>
432+
</plugins>
433+
</build>
434+
</profile>
435+
</profiles>
436+
387437
</project>

‎src/main/resources/templates/error.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
<head lang="en">
2929
<title>Error</title>
3030
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
31-
<link rel="stylesheet" media="screen" th:href="@{/webjars/bootstrap/3.3.7/css/bootstrap.min.css}"/>
31+
<link rel="stylesheet" media="screen" th:href="@{/webjars/bootstrap/3.4.1/css/bootstrap.min.css}"/>
3232
<link rel="stylesheet" media="screen" th:href="@{/css/error.css}"/>
33-
<script th:src="@{/webjars/jquery/3.3.1/jquery.min.js}"></script>
34-
<script th:src="@{/webjars/bootstrap/3.3.7/js/bootstrap.min.js}"></script>
33+
<script th:src="@{/webjars/jquery/3.5.0/jquery.min.js}"></script>
34+
<script th:src="@{/webjars/bootstrap/3.4.1/js/bootstrap.min.js}"></script>
3535
</head>
3636

3737
<body>

‎src/main/resources/templates/login.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<head lang="en">
2929
<title th:text="${title}"></title>
3030
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
31-
<link rel="stylesheet" media="screen" th:href="@{/webjars/bootstrap/3.3.7/css/bootstrap.min.css}"/>
31+
<link rel="stylesheet" media="screen" th:href="@{/webjars/bootstrap/3.4.1/css/bootstrap.min.css}"/>
3232
<link rel="stylesheet" media="screen" th:href="@{/css/login.css}"/>
3333
<link rel="stylesheet" media="screen" type="text/css" href="https://cdn.jsdelivr.net/bootstrap-social/5.1.1/bootstrap-social.css"/>
3434
<link rel="stylesheet" media="screen" type="text/css" href="https://cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.min.css"/>
35-
<script th:src="@{/webjars/jquery/3.3.1/jquery.min.js}"></script>
36-
<script th:src="@{/webjars/bootstrap/3.3.7/js/bootstrap.min.js}"></script>
35+
<script th:src="@{/webjars/jquery/3.5.0/jquery.min.js}"></script>
36+
<script th:src="@{/webjars/bootstrap/3.4.1/js/bootstrap.min.js}"></script>
3737
</head>
3838

3939
<body>

0 commit comments

Comments
 (0)