diff options
| author | Volker Boerchers <vboerchers@users.noreply.github.com> | 2016-09-11 15:21:26 +0200 |
|---|---|---|
| committer | Roman Ivanov <romani@users.noreply.github.com> | 2016-10-18 15:40:21 -0700 |
| commit | 63e8c1dd4e1da443c8533d40640fe1a3b371afe8 (patch) | |
| tree | 0e3f74a6738ed3ffddad7efaec697529096b3013 /config/import-control.xml | |
| parent | f77a01ba3683c16a5d23670b04f5929e2b042b5b (diff) | |
| download | checkstyle-63e8c1dd4e1da443c8533d40640fe1a3b371afe8.tar.gz | |
Issue #2999: allow regex in subpackage and importcontrol element
Diffstat (limited to 'config/import-control.xml')
| -rw-r--r-- | config/import-control.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/config/import-control.xml b/config/import-control.xml index b0a9ed031..d30d6e8c1 100644 --- a/config/import-control.xml +++ b/config/import-control.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE import-control PUBLIC - "-//Puppy Crawl//DTD Import Control 1.1//EN" - "http://www.puppycrawl.com/dtds/import_control_1_1.dtd"> + "-//Puppy Crawl//DTD Import Control 1.2//EN" + "http://checkstyle.sourceforge.net/dtds/import_control_1_2.dtd"> <import-control pkg="com.puppycrawl.tools.checkstyle"> @@ -110,7 +110,7 @@ <subpackage name="doclets"> <allow pkg="com.sun.javadoc"/> - <disallow pkg="com.puppycrawl.tools.checkstyle.(checks|ant|filters|gui)" regex="true"/> + <disallow pkg="com\.puppycrawl\.tools\.checkstyle\.(checks|ant|filters|gui)" regex="true"/> </subpackage> <subpackage name="filters"> @@ -119,15 +119,15 @@ <allow class="com.google.common.base.CaseFormat" local-only="true"/> <allow class="com.google.common.collect.ImmutableCollection" local-only="true"/> <allow class="com.google.common.collect.ImmutableMap" local-only="true"/> - <!-- is not possible till pkg is not a regexp --> - <!-- <disallow pkg="com.puppycrawl.tools.checkstyle.checks.*"/> --> - <disallow pkg="com.puppycrawl.tools.checkstyle.(ant|doclets|gui)" regex="true"/> + <!-- check's subpackages --> + <disallow pkg="com\.puppycrawl\.tools\.checkstyle\.checks\.[^.]+" regex="true"/> + <disallow pkg="com\.puppycrawl\.tools\.checkstyle\.(ant|doclets|gui)" regex="true"/> </subpackage> <subpackage name="gui"> <allow pkg="java.awt"/> <allow pkg="javax.swing"/> - <disallow pkg="com.puppycrawl.tools.checkstyle.(checks|ant|doclets|filters)" regex="true"/> + <disallow pkg="com\.puppycrawl\.tools\.checkstyle\.(checks|ant|doclets|filters)" regex="true"/> </subpackage> <subpackage name="internal"> |