chore: merge google-cloud-java's java-shared-dependencies and java-core (#1518)
chore: merge google-cloud-java's java-shared-dependencies and java-core
diff --git a/.github/workflows/ci-maven.yaml b/.github/workflows/ci.yaml
similarity index 99%
rename from .github/workflows/ci-maven.yaml
rename to .github/workflows/ci.yaml
index 7c0ed63..fa9625d 100644
--- a/.github/workflows/ci-maven.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,9 +3,9 @@
branches:
- main
pull_request:
-name: ci-maven
+name: ci
env:
- SHOWCASE_VERSION: 0.25.0
+ SHOWCASE_VERSION: 0.26.0
jobs:
build:
runs-on: ubuntu-22.04
diff --git a/.github/workflows/downstream-native-image.yaml b/.github/workflows/downstream-native-image.yaml
index 96f7c15..0aa4c23 100644
--- a/.github/workflows/downstream-native-image.yaml
+++ b/.github/workflows/downstream-native-image.yaml
@@ -9,7 +9,7 @@
# compilation.
name: downstream
env:
- SHOWCASE_VERSION: 0.25.0
+ SHOWCASE_VERSION: 0.26.0
jobs:
# GraalVM job ensures the compatibility of GraaVM version
graalvm:
diff --git a/WORKSPACE b/WORKSPACE
index faf2e7e..65c0f3a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -107,9 +107,9 @@
)
# Showcase
-_showcase_commit = "90d73532a0cab753a85f45c158394f24fc21d91a"
+_showcase_commit = "656e5f46d125a69c82c0cb7edcfcd8b03ed77b89"
-_showcase_sha256 = "0f582541a379be0746e6b8bc5af3df511581d4b1f18f7dfb9ce203be1a64cef1"
+_showcase_sha256 = "26d4b71ac31cbca5e4ed4cdcb5bfeca185e405392d70d2020b4528b5b47c8022"
http_archive(
name = "com_google_gapic_showcase",
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
index 1c7a9ce..b399687 100644
--- a/gapic-generator-java-pom-parent/pom.xml
+++ b/gapic-generator-java-pom-parent/pom.xml
@@ -125,7 +125,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>3.0.0-M8</version>
+ <version>3.0.0</version>
<executions>
<execution>
<goals>
diff --git a/java-iam/pom.xml b/java-iam/pom.xml
index 4d43b05..ef5dcab 100644
--- a/java-iam/pom.xml
+++ b/java-iam/pom.xml
@@ -98,7 +98,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-iam-policy</artifactId>
- <version>1.9.4-SNAPSHOT</version><!-- {x-version-update:google-iam-policy:current} -->
+ <version>1.11.0</version><!-- {x-version-update:google-iam-policy:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
diff --git a/showcase/README.md b/showcase/README.md
index 4f26044..e0455ac 100644
--- a/showcase/README.md
+++ b/showcase/README.md
@@ -16,7 +16,7 @@
update to a compatible client version in `./WORKSPACE`.
```shell
-$ GAPIC_SHOWCASE_VERSION=0.25.0
+$ GAPIC_SHOWCASE_VERSION=0.26.0
$ go install github.com/googleapis/gapic-showcase/cmd/gapic-showcase@v"$GAPIC_SHOWCASE_VERSION"
$ PATH=$PATH:`go env GOPATH`/bin
$ gapic-showcase --help