Repository: avro Updated Branches: refs/heads/master 832512edc -> 33d495840
AVRO-1900: Remove dev-tools to fix Java build. The dev-tools module has to be built before working in lang/java. This breaks the build.sh script and is a confusing failure for new Java contributors. This commit fixes the problem by moving the checkstyle config back into the lang/java/pom.xml. It is applied to all Java modules under lang/java. Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/33d49584 Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/33d49584 Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/33d49584 Branch: refs/heads/master Commit: 33d495840c896b693b7f37b5ec786ac1acacd3b4 Parents: 832512e Author: Ryan Blue <[email protected]> Authored: Sat Sep 10 16:41:58 2016 -0700 Committer: Ryan Blue <[email protected]> Committed: Tue Sep 13 10:18:30 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 + dev-tools/pom.xml | 31 --------- .../main/resources/checkstyle/checkstyle.xml | 70 -------------------- .../main/resources/checkstyle/suppressions.xml | 26 -------- lang/java/checkstyle.xml | 70 ++++++++++++++++++++ lang/java/pom.xml | 22 ++++++ lang/java/suppressions.xml | 26 ++++++++ pom.xml | 30 --------- 8 files changed, 120 insertions(+), 157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/33d49584/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 253c356..b5818cc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -54,6 +54,8 @@ Trunk (not yet released) AVRO-1873: Ruby: Add CRC32 checksum to Snappy-compressed blocks. (blue) + AVRO-1900: Java: Remove dev-tools to fix Java build. (blue) + Avro 1.8.1 (14 May 2016) INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/avro/blob/33d49584/dev-tools/pom.xml ---------------------------------------------------------------------- diff --git a/dev-tools/pom.xml b/dev-tools/pom.xml deleted file mode 100644 index cedb95a..0000000 --- a/dev-tools/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?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 language governing permissions and - limitations under the License. ---> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; - xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.apache.avro</groupId> - <artifactId>dev-tools</artifactId> - <version>1.9.0-SNAPSHOT</version> - - <name>Apache Avro Developer tools</name> - <url>http://avro.apache.org</url> - -</project> - http://git-wip-us.apache.org/repos/asf/avro/blob/33d49584/dev-tools/src/main/resources/checkstyle/checkstyle.xml ---------------------------------------------------------------------- diff --git a/dev-tools/src/main/resources/checkstyle/checkstyle.xml b/dev-tools/src/main/resources/checkstyle/checkstyle.xml deleted file mode 100644 index fe5f008..0000000 --- a/dev-tools/src/main/resources/checkstyle/checkstyle.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0"?> - -<!-- - 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" - "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";> - - -<module name="Checker"> - <module name="SuppressionFilter"> - <property name="file" value="${checkstyle.suppressions.file}"/> - </module> - - <module name="SuppressionCommentFilter"/> - - <module name="FileTabCharacter"/> - <module name="NewlineAtEndOfFile"> - <property name="lineSeparator" value="lf"/> - </module> - - <module name="TreeWalker"> - <module name="ConstantName"/> - <module name="LocalFinalVariableName"/> - <module name="LocalVariableName"/> - <module name="MemberName"/> - <module name="MethodName"/> - <module name="PackageName"/> - <module name="ParameterName"/> - <module name="StaticVariableName"/> - <module name="TypeName"/> - - <module name="AvoidStarImport"/> - <module name="RedundantImport"/> - <module name="UnusedImports"/> - - <!--<module name="RedundantModifier"/>--> - - <module name="EmptyStatement"/> - <module name="IllegalInstantiation"/> - <module name="SimplifyBooleanExpression"/> - <module name="SimplifyBooleanReturn"/> - - <module name="InterfaceIsType"/> - - <module name="ArrayTypeStyle"/> - <module name="UpperEll"/> - - <module name="Regexp"> - <property name="format" value="[ \t]+$"/> - <property name="illegalPattern" value="true"/> - <property name="message" value="Trailing whitespace"/> - </module> - </module> -</module> http://git-wip-us.apache.org/repos/asf/avro/blob/33d49584/dev-tools/src/main/resources/checkstyle/suppressions.xml ---------------------------------------------------------------------- diff --git a/dev-tools/src/main/resources/checkstyle/suppressions.xml b/dev-tools/src/main/resources/checkstyle/suppressions.xml deleted file mode 100644 index c952495..0000000 --- a/dev-tools/src/main/resources/checkstyle/suppressions.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0"?> - -<!-- - 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" - "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd";> - -<suppressions> - <suppress files=".*[\\/]target[\\/]" checks=".*" /> -</suppressions> http://git-wip-us.apache.org/repos/asf/avro/blob/33d49584/lang/java/checkstyle.xml ---------------------------------------------------------------------- diff --git a/lang/java/checkstyle.xml b/lang/java/checkstyle.xml new file mode 100644 index 0000000..fe5f008 --- /dev/null +++ b/lang/java/checkstyle.xml @@ -0,0 +1,70 @@ +<?xml version="1.0"?> + +<!-- + 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" + "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";> + + +<module name="Checker"> + <module name="SuppressionFilter"> + <property name="file" value="${checkstyle.suppressions.file}"/> + </module> + + <module name="SuppressionCommentFilter"/> + + <module name="FileTabCharacter"/> + <module name="NewlineAtEndOfFile"> + <property name="lineSeparator" value="lf"/> + </module> + + <module name="TreeWalker"> + <module name="ConstantName"/> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"/> + <module name="MethodName"/> + <module name="PackageName"/> + <module name="ParameterName"/> + <module name="StaticVariableName"/> + <module name="TypeName"/> + + <module name="AvoidStarImport"/> + <module name="RedundantImport"/> + <module name="UnusedImports"/> + + <!--<module name="RedundantModifier"/>--> + + <module name="EmptyStatement"/> + <module name="IllegalInstantiation"/> + <module name="SimplifyBooleanExpression"/> + <module name="SimplifyBooleanReturn"/> + + <module name="InterfaceIsType"/> + + <module name="ArrayTypeStyle"/> + <module name="UpperEll"/> + + <module name="Regexp"> + <property name="format" value="[ \t]+$"/> + <property name="illegalPattern" value="true"/> + <property name="message" value="Trailing whitespace"/> + </module> + </module> +</module> http://git-wip-us.apache.org/repos/asf/avro/blob/33d49584/lang/java/pom.xml ---------------------------------------------------------------------- diff --git a/lang/java/pom.xml b/lang/java/pom.xml index d1b9289..47b69e5 100644 --- a/lang/java/pom.xml +++ b/lang/java/pom.xml @@ -317,6 +317,28 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${checkstyle-plugin.version}</version> + <configuration> + <consoleOutput>true</consoleOutput> + <configLocation>checkstyle.xml</configLocation> + <suppressionsLocation>suppressions.xml</suppressionsLocation> + </configuration> + <!-- Runs by default in the verify phase (mvn verify or later in the build cycle) + the 'check' goal will fail the build if it does not pass. "mvn checkstyle:check" + will do this alone, or "mvn checkstyle:checkstyle" will report but not break --> + <executions> + <execution> + <id>checkstyle-check</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/avro/blob/33d49584/lang/java/suppressions.xml ---------------------------------------------------------------------- diff --git a/lang/java/suppressions.xml b/lang/java/suppressions.xml new file mode 100644 index 0000000..c952495 --- /dev/null +++ b/lang/java/suppressions.xml @@ -0,0 +1,26 @@ +<?xml version="1.0"?> + +<!-- + 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" + "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd";> + +<suppressions> + <suppress files=".*[\\/]target[\\/]" checks=".*" /> +</suppressions> http://git-wip-us.apache.org/repos/asf/avro/blob/33d49584/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fda01a9..0e5948a 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,6 @@ </properties> <modules> - <module>dev-tools</module> <module>lang/java</module> </modules> @@ -121,35 +120,6 @@ <fail>true</fail> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle-plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>dev-tools</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <configuration> - <consoleOutput>true</consoleOutput> - <configLocation>checkstyle/checkstyle.xml</configLocation> - <suppressionsLocation>checkstyle/suppressions.xml</suppressionsLocation> - </configuration> - <!-- Runs by default in the verify phase (mvn verify or later in the build cycle) - the 'check' goal will fail the build if it does not pass. "mvn checkstyle:check" - will do this alone, or "mvn checkstyle:checkstyle" will report but not break --> - <executions> - <execution> - <id>checkstyle-check</id> - <phase>test</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build>
