diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 0000000000..445b4bf82f
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,76 @@
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+name: ci
+jobs:
+ units:
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ java: [7, 8, 11]
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: ${{matrix.java}}
+ - run: java -version
+ - run: .kokoro/build.sh
+ env:
+ JOB_TYPE: test
+ - name: coverage
+ uses: codecov/codecov-action@v1
+ with:
+ name: actions ${{matrix.java}}
+ windows:
+ runs-on: windows-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 8
+ - run: java -version
+ - run: .kokoro/build.bat
+ env:
+ JOB_TYPE: test
+ dependencies:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 8
+ - run: java -version
+ - run: .kokoro/dependencies.sh
+ linkage-monitor:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 8
+ - run: java -version
+ - run: .kokoro/linkage-monitor.sh
+ lint:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 8
+ - run: java -version
+ - run: .kokoro/build.sh
+ env:
+ JOB_TYPE: lint
+ clirr:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 8
+ - run: java -version
+ - run: .kokoro/build.sh
+ env:
+ JOB_TYPE: clirr
\ No newline at end of file
diff --git a/.kokoro/build.bat b/.kokoro/build.bat
index bcca1f45d0..05826ad93f 100644
--- a/.kokoro/build.bat
+++ b/.kokoro/build.bat
@@ -1,3 +1,3 @@
:: See documentation in type-shell-output.bat
-"C:\Program Files\Git\bin\bash.exe" github/java-core/.kokoro/build.sh
+"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh
diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index a3bbc5f679..a8d0ea04d3 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -13,18 +13,28 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# set -eo pipefail
-
function retry_with_backoff {
attempts_left=$1
sleep_seconds=$2
shift 2
command=$@
+
+ # store current flag state
+ flags=$-
+
+ # allow a failures to continue
+ set +e
echo "${command}"
${command}
exit_code=$?
+ # restore "e" flag
+ if [[ ${flags} =~ e ]]
+ then set -e
+ else set +e
+ fi
+
if [[ $exit_code == 0 ]]
then
return 0
@@ -42,3 +52,8 @@ function retry_with_backoff {
return $exit_code
}
+
+## Helper functionss
+function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
+function msg() { println "$*" >&2; }
+function println() { printf '%s\n' "$(now) $*"; }
\ No newline at end of file
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 0aade871ce..cf3bb4347e 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -36,3 +36,51 @@ retry_with_backoff 3 10 \
-Dclirr.skip=true
mvn -B dependency:analyze -DfailOnWarning=true
+
+echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
+## Run dependency list completeness check
+function completenessCheck() {
+ # Output dep list with compile scope generated using the original pom
+ msg "Generating dependency list using original pom..."
+ mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt
+
+ # Output dep list generated using the flattened pom (test scope deps are ommitted)
+ msg "Generating dependency list using flattened pom..."
+ mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt
+
+ # Compare two dependency lists
+ msg "Comparing dependency lists..."
+ diff .org-list.txt .new-list.txt >.diff.txt
+ if [[ $? == 0 ]]
+ then
+ msg "Success. No diff!"
+ else
+ msg "Diff found. See below: "
+ msg "You can also check .diff.txt file located in $1."
+ cat .diff.txt
+ return 1
+ fi
+}
+
+# Allow failures to continue running the script
+set +e
+
+error_count=0
+for path in $(find -name ".flattened-pom.xml")
+do
+ # Check flattened pom in each dir that contains it for completeness
+ dir=$(dirname "$path")
+ pushd "$dir"
+ completenessCheck "$dir"
+ error_count=$(($error_count + $?))
+ popd
+done
+
+if [[ $error_count == 0 ]]
+then
+ msg "All checks passed."
+ exit 0
+else
+ msg "Errors found. See log statements above."
+ exit 1
+fi
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index 8bf59c02ed..40c4abb7bf 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -6,11 +6,31 @@ env_vars: {
value: "gcr.io/cloud-devrel-kokoro-resources/java8"
}
+env_vars: {
+ key: "JOB_TYPE"
+ value: "integration"
+}
+# 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: "ENABLE_BUILD_COP"
value: "true"
}
+env_vars: {
+ key: "GOOGLE_APPLICATION_CREDENTIALS"
+ value: "keystore/73713_java_it_service_account"
+}
+
before_action {
fetch_keystore {
keystore_resource {
diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg
index b4b051cd01..20aabd55de 100644
--- a/.kokoro/nightly/samples.cfg
+++ b/.kokoro/nightly/samples.cfg
@@ -11,9 +11,15 @@ env_vars: {
value: "samples"
}
+# TODO: remove this after we've migrated all tests and scripts
env_vars: {
key: "GCLOUD_PROJECT"
- value: "gcloud-devel"
+ value: "java-docs-samples-testing"
+}
+
+env_vars: {
+ key: "GOOGLE_CLOUD_PROJECT"
+ value: "java-docs-samples-testing"
}
env_vars: {
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
index 141f90c13c..522e5b1010 100644
--- a/.kokoro/presubmit/integration.cfg
+++ b/.kokoro/presubmit/integration.cfg
@@ -11,14 +11,20 @@ env_vars: {
value: "integration"
}
+# TODO: remove this after we've migrated all tests and scripts
env_vars: {
- key: "GCLOUD_PROJECT"
- value: "gcloud-devel"
+ key: "GCLOUD_PROJECT"
+ value: "gcloud-devel"
}
env_vars: {
- key: "GOOGLE_APPLICATION_CREDENTIALS"
- value: "keystore/73713_java_it_service_account"
+ key: "GOOGLE_CLOUD_PROJECT"
+ value: "gcloud-devel"
+}
+
+env_vars: {
+ key: "GOOGLE_APPLICATION_CREDENTIALS"
+ value: "keystore/73713_java_it_service_account"
}
before_action {
diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg
index fa7b493d0b..1171aead01 100644
--- a/.kokoro/presubmit/samples.cfg
+++ b/.kokoro/presubmit/samples.cfg
@@ -11,14 +11,20 @@ env_vars: {
value: "samples"
}
+# TODO: remove this after we've migrated all tests and scripts
env_vars: {
- key: "GCLOUD_PROJECT"
- value: "gcloud-devel"
+ key: "GCLOUD_PROJECT"
+ value: "java-docs-samples-testing"
}
env_vars: {
- key: "GOOGLE_APPLICATION_CREDENTIALS"
- value: "keystore/73713_java_it_service_account"
+ key: "GOOGLE_CLOUD_PROJECT"
+ value: "java-docs-samples-testing"
+}
+
+env_vars: {
+ key: "GOOGLE_APPLICATION_CREDENTIALS"
+ value: "keystore/73713_java_it_service_account"
}
before_action {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38aa044c32..e920b3f352 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
# Changelog
+### [1.93.5](https://www.github.com/googleapis/java-core/compare/v1.93.4...v1.93.5) (2020-05-26)
+
+
+### Dependencies
+
+* rely on shared-config for auto-value configuration ([#222](https://www.github.com/googleapis/java-core/issues/222)) ([22adbcf](https://www.github.com/googleapis/java-core/commit/22adbcf307cf5ef4819bad9afa91c4c83a9f31bb))
+* update dependency com.google.api.grpc:proto-google-common-protos to v1.18.0 ([#215](https://www.github.com/googleapis/java-core/issues/215)) ([488a351](https://www.github.com/googleapis/java-core/commit/488a351ab41adafb1d969740bfbd3a6d2ddfd36d))
+* update dependency com.google.guava:guava-bom to v29 ([#205](https://www.github.com/googleapis/java-core/issues/205)) ([48d3f97](https://www.github.com/googleapis/java-core/commit/48d3f970bd931ee5f04205ab939c318c69cbcf3f))
+* update dependency com.google.http-client:google-http-client-bom to v1.35.0 ([#211](https://www.github.com/googleapis/java-core/issues/211)) ([e56b3ef](https://www.github.com/googleapis/java-core/commit/e56b3ef0e2ea5c96b36f8aae851fd26efe1337c1))
+* update dependency com.google.protobuf:protobuf-bom to v3.12.0 ([#218](https://www.github.com/googleapis/java-core/issues/218)) ([b2c6f15](https://www.github.com/googleapis/java-core/commit/b2c6f15ae63302dbeea16ecb7d7b89404907516f))
+* update dependency io.grpc:grpc-bom to v1.29.0 ([#209](https://www.github.com/googleapis/java-core/issues/209)) ([e63cb7c](https://www.github.com/googleapis/java-core/commit/e63cb7ca69e49afae50af1f2cf4fe3601984be49))
+* update dependency org.threeten:threetenbp to v1.4.4 ([#210](https://www.github.com/googleapis/java-core/issues/210)) ([a837fa4](https://www.github.com/googleapis/java-core/commit/a837fa441fbbf83494709b1779e0ef35ef13b345))
+
### [1.93.4](https://www.github.com/googleapis/java-core/compare/v1.93.3...v1.93.4) (2020-04-06)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 085021ddec..f2dbdee06b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -99,7 +99,16 @@ mvn -Penable-samples clean verify
```
2. [Activate](#profile-activation) the profile.
-3. Define your samples in a normal Maven project in the `samples/` directory
+3. Define your samples in a normal Maven project in the `samples/` directory.
+
+### Code Formatting
+
+Code in this repo is formatted with
+[google-java-format](https://github.com/google/google-java-format).
+To run formatting on your project, you can run:
+```
+mvn com.coveo:fmt-maven-plugin:format
+```
### Profile Activation
diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml
index ca23bfd8f2..1f643f7d04 100644
--- a/google-cloud-core-bom/pom.xml
+++ b/google-cloud-core-bom/pom.xml
@@ -3,12 +3,12 @@
4.0.0
com.google.cloud
google-cloud-core-bom
- 1.93.4
+ 1.93.5
pom
com.google.cloud
google-cloud-shared-config
- 0.4.0
+ 0.6.0
Google Cloud Core
@@ -63,17 +63,17 @@
com.google.cloud
google-cloud-core
- 1.93.4
+ 1.93.5
com.google.cloud
google-cloud-core-grpc
- 1.93.4
+ 1.93.5
com.google.cloud
google-cloud-core-http
- 1.93.4
+ 1.93.5
diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml
index 0fe7b36e71..713de0c0f8 100644
--- a/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-core-grpc/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-core-grpc
- 1.93.4
+ 1.93.5
jar
Google Cloud Core gRPC
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 1.93.4
+ 1.93.5
google-cloud-core-grpc
@@ -66,10 +66,5 @@
easymock
test
-
- org.objenesis
- objenesis
- test
-
diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml
index 3a2272be1d..514e94a15b 100644
--- a/google-cloud-core-http/pom.xml
+++ b/google-cloud-core-http/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-core-http
- 1.93.4
+ 1.93.5
jar
Google Cloud Core HTTP
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 1.93.4
+ 1.93.5
google-cloud-core-http
@@ -83,11 +83,6 @@
easymock
test
-
- org.objenesis
- objenesis
- test
-
com.google.truth
truth
diff --git a/google-cloud-core/EnableAutoValue.txt b/google-cloud-core/EnableAutoValue.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml
index 0d0aaa533a..84cd43bda9 100644
--- a/google-cloud-core/pom.xml
+++ b/google-cloud-core/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-core
- 1.93.4
+ 1.93.5
jar
Google Cloud Core
https://github.com/googleapis/java-core
@@ -13,7 +13,7 @@
com.google.cloud
google-cloud-core-parent
- 1.93.4
+ 1.93.5
google-cloud-core
@@ -82,11 +82,6 @@
easymock
test
-
- org.objenesis
- objenesis
- test
-
com.google.code.findbugs
jsr305
diff --git a/pom.xml b/pom.xml
index b6eec20a4c..97d39277be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-core-parent
pom
- 1.93.4
+ 1.93.5
Google Cloud Core Parent
https://github.com/googleapis/java-core
@@ -14,7 +14,7 @@
com.google.cloud
google-cloud-shared-config
- 0.4.0
+ 0.6.0
@@ -151,25 +151,23 @@
UTF-8
github
google-cloud-core-parent
- 1.7
- 1.7
1.56.0
1.9.0
- 1.17.0
+ 1.18.0
0.13.0
0.20.0
1.30.9
- 1.34.2
- 1.28.1
- 3.11.4
+ 1.35.0
+ 1.29.0
+ 3.12.0
0.24.0
1.3.2
- 28.2-android
+ 29.0-android
4.13
1.0.1
3.6
3.0.2
- 1.4.3
+ 1.4.4
2.6
2.3.4
2.8.6
@@ -232,12 +230,6 @@
pom
import
-
- com.google.auto.value
- auto-value-annotations
- ${auto-value-annotations.version}
- true
-
com.google.api
api-common
@@ -319,33 +311,6 @@
-
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
- org.objenesis:objenesis
-
-
-
- maven-compiler-plugin
-
-
-
- com.google.auto.value
- auto-value
- ${auto-value.version}
-
-
-
-
-
-
-
-
-
google-cloud-core
google-cloud-core-http
diff --git a/synth.metadata b/synth.metadata
index 833650b1e4..522d580091 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,11 +1,17 @@
{
- "updateTime": "2020-03-25T23:35:19.763220Z",
"sources": [
+ {
+ "git": {
+ "name": ".",
+ "remote": "https://github.com/googleapis/java-core.git",
+ "sha": "e4a04a2486474fef30584c2067e0afd7f8dbb613"
+ }
+ },
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8"
+ "sha": "5b48b0716a36ca069db3038da7e205c87a22ed19"
}
}
]
diff --git a/versions.txt b/versions.txt
index b86cb48d8e..c86d5144e3 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-core:1.93.4:1.93.4
\ No newline at end of file
+google-cloud-core:1.93.5:1.93.5
\ No newline at end of file