googleapis · lqiu96 · Nov 29, 2022 · Nov 17, 2022 · Nov 17, 2022 · Nov 17, 2022
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -5,53 +5,65 @@ branchProtectionRules:
   - pattern: main
     isAdminEnforced: true
     requiredStatusCheckContexts:
-      - units
-      - format
+      - units (8)
+      - units (11)
+      - units (17)
+      - lint
       - cla/google
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: true
   - pattern: 1.10.1-sp
     isAdminEnforced: true
     requiredStatusCheckContexts:
-      - units
-      - format
+      - units (8)
+      - units (11)
+      - units (17)
+      - lint
       - cla/google
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: true
   - pattern: java7
     isAdminEnforced: true
     requiredStatusCheckContexts:
-      - units
-      - format
+      - units (8)
+      - units (11)
+      - units (17)
+      - lint
       - cla/google
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: true
   - pattern: 2.0.x
     isAdminEnforced: true
     requiredStatusCheckContexts:
-      - units
-      - format
+      - units (8)
+      - units (11)
+      - units (17)
+      - lint
       - cla/google
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: true
   - pattern: 2.1.x
     isAdminEnforced: true
     requiredStatusCheckContexts:
-      - units
-      - format
+      - units (8)
+      - units (11)
+      - units (17)
+      - lint
       - cla/google
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true
     requiresStrictStatusChecks: true
   - pattern: 2.2.x
     isAdminEnforced: true
     requiredStatusCheckContexts:
-      - units
-      - format
+      - units (8)
+      - units (11)
+      - units (17)
+      - lint
       - cla/google
     requiredApprovingReviewCount: 1
     requiresCodeOwnerReviews: true

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,23 +12,104 @@ jobs:
       JVM_OPTS: -Xmx3200m
       TERM: dumb
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - run: java -version
-    - name: Gradle Assemble
-      run: ./gradlew assemble
-    - name: Gradle Test
-      run: ./gradlew test
-    - name: Gradle Build
-      run: ./gradlew build publishToMavenLocal
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - run: java -version
   format:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
-      with:
-        java-version: 8
-    - name: Java Linter
-      run: ./gradlew googleJavaFormat
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 8
+  clirr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+      - run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+      - run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
+      - run: .kokoro/build.sh
+        env:
+          JOB_TYPE: clirr
+  units-8:
+    name: units (8) - Maven
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get current week within the year
+        id: date
+        run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 8
+          distribution: temurin
+      - run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: temurin
+      - run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
+      - uses: actions/cache@v3
+        id: mvn-cache
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
+      - run: .kokoro/build.sh
+        env:
+          JOB_TYPE: test
+          JOB_NAME: units-8
+  units-maven:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 11, 17 ]
+    steps:
+      - name: Get current week within the year
+        id: date
+        run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: ${{matrix.java}}
+      - run: java -version
+      - uses: actions/cache@v3
+        id: mvn-cache
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
+      - run: .kokoro/build.sh
+        env:
+          JOB_TYPE: test
+          JOB_NAME: units-${{matrix.java}}
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get current week within the year
+        id: date
+        run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+      - run: java -version
+      - uses: actions/cache@v3
+        id: mvn-cache
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-unified-${{ steps.date.outputs.week_of_year }}
+      - run: java -version
+      - run: mvn -B -ntp com.coveo:fmt-maven-plugin:check
+      - run: mvn -B -ntp checkstyle:check@checkstyle
diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml
@@ -136,7 +136,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-java@v3
       with:
-        distribution: zulu
+        distribution: temurin
         java-version: ${{matrix.java}}
     - run: java -version
     - run: sudo apt-get update -y

diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,5 @@ tmp_gh-pages
 
 # Vim
 *.sw*
+
+target/
diff --git a/.kokoro/build.bat b/.kokoro/build.bat
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -15,11 +15,54 @@
 
 set -eo pipefail
 
-cd github/api-common-java/
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
 
-# Print out Java
+# include common functions
+source ${scriptDir}/common.sh
+
+function setJava() {
+  export JAVA_HOME=$1
+  export PATH=${JAVA_HOME}/bin:$PATH
+}
+
+# This project requires compiling the classes in JDK 11 or higher for GraalVM
+# classes. Compiling this project with Java 8 or earlier would fail with "class
+# file has wrong version 55.0, should be 53.0" and "unrecognized --release 8
+# option" (set in build.gradle).
+if [ ! -z "${JAVA11_HOME}" ]; then
+  setJava "${JAVA11_HOME}"
+fi
+
+echo "Compiling using Java:"
 java -version
-echo $JOB_TYPE
+mvn clean install -B -Dcheckstyle.skip -Dfmt.skip
+
+# We ensure the generated class files are compatible with Java 8
+if [ ! -z "${JAVA8_HOME}" ]; then
+  setJava "${JAVA8_HOME}"
+fi
+
+RETURN_CODE=0
 
-./gradlew assemble
-./gradlew build install
+case ${JOB_TYPE} in
+  test)
+    retry_with_backoff 3 10 \
+      mvn -B -ntp \
+      -Dclirr.skip=true \
+      -Denforcer.skip=true \
+      -Dcheckstyle.skip=true \
+      -Dflatten.skip=true \
+      -Danimal.sniffer.skip=true \
+      -Dmaven.wagon.http.retryHandler.count=5 \
+      test
+    RETURN_CODE=$?
+    ;;
+  clirr)
+    mvn -B -ntp -Denforcer.skip=true clirr:check
+    RETURN_CODE=$?
+    ;;
+  *) ;;
+esac
diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
@@ -23,7 +23,11 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
 ## cd to the parent directory, i.e. the root of the git repo
 cd ${scriptDir}/..
 
-job=$(basename ${KOKORO_JOB_NAME})
+if [ -z "${KOKORO_JOB_NAME}" ]; then
+  job="${JOB_NAME}"
+else
+  job=$(basename ${KOKORO_JOB_NAME})
+fi
 
 echo "coercing sponge logs..."
 for xml in `find . -name *-sponge_log.xml`

diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg
diff --git a/.kokoro/continuous/java11.cfg b/.kokoro/continuous/java11.cfg
diff --git a/.kokoro/continuous/java7.cfg b/.kokoro/continuous/java7.cfg
diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg