diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
new file mode 100644
index 00000000..dd929fc8
--- /dev/null
+++ b/.github/.OwlBot.lock.yaml
@@ -0,0 +1,3 @@
+docker:
+ image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
+ digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8
\ No newline at end of file
diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
new file mode 100644
index 00000000..b298a79f
--- /dev/null
+++ b/.github/.OwlBot.yaml
@@ -0,0 +1,18 @@
+
+
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+docker:
+ image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
\ No newline at end of file
diff --git a/.github/release-please.yml b/.github/release-please.yml
index b13f3c0c..a42423b4 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -6,3 +6,11 @@ branches:
handleGHRelease: true
bumpMinorPreMajor: true
branch: java7
+ - releaseType: java-backport
+ handleGHRelease: true
+ bumpMinorPreMajor: true
+ branch: 2.4.x
+ - releaseType: java-backport
+ handleGHRelease: true
+ bumpMinorPreMajor: true
+ branch: 0.20.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 215f962a..2d2cdbce 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -47,6 +47,46 @@ branchProtectionRules:
- dependencies (11, java-storage)
- dependencies (11, java-pubsub)
- cla/google
+ - pattern: 2.4.x
+ isAdminEnforced: true
+ requiredApprovingReviewCount: 1
+ requiresCodeOwnerReviews: true
+ requiresStrictStatusChecks: false
+ requiredStatusCheckContexts:
+ - dependencies (8)
+ - dependencies (11)
+ - lint
+ - clirr
+ - units (8)
+ - units (11)
+ - 'Kokoro - Test: Integration'
+ - dependencies (8, java-bigqueryconnection)
+ - dependencies (8, java-storage)
+ - dependencies (8, java-pubsub)
+ - dependencies (11, java-bigqueryconnection)
+ - dependencies (11, java-storage)
+ - dependencies (11, java-pubsub)
+ - cla/google
+ - pattern: 0.20.x
+ isAdminEnforced: true
+ requiredApprovingReviewCount: 1
+ requiresCodeOwnerReviews: true
+ requiresStrictStatusChecks: false
+ requiredStatusCheckContexts:
+ - dependencies (8)
+ - dependencies (11)
+ - lint
+ - clirr
+ - units (8)
+ - units (11)
+ - 'Kokoro - Test: Integration'
+ - dependencies (8, java-bigqueryconnection)
+ - dependencies (8, java-storage)
+ - dependencies (8, java-pubsub)
+ - dependencies (11, java-bigqueryconnection)
+ - dependencies (11, java-storage)
+ - dependencies (11, java-pubsub)
+ - cla/google
permissionRules:
- team: yoshi-admins
permission: admin
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2425d723..05de1f60 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,13 +8,11 @@ jobs:
units:
runs-on: ubuntu-latest
strategy:
+ fail-fast: false
matrix:
java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- - uses: stCarolas/setup-maven@v4
- with:
- maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
@@ -27,9 +25,6 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- - uses: stCarolas/setup-maven@v4
- with:
- maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
@@ -45,9 +40,6 @@ jobs:
java: [8, 11, 17]
steps:
- uses: actions/checkout@v2
- - uses: stCarolas/setup-maven@v4
- with:
- maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
@@ -58,13 +50,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - uses: stCarolas/setup-maven@v4
- with:
- maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
- java-version: 8
+ java-version: 11
- run: java -version
- run: .kokoro/build.sh
env:
@@ -73,9 +62,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- - uses: stCarolas/setup-maven@v4
- with:
- maven-version: 3.8.1
- uses: actions/setup-java@v2
with:
distribution: zulu
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index a0ff7e37..5f5bed07 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -69,6 +69,11 @@ integration)
verify
RETURN_CODE=$?
;;
+graalvm)
+ # Run Unit and Integration Tests with Native Image
+ mvn test -Pnative -Penable-integration-tests
+ RETURN_CODE=$?
+ ;;
samples)
SAMPLES_DIR=samples
# only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9a5105d7..d7476cfe 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -38,15 +38,13 @@ function determineMavenOpts() {
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
)
- case $javaVersion in
- "17")
+ if [[ $javaVersion == 17* ]]
+ then
# MaxPermSize is no longer supported as of jdk 17
echo -n "-Xmx1024m"
- ;;
- *)
+ else
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
- ;;
- esac
+ fi
}
export MAVEN_OPTS=$(determineMavenOpts)
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
new file mode 100644
index 00000000..4c7225ec
--- /dev/null
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+ key: "TRAMPOLINE_IMAGE"
+ value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
+}
+
+env_vars: {
+ key: "JOB_TYPE"
+ value: "graalvm"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+ key: "GCLOUD_PROJECT"
+ value: "gcloud-devel"
+}
+
+env_vars: {
+ key: "GOOGLE_CLOUD_PROJECT"
+ value: "gcloud-devel"
+}
+
+env_vars: {
+ key: "GOOGLE_APPLICATION_CREDENTIALS"
+ value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+ key: "SECRET_MANAGER_KEYS"
+ value: "java-it-service-account"
+}
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
index 4a61df78..212ccdcf 100755
--- a/.kokoro/release/publish_javadoc11.sh
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true
export NAME=google-cloud-shared-dependencies
export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
-# 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
+# cloud RAD generation
+mvn clean javadoc:aggregate -B -q -P docFX
+# include CHANGELOG
cp CHANGELOG.md target/docfx-yml/history.md
pushd target/docfx-yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c179bf9d..0c4cc3d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
# Changelog
+## [2.5.0](https://www.github.com/googleapis/java-shared-dependencies/compare/2.4.0...v2.5.0) (2021-11-12)
+
+
+### Features
+
+* next release from main branch is 2.5.0 ([#510](https://www.github.com/googleapis/java-shared-dependencies/issues/510)) ([ca9eb8a](https://www.github.com/googleapis/java-shared-dependencies/commit/ca9eb8a40ae81d69de0d82d9499ef21b0136ae49))
+
+
+### Bug Fixes
+
+* dependencies.sh to work with Java 17 ([#516](https://www.github.com/googleapis/java-shared-dependencies/issues/516)) ([8422c1d](https://www.github.com/googleapis/java-shared-dependencies/commit/8422c1d7e9ef479f348e63c530789050b5235426))
+
+
+### Dependencies
+
+* update dependency com.google.api:api-common to v2.1.0 ([#508](https://www.github.com/googleapis/java-shared-dependencies/issues/508)) ([ae32d16](https://www.github.com/googleapis/java-shared-dependencies/commit/ae32d1689c78fc1469206c8c0df0ebaca59edd2c))
+* update dependency com.google.auth:google-auth-library-bom to v1.2.2 ([#506](https://www.github.com/googleapis/java-shared-dependencies/issues/506)) ([b9a8209](https://www.github.com/googleapis/java-shared-dependencies/commit/b9a82098655f29e858bd0c7a9b1049a379e5062a))
+* update dependency com.google.auth:google-auth-library-bom to v1.3.0 ([#524](https://www.github.com/googleapis/java-shared-dependencies/issues/524)) ([fc07879](https://www.github.com/googleapis/java-shared-dependencies/commit/fc07879fa6531e39b21977fe77abc19354a1fd33))
+* update dependency com.google.code.gson:gson to v2.8.9 ([#509](https://www.github.com/googleapis/java-shared-dependencies/issues/509)) ([bece99b](https://www.github.com/googleapis/java-shared-dependencies/commit/bece99bb3e0365e60e7376ba18d046ab6436a235))
+* update dependency com.google.errorprone:error_prone_annotations to v2.10.0 ([#512](https://www.github.com/googleapis/java-shared-dependencies/issues/512)) ([c281f13](https://www.github.com/googleapis/java-shared-dependencies/commit/c281f137525e2111e97349657be578ed1fc832f2))
+* update dependency com.google.protobuf:protobuf-bom to v3.19.1 ([#505](https://www.github.com/googleapis/java-shared-dependencies/issues/505)) ([94cde96](https://www.github.com/googleapis/java-shared-dependencies/commit/94cde96069900f9f8c2ff9a522671d03b26828bd))
+* update dependency io.grpc:grpc-bom to v1.42.1 ([#513](https://www.github.com/googleapis/java-shared-dependencies/issues/513)) ([0d2b774](https://www.github.com/googleapis/java-shared-dependencies/commit/0d2b774287a132821cc6fe2789140086bc48d525))
+* update dependency org.checkerframework:checker-qual to v3.19.0 ([#501](https://www.github.com/googleapis/java-shared-dependencies/issues/501)) ([2b3e0b5](https://www.github.com/googleapis/java-shared-dependencies/commit/2b3e0b5ddc3a645b20a837f3123394f1ca114f08))
+* update dependency org.threeten:threetenbp to v1.5.2 ([#514](https://www.github.com/googleapis/java-shared-dependencies/issues/514)) ([4885f40](https://www.github.com/googleapis/java-shared-dependencies/commit/4885f402e2c70435cd10d4f1b893df9873808c56))
+* update gax.version to v2.7.0 ([#515](https://www.github.com/googleapis/java-shared-dependencies/issues/515)) ([567e728](https://www.github.com/googleapis/java-shared-dependencies/commit/567e728b0e59233a04e2d04183e6a0c36cca2437))
+* update google.core.version to v2.3.0 ([#530](https://www.github.com/googleapis/java-shared-dependencies/issues/530)) ([78e87e9](https://www.github.com/googleapis/java-shared-dependencies/commit/78e87e96befab34dc4a494e752aeb473cd14a156))
+* update iam.version to v1.1.7 ([#504](https://www.github.com/googleapis/java-shared-dependencies/issues/504)) ([63dd583](https://www.github.com/googleapis/java-shared-dependencies/commit/63dd583c80f35b01a66fd1908d41467468c66436))
+
## [2.4.0](https://www.github.com/googleapis/java-shared-dependencies/compare/2.3.0...v2.4.0) (2021-10-18)
diff --git a/README.md b/README.md
index a199c18e..381b87ff 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ If you are using Maven, add this to the `dependencyManagement` section.
com.google.cloud
google-cloud-shared-dependencies
- 2.4.0
+ 2.5.0
pom
import
diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml
index dd9e651e..d32ae786 100644
--- a/first-party-dependencies/pom.xml
+++ b/first-party-dependencies/pom.xml
@@ -6,7 +6,7 @@
com.google.cloud
first-party-dependencies
pom
- 2.4.0
+ 2.5.0
Google Cloud First-party Shared Dependencies
https://github.com/googleapis/java-shared-dependencies
@@ -16,7 +16,7 @@
com.google.cloud
google-cloud-shared-config
- 1.1.0
+ 1.2.1
@@ -55,19 +55,19 @@
UTF-8
${project.artifactId}
- 1.41.0
- 2.6.1
+ 1.42.1
+ 2.7.0
1.1.0
31.0.1-jre
- 3.18.1
- 2.0.5
+ 3.19.1
+ 2.1.0
2.6.0
- 2.2.0
- 1.2.1
+ 2.3.0
+ 1.3.0
1.40.1
1.32.1
1.32.2
- 1.1.6
+ 1.1.7
diff --git a/synth.py b/owlbot.py
similarity index 100%
rename from synth.py
rename to owlbot.py
diff --git a/pom.xml b/pom.xml
index 98586f72..852e5e45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-shared-dependencies
pom
- 2.4.0
+ 2.5.0
first-party-dependencies
third-party-dependencies
@@ -18,7 +18,7 @@
com.google.cloud
google-cloud-shared-config
- 1.1.0
+ 1.2.1
@@ -65,14 +65,14 @@
com.google.cloud
first-party-dependencies
- 2.4.0
+ 2.5.0
pom
import
com.google.cloud
third-party-dependencies
- 2.4.0
+ 2.5.0
pom
import
diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml
index 0b855086..748e3e66 100644
--- a/third-party-dependencies/pom.xml
+++ b/third-party-dependencies/pom.xml
@@ -6,7 +6,7 @@
com.google.cloud
third-party-dependencies
pom
- 2.4.0
+ 2.5.0
Google Cloud Third-party Shared Dependencies
https://github.com/googleapis/java-shared-dependencies
@@ -16,7 +16,7 @@
com.google.cloud
google-cloud-shared-config
- 1.1.0
+ 1.2.1
@@ -57,19 +57,19 @@
UTF-8
${project.artifactId}
- 2.8.8
- 1.5.1
+ 2.8.9
+ 1.5.2
1.3.2
1.20
0.28.0
3.0.2
- 2.9.0
+ 2.10.0
2.13.0
1.15
4.4.14
4.5.13
- 3.12.0
+ 3.19.0
diff --git a/upper-bound-check/pom.xml b/upper-bound-check/pom.xml
index 287ae145..843b4b99 100644
--- a/upper-bound-check/pom.xml
+++ b/upper-bound-check/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
shared-dependencies-upper-bound-test
pom
- 2.4.0
+ 2.5.0
Upper bound test for Google Cloud Shared Dependencies
https://github.com/googleapis/java-shared-dependencies
@@ -17,7 +17,7 @@
com.google.cloud
google-cloud-shared-config
- 1.1.0
+ 1.2.1
@@ -53,7 +53,7 @@
com.google.cloud
google-cloud-shared-dependencies
- 2.4.0
+ 2.5.0
pom
import
diff --git a/versions.txt b/versions.txt
index a8de9607..053f29f3 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-shared-dependencies:2.4.0:2.4.0
\ No newline at end of file
+google-cloud-shared-dependencies:2.5.0:2.5.0
\ No newline at end of file