diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 3f7432a5..91c0ea20 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:12cbdc4f137152a1a8b83f50ebc1a4098be0d3baff78b46efaec306f7cfafd13 + digest: sha256:4837f2a7fdff2985b4f7432f8a6d6a87beacebf3ac071746532c0ce2e3f24b9b diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml new file mode 100644 index 00000000..d4ca9418 --- /dev/null +++ b/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index ffd39f6f..32e0ea5a 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -10,7 +10,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (8) @@ -26,7 +25,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (7) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65ae6ecd..e23d923e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -37,28 +40,21 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} - 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 - - name: Install artifacts to local Maven repository - run: .kokoro/build.sh - shell: bash - - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release) - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -70,10 +66,13 @@ 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@v1 with: java-version: 8 - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr + JOB_TYPE: clirr \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index f2dab759..6135618f 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -115,7 +115,7 @@ fi # fix output location of logs bash .kokoro/coerce_logs.sh -if [[ "${ENABLE_BUILD_COP}" == "true" ]] +if [[ "${ENABLE_FLAKYBOT}" == "true" ]] then chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-network-management diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 0048c8ec..e51c7b4c 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -22,7 +22,7 @@ env_vars: { } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index f2542931..9761fd86 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -33,6 +33,6 @@ env_vars: { } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 89fe779f..b51490cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.1.0](https://www.github.com/googleapis/java-network-management/compare/v1.0.0...v1.1.0) (2021-09-03) + + +### Features + +* Remove use of deprecated gradle command in java README ([#1196](https://www.github.com/googleapis/java-network-management/issues/1196)) ([#43](https://www.github.com/googleapis/java-network-management/issues/43)) ([d773a95](https://www.github.com/googleapis/java-network-management/commit/d773a957fd1a31504a2f410e38fa63eb715b11cb)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.0.1 ([#35](https://www.github.com/googleapis/java-network-management/issues/35)) ([17e2158](https://www.github.com/googleapis/java-network-management/commit/17e2158d1fdc6a076220ea5f220c96517f5fd9b0)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.1.0 ([#39](https://www.github.com/googleapis/java-network-management/issues/39)) ([fa1e318](https://www.github.com/googleapis/java-network-management/commit/fa1e3180bec2c03a89eaac8be6bf04ba8e6665d3)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#45](https://www.github.com/googleapis/java-network-management/issues/45)) ([50d62f5](https://www.github.com/googleapis/java-network-management/commit/50d62f54a47cbd977c80550b7ab7d947a2fce7f0)) + ## [1.0.0](https://www.github.com/googleapis/java-network-management/compare/v0.1.0...v1.0.0) (2021-08-10) diff --git a/README.md b/README.md index 5145330a..e177da9c 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-network-management - 0.1.0 + 1.0.0 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-network-management:0.1.0' +implementation 'com.google.cloud:google-cloud-network-management:1.0.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-network-management" % "0.1.0" +libraryDependencies += "com.google.cloud" % "google-cloud-network-management" % "1.0.0" ``` ## Authentication diff --git a/google-cloud-network-management-bom/pom.xml b/google-cloud-network-management-bom/pom.xml index 1fbda1b9..a6bc7a6e 100644 --- a/google-cloud-network-management-bom/pom.xml +++ b/google-cloud-network-management-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-network-management-bom - 1.0.0 + 1.1.0 pom com.google.cloud google-cloud-shared-config - 1.0.0 + 1.0.1 Google Network Management API BOM @@ -56,27 +56,27 @@ com.google.cloud google-cloud-network-management - 1.0.0 + 1.1.0 com.google.api.grpc grpc-google-cloud-network-management-v1beta1 - 0.2.0 + 0.3.0 com.google.api.grpc grpc-google-cloud-network-management-v1 - 1.0.0 + 1.1.0 com.google.api.grpc proto-google-cloud-network-management-v1beta1 - 0.2.0 + 0.3.0 com.google.api.grpc proto-google-cloud-network-management-v1 - 1.0.0 + 1.1.0 diff --git a/google-cloud-network-management/pom.xml b/google-cloud-network-management/pom.xml index 015b8180..8f6688d9 100644 --- a/google-cloud-network-management/pom.xml +++ b/google-cloud-network-management/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-network-management - 1.0.0 + 1.1.0 jar Google Network Management API https://github.com/googleapis/java-network-management @@ -11,7 +11,7 @@ com.google.cloud google-cloud-network-management-parent - 1.0.0 + 1.1.0 google-cloud-network-management diff --git a/google-cloud-network-management/src/main/java/com/google/cloud/networkmanagement/v1/stub/ReachabilityServiceStubSettings.java b/google-cloud-network-management/src/main/java/com/google/cloud/networkmanagement/v1/stub/ReachabilityServiceStubSettings.java index 85d80dfd..b0165969 100644 --- a/google-cloud-network-management/src/main/java/com/google/cloud/networkmanagement/v1/stub/ReachabilityServiceStubSettings.java +++ b/google-cloud-network-management/src/main/java/com/google/cloud/networkmanagement/v1/stub/ReachabilityServiceStubSettings.java @@ -293,7 +293,9 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/google-cloud-network-management/src/main/java/com/google/cloud/networkmanagement/v1beta1/stub/ReachabilityServiceStubSettings.java b/google-cloud-network-management/src/main/java/com/google/cloud/networkmanagement/v1beta1/stub/ReachabilityServiceStubSettings.java index 83e35304..82dc154a 100644 --- a/google-cloud-network-management/src/main/java/com/google/cloud/networkmanagement/v1beta1/stub/ReachabilityServiceStubSettings.java +++ b/google-cloud-network-management/src/main/java/com/google/cloud/networkmanagement/v1beta1/stub/ReachabilityServiceStubSettings.java @@ -294,7 +294,9 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/grpc-google-cloud-network-management-v1/pom.xml b/grpc-google-cloud-network-management-v1/pom.xml index 7f906ccd..f493d8cd 100644 --- a/grpc-google-cloud-network-management-v1/pom.xml +++ b/grpc-google-cloud-network-management-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-network-management-v1 - 1.0.0 + 1.1.0 grpc-google-cloud-network-management-v1 GRPC library for google-cloud-network-management com.google.cloud google-cloud-network-management-parent - 1.0.0 + 1.1.0 diff --git a/grpc-google-cloud-network-management-v1beta1/pom.xml b/grpc-google-cloud-network-management-v1beta1/pom.xml index 79cd7deb..c4d6d7de 100644 --- a/grpc-google-cloud-network-management-v1beta1/pom.xml +++ b/grpc-google-cloud-network-management-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-network-management-v1beta1 - 0.2.0 + 0.3.0 grpc-google-cloud-network-management-v1beta1 GRPC library for google-cloud-network-management com.google.cloud google-cloud-network-management-parent - 1.0.0 + 1.1.0 diff --git a/pom.xml b/pom.xml index 675371e1..807de01f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-network-management-parent pom - 1.0.0 + 1.1.0 Google Network Management API Parent https://github.com/googleapis/java-network-management @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.0.0 + 1.0.1 @@ -69,33 +69,33 @@ com.google.cloud google-cloud-network-management - 1.0.0 + 1.1.0 com.google.api.grpc grpc-google-cloud-network-management-v1beta1 - 0.2.0 + 0.3.0 com.google.api.grpc grpc-google-cloud-network-management-v1 - 1.0.0 + 1.1.0 com.google.api.grpc proto-google-cloud-network-management-v1beta1 - 0.2.0 + 0.3.0 com.google.api.grpc proto-google-cloud-network-management-v1 - 1.0.0 + 1.1.0 com.google.cloud google-cloud-shared-dependencies - 2.0.0 + 2.2.0 pom import diff --git a/proto-google-cloud-network-management-v1/clirr-ignored-differences.xml b/proto-google-cloud-network-management-v1/clirr-ignored-differences.xml index b74a8683..8b51d97e 100644 --- a/proto-google-cloud-network-management-v1/clirr-ignored-differences.xml +++ b/proto-google-cloud-network-management-v1/clirr-ignored-differences.xml @@ -16,8 +16,4 @@ com/google/cloud/networkmanagement/v1/*OrBuilder boolean has*(*) - - 8001 - com/google/cloud/networkmanagement/v1/ConnectivityTestName* - diff --git a/proto-google-cloud-network-management-v1/pom.xml b/proto-google-cloud-network-management-v1/pom.xml index 6324d119..c283f56e 100644 --- a/proto-google-cloud-network-management-v1/pom.xml +++ b/proto-google-cloud-network-management-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-network-management-v1 - 1.0.0 + 1.1.0 proto-google-cloud-network-management-v1 Proto library for google-cloud-network-management com.google.cloud google-cloud-network-management-parent - 1.0.0 + 1.1.0 diff --git a/proto-google-cloud-network-management-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-network-management-v1beta1/clirr-ignored-differences.xml index e0accd1a..b38e8a09 100644 --- a/proto-google-cloud-network-management-v1beta1/clirr-ignored-differences.xml +++ b/proto-google-cloud-network-management-v1beta1/clirr-ignored-differences.xml @@ -16,8 +16,4 @@ com/google/cloud/networkmanagement/v1beta1/*OrBuilder boolean has*(*) - - 8001 - com/google/cloud/networkmanagement/v1beta1/ConnectivityTestName* - diff --git a/proto-google-cloud-network-management-v1beta1/pom.xml b/proto-google-cloud-network-management-v1beta1/pom.xml index eebc7d28..210f3f8a 100644 --- a/proto-google-cloud-network-management-v1beta1/pom.xml +++ b/proto-google-cloud-network-management-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-network-management-v1beta1 - 0.2.0 + 0.3.0 proto-google-cloud-network-management-v1beta1 Proto library for google-cloud-network-management com.google.cloud google-cloud-network-management-parent - 1.0.0 + 1.1.0 diff --git a/renovate.json b/renovate.json index d8d9c482..0cd96708 100644 --- a/renovate.json +++ b/renovate.json @@ -50,7 +50,8 @@ "^junit:junit", "^com.google.truth:truth", "^org.mockito:mockito-core", - "^org.objenesis:objenesis" + "^org.objenesis:objenesis", + "^com.google.cloud:google-cloud-conformance-tests" ], "semanticCommitType": "test", "semanticCommitScope": "deps" diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index a4dbb2d9..8729d037 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-network-management - 0.1.0 + 1.0.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ff65686a..d98b60ef 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-network-management - 0.1.0 + 1.0.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 246d91e4..efbe5f12 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-network-management - 0.1.0 + 1.0.0 diff --git a/versions.txt b/versions.txt index 5390d227..07135766 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-network-management:1.0.0:1.0.0 -grpc-google-cloud-network-management-v1beta1:0.2.0:0.2.0 -grpc-google-cloud-network-management-v1:1.0.0:1.0.0 -proto-google-cloud-network-management-v1beta1:0.2.0:0.2.0 -proto-google-cloud-network-management-v1:1.0.0:1.0.0 +google-cloud-network-management:1.1.0:1.1.0 +grpc-google-cloud-network-management-v1beta1:0.3.0:0.3.0 +grpc-google-cloud-network-management-v1:1.1.0:1.1.0 +proto-google-cloud-network-management-v1beta1:0.3.0:0.3.0 +proto-google-cloud-network-management-v1:1.1.0:1.1.0