You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ri...@apache.org on 2021/07/29 13:00:47 UTC

[phoenix] branch 5.1 updated: PHOENIX-6450 Checkstyle creating warnings for line length > 80 but < 100

This is an automated email from the ASF dual-hosted git repository.

richardantal pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
     new 978d6af  PHOENIX-6450 Checkstyle creating warnings for line length > 80 but < 100
978d6af is described below

commit 978d6afe9ae9cfa0660badff00974d4b3641b744
Author: Richard Antal <an...@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 93858b1..0d1123d 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 efcf0ac..ac363cf 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 4e6c52d..96b8ade 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>
       <!-- Add the ant-generated sources to the source path -->
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index b42032f..04b8714 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -30,7 +30,6 @@
   <name>Phoenix - Pherf</name>
 
   <properties>
-    <top.dir>${project.basedir}/..</top.dir>
     <shaded.package>org.apache.phoenix.shaded</shaded.package>
 
     <!-- Versions for pherf-only dependencies -->
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 6e5b16c..12f6dc2 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -36,7 +36,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-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
index 725883a..30e18b9 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 60cf962..25db2a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,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 -->
     <jackson.version>2.10.3</jackson.version>
@@ -495,18 +495,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>