diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 65a0ca8d31..0a6ac20a1e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -50,6 +50,8 @@ repos: - id: detect-private-key - id: end-of-file-fixer - id: forbid-submodules + - id: trailing-whitespace + args: [--markdown-linebreak-ext=md] - repo: https://github.com/igorshubovych/markdownlint-cli rev: v0.45.0 hooks: diff --git a/support/aspectj/src/main/resources/META-INF/NOTICE b/support/aspectj/src/main/resources/META-INF/NOTICE index 9d26a95ffb..bdc909e8ce 100644 --- a/support/aspectj/src/main/resources/META-INF/NOTICE +++ b/support/aspectj/src/main/resources/META-INF/NOTICE @@ -4,10 +4,10 @@ Copyright 2008-2020 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -The implementation for org.apache.shiro.util.SoftHashMap is based -on initial ideas from Dr. Heinz Kabutz's publicly posted version +The implementation for org.apache.shiro.util.SoftHashMap is based +on initial ideas from Dr. Heinz Kabutz's publicly posted version available at http://www.javaspecialists.eu/archive/Issue015.html, -with continued modifications. +with continued modifications. Certain parts (StringUtils, IpAddressMatcher, etc.) of the source code for this product was copied for simplicity and to reduce diff --git a/support/ehcache/src/main/resources/META-INF/NOTICE b/support/ehcache/src/main/resources/META-INF/NOTICE index 9d26a95ffb..bdc909e8ce 100644 --- a/support/ehcache/src/main/resources/META-INF/NOTICE +++ b/support/ehcache/src/main/resources/META-INF/NOTICE @@ -4,10 +4,10 @@ Copyright 2008-2020 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -The implementation for org.apache.shiro.util.SoftHashMap is based -on initial ideas from Dr. Heinz Kabutz's publicly posted version +The implementation for org.apache.shiro.util.SoftHashMap is based +on initial ideas from Dr. Heinz Kabutz's publicly posted version available at http://www.javaspecialists.eu/archive/Issue015.html, -with continued modifications. +with continued modifications. Certain parts (StringUtils, IpAddressMatcher, etc.) of the source code for this product was copied for simplicity and to reduce diff --git a/support/guice/src/main/resources/META-INF/NOTICE b/support/guice/src/main/resources/META-INF/NOTICE index b851ebce53..bdc909e8ce 100644 --- a/support/guice/src/main/resources/META-INF/NOTICE +++ b/support/guice/src/main/resources/META-INF/NOTICE @@ -5,9 +5,9 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). The implementation for org.apache.shiro.util.SoftHashMap is based -on initial ideas from Dr. Heinz Kabutz's publicly posted version +on initial ideas from Dr. Heinz Kabutz's publicly posted version available at http://www.javaspecialists.eu/archive/Issue015.html, -with continued modifications. +with continued modifications. Certain parts (StringUtils, IpAddressMatcher, etc.) of the source code for this product was copied for simplicity and to reduce diff --git a/support/hazelcast/src/main/resources/META-INF/NOTICE b/support/hazelcast/src/main/resources/META-INF/NOTICE index 9d26a95ffb..bdc909e8ce 100644 --- a/support/hazelcast/src/main/resources/META-INF/NOTICE +++ b/support/hazelcast/src/main/resources/META-INF/NOTICE @@ -4,10 +4,10 @@ Copyright 2008-2020 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -The implementation for org.apache.shiro.util.SoftHashMap is based -on initial ideas from Dr. Heinz Kabutz's publicly posted version +The implementation for org.apache.shiro.util.SoftHashMap is based +on initial ideas from Dr. Heinz Kabutz's publicly posted version available at http://www.javaspecialists.eu/archive/Issue015.html, -with continued modifications. +with continued modifications. Certain parts (StringUtils, IpAddressMatcher, etc.) of the source code for this product was copied for simplicity and to reduce diff --git a/support/jcache/src/main/resources/META-INF/NOTICE b/support/jcache/src/main/resources/META-INF/NOTICE index b851ebce53..bdc909e8ce 100644 --- a/support/jcache/src/main/resources/META-INF/NOTICE +++ b/support/jcache/src/main/resources/META-INF/NOTICE @@ -5,9 +5,9 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). The implementation for org.apache.shiro.util.SoftHashMap is based -on initial ideas from Dr. Heinz Kabutz's publicly posted version +on initial ideas from Dr. Heinz Kabutz's publicly posted version available at http://www.javaspecialists.eu/archive/Issue015.html, -with continued modifications. +with continued modifications. Certain parts (StringUtils, IpAddressMatcher, etc.) of the source code for this product was copied for simplicity and to reduce diff --git a/support/quartz/src/main/resources/META-INF/NOTICE b/support/quartz/src/main/resources/META-INF/NOTICE index b851ebce53..bdc909e8ce 100644 --- a/support/quartz/src/main/resources/META-INF/NOTICE +++ b/support/quartz/src/main/resources/META-INF/NOTICE @@ -5,9 +5,9 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). The implementation for org.apache.shiro.util.SoftHashMap is based -on initial ideas from Dr. Heinz Kabutz's publicly posted version +on initial ideas from Dr. Heinz Kabutz's publicly posted version available at http://www.javaspecialists.eu/archive/Issue015.html, -with continued modifications. +with continued modifications. Certain parts (StringUtils, IpAddressMatcher, etc.) of the source code for this product was copied for simplicity and to reduce diff --git a/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/NOTICE b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/NOTICE index 9d26a95ffb..bdc909e8ce 100644 --- a/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/NOTICE +++ b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/NOTICE @@ -4,10 +4,10 @@ Copyright 2008-2020 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -The implementation for org.apache.shiro.util.SoftHashMap is based -on initial ideas from Dr. Heinz Kabutz's publicly posted version +The implementation for org.apache.shiro.util.SoftHashMap is based +on initial ideas from Dr. Heinz Kabutz's publicly posted version available at http://www.javaspecialists.eu/archive/Issue015.html, -with continued modifications. +with continued modifications. Certain parts (StringUtils, IpAddressMatcher, etc.) of the source code for this product was copied for simplicity and to reduce diff --git a/support/spring/src/main/resources/META-INF/NOTICE b/support/spring/src/main/resources/META-INF/NOTICE index b851ebce53..bdc909e8ce 100644 --- a/support/spring/src/main/resources/META-INF/NOTICE +++ b/support/spring/src/main/resources/META-INF/NOTICE @@ -5,9 +5,9 @@ This product includes software developed at The Apache Software Foundation (http://www.apache.org/). The implementation for org.apache.shiro.util.SoftHashMap is based -on initial ideas from Dr. Heinz Kabutz's publicly posted version +on initial ideas from Dr. Heinz Kabutz's publicly posted version available at http://www.javaspecialists.eu/archive/Issue015.html, -with continued modifications. +with continued modifications. Certain parts (StringUtils, IpAddressMatcher, etc.) of the source code for this product was copied for simplicity and to reduce