root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

This commit is contained in:
Stephane Nicoll 2019-02-28 14:44:27 +01:00
parent 9d6b7c598c 0c1efe3a1a
commit 3bcd93bd35
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TldSkipPatterns.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -50,6 +50,7 @@ final class TldSkipPatterns {
patterns.add("h2*.jar"); patterns.add("h2*.jar");
patterns.add("hamcrest*.jar"); patterns.add("hamcrest*.jar");
patterns.add("hibernate*.jar"); patterns.add("hibernate*.jar");
patterns.add("jaxb-runtime-*.jar");
patterns.add("jmx*.jar"); patterns.add("jmx*.jar");
patterns.add("jmx-tools-*.jar"); patterns.add("jmx-tools-*.jar");
patterns.add("jta*.jar"); patterns.add("jta*.jar");