This is an automated email from the ASF dual-hosted git repository. richardantal pushed a commit to branch 4.x in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push: new 0c58979 PHOENIX-6450 Checkstyle creating warnings for line length > 80 but < 100 0c58979 is described below commit 0c589796f807bfd4870aacdfefb59f6fc5d9ff6a Author: Richard Antal <antal97rich...@gmail.com> AuthorDate: Tue Jul 27 17:38:37 2021 +0200 PHOENIX-6450 Checkstyle creating warnings for line length > 80 but < 100 Change-Id: I24ae68bb3c237e1327b2c93774727f328b11aa50 --- phoenix-assembly/pom.xml | 1 - phoenix-client-parent/pom.xml | 1 - phoenix-core/pom.xml | 4 ---- phoenix-pherf/pom.xml | 1 - phoenix-server/pom.xml | 1 - phoenix-tracing-webapp/pom.xml | 2 -- pom.xml | 16 +++++++++------- 7 files changed, 9 insertions(+), 17 deletions(-) diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml index b7e07d2..2f46087 100644 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@ -30,7 +30,6 @@ <packaging>pom</packaging> <properties> - <top.dir>${project.basedir}/..</top.dir> <maven.test.skip>true</maven.test.skip> <source.skip>true</source.skip> </properties> diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml index 8a6104d..90df4c0 100644 --- a/phoenix-client-parent/pom.xml +++ b/phoenix-client-parent/pom.xml @@ -34,7 +34,6 @@ <!-- Don't make a source-jar --> <source.skip>true</source.skip> <license.bundles.dependencies>true</license.bundles.dependencies> - <top.dir>${project.basedir}/..</top.dir> <shaded.package>org.apache.phoenix.shaded</shaded.package> </properties> diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 143be81..7fdc7a8 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -27,10 +27,6 @@ <name>Phoenix Core</name> <description>Core Phoenix codebase</description> - <properties> - <top.dir>${project.basedir}/..</top.dir> - </properties> - <build> <plugins> <plugin> diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 520394e..6f24361 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -29,7 +29,6 @@ <name>Phoenix - Pherf</name> <properties> - <top.dir>${project.basedir}/..</top.dir> <shaded.package>org.apache.phoenix.shaded</shaded.package> <!-- JaCoCo thresholds overriden for phoenix-pherf --> <jacoco.instruction.coverage.percentage>0.650</jacoco.instruction.coverage.percentage> diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index 1795d45..922470c 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -38,7 +38,6 @@ <!-- Don't make a source-jar --> <source.skip>true</source.skip> <license.bundles.dependencies>true</license.bundles.dependencies> - <top.dir>${project.basedir}/..</top.dir> </properties> <build> diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml index b9561cc..4ee691d 100755 --- a/phoenix-tracing-webapp/pom.xml +++ b/phoenix-tracing-webapp/pom.xml @@ -30,8 +30,6 @@ <description>Tracing web application will visualize the phoenix traces</description> <properties> - <top.dir>${project.basedir}/..</top.dir> - <!-- tracing webapp only versions --> <servlet.api.version>3.1.0</servlet.api.version> <jetty.version>9.3.27.v20190418</jetty.version> diff --git a/pom.xml b/pom.xml index ffea7f2..1913b2c 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,7 @@ <antlr-input.dir>src/main/antlr3</antlr-input.dir> <antlr-output.dir>target/generated-sources/antlr3</antlr-output.dir> <test.output.tofile>true</test.output.tofile> - <top.dir>${project.basedir}</top.dir> + <top.dir>${project.basedir}/..</top.dir> <!-- Dependency versions --> <hive.version>1.2.1</hive.version> @@ -440,18 +440,20 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>3.1.0</version> + <configuration> + <configLocation>${top.dir}/src/main/config/checkstyle/checker.xml</configLocation> + <suppressionsLocation>${top.dir}/src/main/config/checkstyle/suppressions.xml</suppressionsLocation> + <consoleOutput>true</consoleOutput> + <headerLocation>${top.dir}/src/main/config/checkstyle/header.txt</headerLocation> + <failOnViolation><!--true-->false</failOnViolation> + <includeTestSourceDirectory><!--true-->false</includeTestSourceDirectory> + </configuration> <executions> <execution> <id>validate</id> <phase>validate</phase> <configuration> <skip>true</skip> - <configLocation>${top.dir}/src/main/config/checkstyle/checker.xml</configLocation> - <suppressionsLocation>${top.dir}/src/main/config/checkstyle/suppressions.xml</suppressionsLocation> - <consoleOutput>true</consoleOutput> - <headerLocation>${top.dir}/src/main/config/checkstyle/header.txt</headerLocation> - <failOnViolation><!--true-->false</failOnViolation> - <includeTestSourceDirectory><!--true-->false</includeTestSourceDirectory> </configuration> <goals> <goal>check</goal>