Skip to content

Commit c258f1e

Browse files
chingor13kolea2
chingor13
authored and
kolea2
committed
---
yaml --- r: 30431 b: refs/heads/autosynth-automl c: cda0b03 h: refs/heads/master i: 30429: 1663461 30427: ddc8d7e 30423: 2903100 30415: 9a996da 30399: 8085fed
1 parent d2949ad commit c258f1e

4 files changed

Lines changed: 48 additions & 36 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ refs/heads/spanner: b01127f885b4611bf1852abb0ce481eeb7fcc131
121121
refs/tags/v0.68.0: 9cc799fcf68c82ab431d425fefa58ef615ce8e5b
122122
refs/tags/v0.69.0: 78f67a29e8b9c46ba01de566a2eae0fd1c03edea
123123
refs/heads/autosynth-asset: bdb45634a0fe8f7a510692b56b31f5312e25f453
124-
refs/heads/autosynth-automl: 67668c1411169338374b050eae50ed650e318c54
124+
refs/heads/autosynth-automl: cda0b03316ae6213d51f045c940d8a634dbcbcf2
125125
refs/heads/autosynth-bigquerydatatransfer: d88aa5aae5fd9d3c6d75bbab1a05162c6d4d948f
126126
refs/heads/autosynth-bigquerystorage: d2c53da3b012e38c662e4df0738042435f19365f
127127
refs/heads/autosynth-bigtable: 9e5429f45cf9face9fed585d0233534993e36b58

‎branches/autosynth-automl/.kokoro/build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ fi
5454
mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V
5555

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

61-
case $JOB_TYPE in
61+
case ${JOB_TYPE} in
6262
test)
6363
mvn test -B
64-
bash $KOKORO_GFILE_DIR/codecov.sh
64+
bash ${KOKORO_GFILE_DIR}/codecov.sh
6565
;;
6666
lint)
6767
mvn com.coveo:fmt-maven-plugin:check

‎branches/autosynth-automl/google-cloud-clients/pom.xml‎

Lines changed: 43 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -663,37 +663,6 @@
663663
<check/>
664664
</configuration>
665665
</plugin>
666-
<plugin>
667-
<groupId>org.apache.maven.plugins</groupId>
668-
<artifactId>maven-checkstyle-plugin</artifactId>
669-
<version>2.17</version>
670-
<dependencies>
671-
<dependency>
672-
<groupId>com.puppycrawl.tools</groupId>
673-
<artifactId>checkstyle</artifactId>
674-
<version>6.16</version>
675-
</dependency>
676-
</dependencies>
677-
<executions>
678-
<execution>
679-
<id>checkstyle</id>
680-
<phase>validate</phase>
681-
<goals>
682-
<goal>check</goal>
683-
</goals>
684-
<configuration>
685-
<headerLocation>java.header</headerLocation>
686-
<configLocation>license-checks.xml</configLocation>
687-
<consoleOutput>true</consoleOutput>
688-
<failOnViolation>true</failOnViolation>
689-
<violationSeverity>error</violationSeverity>
690-
<failsOnError>true</failsOnError>
691-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
692-
<excludes>com/google/cloud/*/v*/**</excludes><!-- We need to exclude autogenerated code -->
693-
</configuration>
694-
</execution>
695-
</executions>
696-
</plugin>
697666
<plugin>
698667
<groupId>org.apache.maven.plugins</groupId>
699668
<artifactId>maven-site-plugin</artifactId>
@@ -968,5 +937,48 @@
968937
</plugins>
969938
</build>
970939
</profile>
940+
941+
<profile>
942+
<!-- Only run checkstyle plugin on Java 8+ (checkstyle artifact only supports Java 8+) -->
943+
<id>checkstyle-tests</id>
944+
<activation>
945+
<jdk>[1.8,)</jdk>
946+
</activation>
947+
<build>
948+
<plugins>
949+
<plugin>
950+
<groupId>org.apache.maven.plugins</groupId>
951+
<artifactId>maven-checkstyle-plugin</artifactId>
952+
<version>3.0.0</version>
953+
<dependencies>
954+
<dependency>
955+
<groupId>com.puppycrawl.tools</groupId>
956+
<artifactId>checkstyle</artifactId>
957+
<version>8.19</version>
958+
</dependency>
959+
</dependencies>
960+
<executions>
961+
<execution>
962+
<id>checkstyle</id>
963+
<phase>validate</phase>
964+
<goals>
965+
<goal>check</goal>
966+
</goals>
967+
<configuration>
968+
<headerLocation>java.header</headerLocation>
969+
<configLocation>license-checks.xml</configLocation>
970+
<consoleOutput>true</consoleOutput>
971+
<failOnViolation>true</failOnViolation>
972+
<violationSeverity>error</violationSeverity>
973+
<failsOnError>true</failsOnError>
974+
<includeTestSourceDirectory>true</includeTestSourceDirectory>
975+
<excludes>com/google/cloud/*/v*/**</excludes><!-- We need to exclude autogenerated code -->
976+
</configuration>
977+
</execution>
978+
</executions>
979+
</plugin>
980+
</plugins>
981+
</build>
982+
</profile>
971983
</profiles>
972984
</project>

‎branches/autosynth-automl/google-cloud-util/google-cloud-compat-checker/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<plugin>
9696
<groupId>org.apache.maven.plugins</groupId>
9797
<artifactId>maven-checkstyle-plugin</artifactId>
98-
<version>2.17</version>
98+
<version>3.0.0</version>
9999
<executions>
100100
<execution>
101101
<id>checkstyle</id>

0 commit comments

Comments
 (0)