Skip to content

Update maven-checkstyle-plugin and puppycrawl checkstyle #5003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kolea2 merged 3 commits into from
May 1, 2019
Merged

Update maven-checkstyle-plugin and puppycrawl checkstyle #5003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34d42d5
Update maven-checkstyle-plugin and puppycrawl checkstyle
chingor13 Apr 23, 2019
7b0ffc3
try to skip checkstyle on Java 7
chingor13 Apr 26, 2019
819da46
Reverse the condition - only run checkstyle on Java 8+
chingor13 Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .kokoro/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ fi
mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V

# prepend Kokoro root directory onto GOOGLE_APPLICATION_CREDENTIALS path
if [[ ! -z "$GOOGLE_APPLICATION_CREDENTIALS" ]]; then
if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" ]]; then
export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS})
fi

case $JOB_TYPE in
case ${JOB_TYPE} in
test)
mvn test -B
bash $KOKORO_GFILE_DIR/codecov.sh
bash ${KOKORO_GFILE_DIR}/codecov.sh
;;
lint)
mvn com.coveo:fmt-maven-plugin:check
Expand Down
74 changes: 43 additions & 31 deletions google-cloud-clients/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,37 +660,6 @@
<check/>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>6.16</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>checkstyle</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<headerLocation>java.header</headerLocation>
<configLocation>license-checks.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<violationSeverity>error</violationSeverity>
<failsOnError>true</failsOnError>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<excludes>com/google/cloud/*/v*/**</excludes><!-- We need to exclude autogenerated code -->
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
Expand Down Expand Up @@ -928,5 +897,48 @@
</plugins>
</build>
</profile>

<profile>
<!-- Only run checkstyle plugin on Java 8+ (checkstyle artifact only supports Java 8+) -->
<id>checkstyle-tests</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.0.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.19</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>checkstyle</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<headerLocation>java.header</headerLocation>
<configLocation>license-checks.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
<violationSeverity>error</violationSeverity>
<failsOnError>true</failsOnError>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<excludes>com/google/cloud/*/v*/**</excludes><!-- We need to exclude autogenerated code -->
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion google-cloud-util/google-cloud-compat-checker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<version>3.0.0</version>
<executions>
<execution>
<id>checkstyle</id>
Expand Down