http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/exec/jdbc/src/test/resources/test-models.json ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/resources/test-models.json b/exec/jdbc/src/test/resources/test-models.json index 23895c9..b5b7c90 100644 --- a/exec/jdbc/src/test/resources/test-models.json +++ b/exec/jdbc/src/test/resources/test-models.json @@ -59,7 +59,6 @@ path: '/donuts.json', useReferenceInterpreter: 'true' } - }, { name: 'TIME_BY_DAY', @@ -69,7 +68,6 @@ path: '/donuts.json', useReferenceInterpreter: 'true' } - } ] }
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0d4194a..3cc4f38 100644 --- a/pom.xml +++ b/pom.xml @@ -200,9 +200,13 @@ <id>checkstyle-validation</id> <phase>validate</phase> <configuration> + <includes>**/*.java</includes> <encoding>UTF-8</encoding> <failsOnError>true</failsOnError> <consoleOutput>true</consoleOutput> + <includeResources>true</includeResources> + <includeTestResources>true</includeTestResources> + <resourceIncludes>**/*.properties,**/*.conf,**/*.json,**/*.xml</resourceIncludes> <includeTestSourceDirectory>true</includeTestSourceDirectory> <configLocation>src/main/resources/checkstyle-config.xml</configLocation> <suppressionsLocation>src/main/resources/checkstyle-suppressions.xml</suppressionsLocation> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/protocol/pom.xml ---------------------------------------------------------------------- diff --git a/protocol/pom.xml b/protocol/pom.xml index 6e4543d..0d133c1 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -142,6 +142,14 @@ <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/src/main/resources/assemblies/source-assembly.xml ---------------------------------------------------------------------- diff --git a/src/main/resources/assemblies/source-assembly.xml b/src/main/resources/assemblies/source-assembly.xml index 5918783..abcfc5a 100644 --- a/src/main/resources/assemblies/source-assembly.xml +++ b/src/main/resources/assemblies/source-assembly.xml @@ -1,13 +1,13 @@ <?xml version='1.0' encoding='UTF-8'?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - you under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <assembly> <id>source-release</id> @@ -26,13 +26,13 @@ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*] </exclude> - <!-- NOTE: Most of the following excludes should not be required - if the standard release process is followed. This is because the release - plugin checks out project sources into a location like target/checkout, then - runs the build from there. The result is a source-release archive that comes - from a pretty clean directory structure. HOWEVER, if the release plugin is - configured to run extra goals or generate a project website, it's definitely - possible that some of these files will be present. So, it's safer to exclude + <!-- NOTE: Most of the following excludes should not be required + if the standard release process is followed. This is because the release + plugin checks out project sources into a location like target/checkout, then + runs the build from there. The result is a source-release archive that comes + from a pretty clean directory structure. HOWEVER, if the release plugin is + configured to run extra goals or generate a project website, it's definitely + possible that some of these files will be present. So, it's safer to exclude them. --> <!-- IDEs --> @@ -68,7 +68,7 @@ <exclude>**/.buildpath</exclude> <exclude>**/sandbox/**</exclude> - + <!-- misc --> <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser] </exclude> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/src/main/resources/checkstyle-config.xml ---------------------------------------------------------------------- diff --git a/src/main/resources/checkstyle-config.xml b/src/main/resources/checkstyle-config.xml index 6743466..604698f 100644 --- a/src/main/resources/checkstyle-config.xml +++ b/src/main/resources/checkstyle-config.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - You under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + You under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" @@ -27,5 +27,14 @@ <property name="allowStaticMemberImports" value="true"/> </module> + <module name="NeedBraces"/> + </module> + + <module name="FileTabCharacter"/> + + <module name="RegexpSingleline"> + <property name="format" value="\s+$"/> + </module> + </module> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/676f5df6/src/main/resources/checkstyle-suppressions.xml ---------------------------------------------------------------------- diff --git a/src/main/resources/checkstyle-suppressions.xml b/src/main/resources/checkstyle-suppressions.xml index c30ff09..9d4682b 100644 --- a/src/main/resources/checkstyle-suppressions.xml +++ b/src/main/resources/checkstyle-suppressions.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - You under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + You under the Apache License, Version 2.0 (the "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "suppressions_1_1.dtd"> - + <!-- Checkstyle Suppressions for Apache Drill --> <suppressions> - <suppress files="[\\/]generated-sources[\\/]" checks="AvoidStarImport"/> + <suppress files="[\\/]generated-sources[\\/]" checks="AvoidStarImport,NeedBraces"/> </suppressions>
