---

yaml --- r: 35867 b: refs/heads/autosynth-dataproc c: cda0b03 h: refs/heads/master i: 35865: 9515460 35863: 0314840
googleapis · May 1, 2019 · 02dac62 · 02dac62
1 parent c545f72
commit 02dac62
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 36 deletions.
diff --git a/[refs] b/[refs]
@@ -165,7 +165,7 @@ refs/tags/v0.78.0: 62d4bd30605ab3578f9a08d84487fb0b33ac2ff5
 refs/tags/v0.79.0: 82287b570708748c411d05c40f3932cff9606feb
 refs/tags/v0.80.0: f745e744d38e4fe636f34d0e04795ba3d014287d
 refs/tags/v0.81.0: ed3a0c85339ea6b73560b9a570abfbb76b93a263
-refs/heads/autosynth-dataproc: 67668c1411169338374b050eae50ed650e318c54
+refs/heads/autosynth-dataproc: cda0b03316ae6213d51f045c940d8a634dbcbcf2
 refs/heads/autosynth-securitycenter: b24087060036e623e57d2454ba5dabeaf1e530c5
 refs/heads/autosynth-talent: 4ca901879f86aab61091cea52e8a9b653639df24
 refs/tags/v0.82.0: 7b9807d5d0a400c757b8905fee768be4c85eba25

diff --git a/branches/autosynth-dataproc/.kokoro/build.sh b/branches/autosynth-dataproc/.kokoro/build.sh
@@ -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

diff --git a/branches/autosynth-dataproc/google-cloud-clients/pom.xml b/branches/autosynth-dataproc/google-cloud-clients/pom.xml
@@ -663,37 +663,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>
@@ -968,5 +937,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>
diff --git a/branches/autosynth-dataproc/google-cloud-util/google-cloud-compat-checker/pom.xml b/branches/autosynth-dataproc/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -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>