diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 74090051c..0df65ebe9 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
docker:
- image: gcr.io/repo-automation-bots/owlbot-java:latest
- digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa
+ image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
+ digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 61071320f..1770da414 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -9,7 +9,6 @@ branchProtectionRules:
requiresStrictStatusChecks: false
requiredStatusCheckContexts:
- checkstyle
- - units (7)
- units (8)
- units (11)
- dependencies (8)
@@ -24,7 +23,6 @@ branchProtectionRules:
requiresStrictStatusChecks: false
requiredStatusCheckContexts:
- checkstyle
- - units (7)
- units (8)
- units (11)
- dependencies (8)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c24b111db..d842f99d8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [7, 8, 11]
+ java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
@@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [8, 11]
+ java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
@@ -50,7 +50,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
- java-version: 8
+ java-version: 11
- run: java -version
- run: .kokoro/build.sh
env:
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index f839c4521..6055e87c0 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -36,9 +36,13 @@ mvn clean install -B -q -DskipTests=true
export NAME=google-oauth-client
export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
-# cloud RAD generation
-mvn clean javadoc:aggregate -B -q -P docFX
-# include CHANGELOG
+# V3 generates docfx yml from javadoc
+# generate yml
+mvn clean site -B -q -P docFX
+
+# copy README to docfx-yml dir and rename index.md
+cp README.md target/docfx-yml/index.md
+# copy CHANGELOG to docfx-yml dir and rename history.md
cp CHANGELOG.md target/docfx-yml/history.md
pushd target/docfx-yml
diff --git a/pom.xml b/pom.xml
index 900692ba2..640eed580 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,6 +174,16 @@
datanucleus-rdbms
${project.datanucleus-rdbms.version}
+
+ com.google.auto.service
+ ${project.auto-service-annotations.version}
+ 1.0
+
+
+ com.google.auto.value
+ ${project.auto-value-annotations.version}
+ 1.8.2
+
@@ -463,7 +473,7 @@
UTF-8
1.40.1
3.0.2
- 30.1-android
+ 31.0-android
1.1.4c
1.1.1
2.3-eb
@@ -473,6 +483,8 @@
3.2.13
4.0.5
2.5
+ 1.8.2
+ 1.0
false