From b9ac9b5f3ed9809aef27301d53844da06303d3fe Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 14 Feb 2023 10:42:26 -0500 Subject: [PATCH 1/9] chore: refactoring README and DEVELOPMENT.md --- DEVELOPMENT.md | 261 ---------------------------- README.md | 31 +++- gapic-generator-java/DEVELOPMENT.md | 215 ++++++++++------------- gapic-generator-java/README.md | 2 + showcase/README.md | 83 +++++++++ 5 files changed, 204 insertions(+), 388 deletions(-) delete mode 100644 DEVELOPMENT.md create mode 100644 showcase/README.md diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md deleted file mode 100644 index 2b8a9a17b8..0000000000 --- a/DEVELOPMENT.md +++ /dev/null @@ -1,261 +0,0 @@ -# Development Workflow - -## Set Up - -1. Clone this repo. - -2. (OPTIONAL) Copy the Git pre-commit hooks. This will automatically check the build, run - tests, and perform linting before each commit. (Symlinks don't seem to work, - but if you find a way, please add it here!) - - ```sh - cp .githooks/pre-commit .git/hooks/pre-commit - ``` - -3. Install [`bazelisk`](https://github.com/bazelbuild/bazelisk) in your `PATH`. - -## Code Formatting - -- Run linter checks without actually doing the formatting. - - ```sh - mvn fmt:check - ``` - -- Format files. - - ```sh - mvn fmt:format - ``` - -## Test Running - -- Run all unit and integration tests. - - ```sh - mvn install # unit tests, maven test wouldn't work in root folder because gapic-generator-java is dependant on test jars of gax-java - bazel test //... # integration tests - ``` - -- Run all unit tests. - - ```sh - mvn install - ``` -- For running unit tests in `gapic-generator-java` submodule, first build all modules with `mvn install -DskipTests`, then `cd` into `gapic-generator-java` submodule for the following commands: - - Run a single or multiple unit tests: - - ```sh - mvn test -Dtest=JavaCodeGeneratorTest - - mvn test "-Dtest=Basic*, !%regex[.*.Unstable.*], !%regex[.*.MyTest.class#one.*|two.*], %regex[#fast.*|slow.*]" - ``` - - - Update all unit test golden files: - - ```sh - mvn test -DupdateUnitGoldens - ``` - - - Update a single unit test golden file, for example `JavaCodeGeneratorTest.java`: - - ```sh - mvn test -DupdateUnitGoldens -Dtest=JavaCodeGeneratorTest - ``` - -- Run a single integration test for API like `Redis`, it generates Java source - code using the Java microgenerator and compares them with the goldens files - in `test/integration/goldens/redis`. - - ```sh - bazel test //test/integration:redis - ``` - -- Update integration test golden files, for example `Redis`. This clobbers all the - files in `test/integration/goldens/redis`. - - ```sh - bazel run //test/integration:update_redis - ``` - -## Showcase Integration Testing - -[GAPIC Showcase](https://github.com/googleapis/gapic-showcase) is an API that demonstrates Generated -API Client (GAPIC) features and common API patterns used by Google. It follows the [Cloud APIs -design guide](https://cloud.google.com/apis/design/). `gapic-generator-java` generates a client for -the Showcase API which can communicate with a local Showcase server to perform integration tests. - -### Requirements - -* Install [Go](https://go.dev) in your `PATH`. - -### Installing the Server - -Using the latest version of showcase is recommended, but backward compatibility between server -versions is not guaranteed. If changing the version of the server, it may also be necessary to -update to a compatible client version in `./WORKSPACE`. - -```shell -$ GAPIC_SHOWCASE_VERSION=0.25.0 -$ go install github.com/googleapis/gapic-showcase/cmd/gapic-showcase@v"$GAPIC_SHOWCASE_VERSION" -$ PATH=$PATH:`go env GOPATH`/bin -$ gapic-showcase --help -> Root command of gapic-showcase -> -> Usage: -> gapic-showcase [command] -> -> Available Commands: -> completion Emits bash a completion for gapic-showcase -> compliance This service is used to test that GAPICs... -> echo This service is used showcase the four main types... -> help Help about any command -> identity A simple identity service. -> messaging A simple messaging service that implements chat... -> run Runs the showcase server -> sequence Sub-command for Service: Sequence -> testing A service to facilitate running discrete sets of... -> -> Flags: -> -h, --help help for gapic-showcase -> -j, --json Print JSON output -> -v, --verbose Print verbose output -> --version version for gapic-showcase -``` - -### Running the Server - -Run the showcase server to allow requests to be sent to it. This opens port `:7469` to send and -receive requests. - -```shell -$ gapic-showcase run -> 2022/11/21 16:22:15 Showcase listening on port: :7469 -> 2022/11/21 16:22:15 Starting endpoint 0: gRPC endpoint -> 2022/11/21 16:22:15 Starting endpoint 1: HTTP/REST endpoint -> 2022/11/21 16:22:15 Starting endpoint multiplexer -> 2022/11/21 16:22:15 Listening for gRPC-fallback connections -> 2022/11/21 16:22:15 Listening for gRPC connections -> 2022/11/21 16:22:15 Listening for REST connections -> 2022/11/21 16:22:15 Fallback server listening on port: :1337 -``` - -### Running the Integration Tests - -Open a new terminal window in the root project directory. - -```shell -$ cd showcase -$ mvn verify -P enable-integration-tests -P enable-golden-tests -``` - -Note: - -* `-P enable-golden-tests` is optional. These tests do not require a local server. - -### Update the Golden Showcase Files - -Open a new terminal window in the root project directory. - -```shell -$ cd showcase -$ mvn compile -P update -``` - -## Running the Plugin under googleapis with local gapic-generator-java - -For running the Plugin with showcase protos and local gapic-generator-java, see above section "Showcase Integration Testing". - -To generate a production GAPIC API: - -1. Clone [googleapis](https://github.com/googleapis/googleapis). - -2. Modify `googleapis/WORKSPACE` to point to local gapic-generator-java - - Normally, googleapis's build pulls in gapic-generator-java from Maven Central. - For a local run, we first need to build a local SNAPSHOT jar of the generator. Then we point googleapis to - both the local SNAPSHOT jar and the local copy of the generator. - - Replace the following section in googleapis - ``` - _gapic_generator_java_version = "2.13.0" - - maven_install( - artifacts = [ - "com.google.api:gapic-generator-java:" + _gapic_generator_java_version, - ], - #Update this False for local development - fail_on_missing_checksum = True, - repositories = [ - "m2Local", - "https://repo.maven.apache.org/maven2/", - ] - ) - - http_archive( - name = "gapic_generator_java", - strip_prefix = "gapic-generator-java-%s" % _gapic_generator_java_version, - urls = ["https://github.com/googleapis/gapic-generator-java/archive/v%s.zip" % _gapic_generator_java_version], - ) - ``` - - to - - ``` - _gapic_generator_java_version = "2.13.1-SNAPSHOT" - - maven_install( - artifacts = [ - "com.google.api:gapic-generator-java:" + _gapic_generator_java_version, - ], - #Update this False for local development - fail_on_missing_checksum = False, - repositories = [ - "m2Local", - "https://repo.maven.apache.org/maven2/", - ] - ) - - local_repository( - name = "gapic_generator_java", - path = "/absolute/path/to/your/local/gapic-generator-java", - ) - ``` - - Note: At the time of writing, the gapic-generator version was `2.13.0`. Update the version to the latest version in the pom.xml - -3. Build the new target. - - You can generate any client library based on the protos within googleapis. - You just need the name of the service within the `java_gapic_assembly_gradle_pkg` - rules within the service's `BUILD.bazel` file. - For instance, to run your local generator on the `speech`'s v2 service, you can - run: - - ``` - bazel build //google/cloud/speech/v2:google-cloud-speech-v2-java - ``` - - Note: If you are running into bazel build issues, you can try to remove gapic-generator-java cached in your local m2 - Try running this command: - ``` - rm -rf ~/.m2/repository/com/google/api/ - ``` - and then rebuild gapic-generator-java (`mvn clean install`). - -## FAQ - -### Error in workspace: workspace() got unexpected keyword argument 'managed_directories' - -Full Error: - -``` -ERROR: Traceback (most recent call last): - File "/home/alicejli/googleapis/WORKSPACE", line 1, column 10, in - workspace( -Error in workspace: workspace() got unexpected keyword argument 'managed_directories' -ERROR: Error computing the main repository mapping: Encountered error while reading extension file 'tools/build_defs/repo/http.bzl': no such package '@bazel_tools//tools/build_defs/repo': error loading package 'external': Could not load //external package -``` - -You may be using the latest version of bazel which this project does not support yet. Try installing bazelisk to force -bazel to use the version specified in `.bazeliskrc` diff --git a/README.md b/README.md index 21b323f741..4993566606 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,29 @@ [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=googleapis_gapic-generator-java&metric=coverage)](https://sonarcloud.io/summary/new_code?id=googleapis_gapic-generator-java) -# API Client Generator for Java -Generates a Java client library from protocol buffers. -Replaces the Java parts of the -[older monolithic generator](https://github.com/googleapis/gapic-generator). +This repository consists of the following modules: + +- **[gapic-generator-java](./gapic-generator-java/README.md)**: the Protobuf compiler plugin to generate Java code. + See [gapic-generator-java/DEVELOPMENT.md] for setup. +- **[gax-java](./gax-java/README.md)**: the runtime library required for Google Cloud client libraries, + including the ones generated by gapic-generator-java. +- **[java-common-protos](./java-common-protos/README.md)** and **[api-common-java](./api-common-java/README.md)**: Protobuf-generated common + classes for Google services. (They are not generated by gapic-generator-java) +- **[java-iam](./java-iam/README.md)**: Protobuf-generated classes for Google's + Identity and Access + Management (IAM). (They are not generated by gapic-generator-java) +- **[showcase](./showcase/README.md)**: demonstration of the generated client + library for the fake "Showcase" API. +- **[gapic-generator-java-bom](./gapic-generator-java-bom)**: The Bill-of-Material for the libraries + produced from this repository. This is used by [google-cloud-java/java-shared-dependencies]( + https://github.com/googleapis/google-cloud-java/blob/main/java-shared-dependencies/first-party-dependencies/pom.xml). + +## Run Tests for All Modules + +You need Java 11 or higher to run the build. The build produces Java 8-compatible +bytecode. + +- Run all unit tests in all modules. + + ```sh + mvn install + ``` diff --git a/gapic-generator-java/DEVELOPMENT.md b/gapic-generator-java/DEVELOPMENT.md index 5eb2740fa0..f822bdc3f1 100644 --- a/gapic-generator-java/DEVELOPMENT.md +++ b/gapic-generator-java/DEVELOPMENT.md @@ -36,175 +36,144 @@ ## Test Running -- Run all unit and integration tests. +- Run all unit and integration tests. ```sh - bazel test //... + mvn install # unit tests, maven test wouldn't work in root folder because gapic-generator-java is dependant on test jars of gax-java + bazel test //... # integration tests ``` +- For running unit tests in `gapic-generator-java` submodule, first build all modules with `mvn install -DskipTests`, then `cd` into `gapic-generator-java` submodule for the following commands: + - Run a single or multiple unit tests: -- Run all unit tests. + ```sh + mvn test -Dtest=JavaCodeGeneratorTest + + mvn test "-Dtest=Basic*, !%regex[.*.Unstable.*], !%regex[.*.MyTest.class#one.*|two.*], %regex[#fast.*|slow.*]" + ``` - ```sh - bazel test //:units - ``` - or - ```sh - mvn test - ``` - -- Run a single unit test like `JavaCodeGeneratorTest.java`: + - Update all unit test golden files: - ```sh - bazel test //:unit_com_google_api_generator_engine_JavaCodeGeneratorTest - ``` - or - ```sh - mvn test -Dtest=JavaCodeGeneratorTest + ```sh + mvn test -DupdateUnitGoldens + ``` - mvn test "-Dtest=Basic*, !%regex[.*.Unstable.*], !%regex[.*.MyTest.class#one.*|two.*], %regex[#fast.*|slow.*]" - ``` - -- Update all unit test golden files: + - Update a single unit test golden file, for example `JavaCodeGeneratorTest.java`: - ```sh - mvn test -DupdateUnitGoldens - ``` + ```sh + mvn test -DupdateUnitGoldens -Dtest=JavaCodeGeneratorTest + ``` -- Update a single unit test golden file, for example `JavaCodeGeneratorTest.java`: - - ```sh - bazel run //:update_com_google_api_generator_engine_JavaCodeGeneratorTest - ``` - or - ```sh - mvn test -DupdateUnitGoldens -Dtest=JavaCodeGeneratorTest - ``` - -- Run a single integration test for API like `Redis`, it generates Java source - code using the Java microgenerator and compares them with the goldens files - in `test/integration/goldens/redis`. +- Run a single integration test for API like `Redis`, it generates Java source + code using the Java microgenerator and compares them with the goldens files + in `test/integration/goldens/redis`. ```sh bazel test //test/integration:redis ``` -- Update integration test golden files, for example `Redis`. This clobbers all the - files in `test/integration/goldens/redis`. +- Update integration test golden files, for example `Redis`. This clobbers all the + files in `test/integration/goldens/redis`. ```sh bazel run //test/integration:update_redis ``` -## Running the Plugin +## Running the Plugin under googleapis with local gapic-generator-java -1. Clone [googleapis](https://github.com/googleapis/googleapis) and - [gapic-showcase](https://github.com/googleapis/gapic-showcase/). +For running the Plugin with showcase protos and local gapic-generator-java, see +[Showcase Integration Testing](../showcase/README.md). -2. Copy the protos from Showcase into googleapis/google/showcase. +To generate a production GAPIC API: - ```sh - mkdir googleapis/google/showcase - cp -r gapic-showcase/schema/google/showcase/v1beta1 googleapis/google/showcase/v1beta1 - ``` +1. Clone [googleapis](https://github.com/googleapis/googleapis). -3. Add the new microgenerator rules to - `googleapis/google/showcase/v1beta1/BUILD.bazel` file as follows: - - ```python - load( - "@com_google_googleapis_imports//:imports.bzl", - # Existing rules here. - "java_gapic_assembly_gradle_pkg", - "java_gapic_library", - "java_proto_library", - "proto_library_with_info", - ) +2. Modify `googleapis/WORKSPACE` to point to local gapic-generator-java - proto_library_with_info( - name = "showcase_proto_with_info", - deps = [ - ":showcase_proto", - ], - ) + Normally, googleapis's build pulls in gapic-generator-java from Maven Central. + For a local run, we first need to build a local SNAPSHOT jar of the generator. Then we point googleapis to + both the local SNAPSHOT jar and the local copy of the generator. - java_proto_library( - name = "showcase_java_proto", - deps = [ - ":showcase_proto", - ], - ) + Replace the following section in googleapis + ``` + _gapic_generator_java_version = "2.13.0" - # This should either replace the existing monolith target or have a unique name - # that includes "java_gapic". - java_gapic_library( - name = "showcase_java_gapic", - srcs = [":showcase_proto_with_info"], - grpc_service_config = "showcase_grpc_service_config.json", - test_deps = [ - ":showcase_java_grpc", - ], - deps = [ - ":showcase_java_proto", + maven_install( + artifacts = [ + "com.google.api:gapic-generator-java:" + _gapic_generator_java_version, ], + #Update this False for local development + fail_on_missing_checksum = True, + repositories = [ + "m2Local", + "https://repo.maven.apache.org/maven2/", + ] ) - - java_gapic_assembly_gradle_pkg( - # This name should be unique from the existing target name. - name = "google-cloud-showcase-v1beta1-java", - deps = [ - # This is the new microgen target above. - ":showcase_java_gapic", - # The following targets already exist. - ":showcase_java_grpc", - ":showcase_java_proto", - ":showcase_proto", - ], + + http_archive( + name = "gapic_generator_java", + strip_prefix = "gapic-generator-java-%s" % _gapic_generator_java_version, + urls = ["https://github.com/googleapis/gapic-generator-java/archive/v%s.zip" % _gapic_generator_java_version], ) - ``` - -4. Point to local gapic-generator-java - - Normally, googleapis's build pulls in googleapis/gapic-generator-java from the - Internet: - - ``` - # Java microgenerator. - … - _gapic_generator_java_version = "2.1.0" - - http_archive( - name = "gapic_generator_java", - … - urls = ["https://github.com/googleapis/gapic-generator-java/archive/v%s.zip" % _gapic_generator_java_version], - ) ``` - By replacing this portion using the built-in local_repository rule, you can mak - it refer to your local development repo: + to ``` + _gapic_generator_java_version = "2.13.1-SNAPSHOT" + + maven_install( + artifacts = [ + "com.google.api:gapic-generator-java:" + _gapic_generator_java_version, + ], + #Update this False for local development + fail_on_missing_checksum = False, + repositories = [ + "m2Local", + "https://repo.maven.apache.org/maven2/", + ] + ) + local_repository( - name = "gapic_generator_java", - path = "/home//gapic-generator-java", + name = "gapic_generator_java", + path = "/absolute/path/to/your/local/gapic-generator-java", ) ``` -5. Build the new target. + Note: At the time of writing, the gapic-generator version was `2.13.0`. Update the version to the latest version in the pom.xml + +3. Build the new target. - ```sh - cd googleapis - bazel build //google/showcase/v1beta1:showcase_java_gapic - ``` - You can generate any client library based on the protos within googleapis. You just need the name of the service within the `java_gapic_assembly_gradle_pkg` rules within the service's `BUILD.bazel` file. For instance, to run your local generator on the `speech`'s v2 service, you can run: - + ``` bazel build //google/cloud/speech/v2:google-cloud-speech-v2-java ``` + Note: If you are running into bazel build issues, you can try to remove gapic-generator-java cached in your local m2 + Try running this command: + ``` + rm -rf ~/.m2/repository/com/google/api/ + ``` + and then rebuild gapic-generator-java (`mvn clean install`). + +## FAQ + +### Error in workspace: workspace() got unexpected keyword argument 'managed_directories' + +Full Error: + +``` +ERROR: Traceback (most recent call last): + File "/home/alicejli/googleapis/WORKSPACE", line 1, column 10, in + workspace( +Error in workspace: workspace() got unexpected keyword argument 'managed_directories' +ERROR: Error computing the main repository mapping: Encountered error while reading extension file 'tools/build_defs/repo/http.bzl': no such package '@bazel_tools//tools/build_defs/repo': error loading package 'external': Could not load //external package +``` +You may be using the latest version of bazel which this project does not support yet. Try installing bazelisk to force +bazel to use the version specified in `.bazeliskrc` diff --git a/gapic-generator-java/README.md b/gapic-generator-java/README.md index 21b323f741..928ad7b9ff 100644 --- a/gapic-generator-java/README.md +++ b/gapic-generator-java/README.md @@ -4,3 +4,5 @@ Generates a Java client library from protocol buffers. Replaces the Java parts of the [older monolithic generator](https://github.com/googleapis/gapic-generator). + +See [DEVELOPMENT.md](DEVELOPMENT.md) for setting up development environment. diff --git a/showcase/README.md b/showcase/README.md new file mode 100644 index 0000000000..4f2604469f --- /dev/null +++ b/showcase/README.md @@ -0,0 +1,83 @@ +# Showcase Integration Testing + +[GAPIC Showcase](https://github.com/googleapis/gapic-showcase) is an API that demonstrates Generated +API Client (GAPIC) features and common API patterns used by Google. It follows the [Cloud APIs +design guide](https://cloud.google.com/apis/design/). `gapic-generator-java` generates a client for +the Showcase API which can communicate with a local Showcase server to perform integration tests. + +## Requirements + +* Install [Go](https://go.dev) in your `PATH`. + +## Installing the Server + +Using the latest version of showcase is recommended, but backward compatibility between server +versions is not guaranteed. If changing the version of the server, it may also be necessary to +update to a compatible client version in `./WORKSPACE`. + +```shell +$ GAPIC_SHOWCASE_VERSION=0.25.0 +$ go install github.com/googleapis/gapic-showcase/cmd/gapic-showcase@v"$GAPIC_SHOWCASE_VERSION" +$ PATH=$PATH:`go env GOPATH`/bin +$ gapic-showcase --help +> Root command of gapic-showcase +> +> Usage: +> gapic-showcase [command] +> +> Available Commands: +> completion Emits bash a completion for gapic-showcase +> compliance This service is used to test that GAPICs... +> echo This service is used showcase the four main types... +> help Help about any command +> identity A simple identity service. +> messaging A simple messaging service that implements chat... +> run Runs the showcase server +> sequence Sub-command for Service: Sequence +> testing A service to facilitate running discrete sets of... +> +> Flags: +> -h, --help help for gapic-showcase +> -j, --json Print JSON output +> -v, --verbose Print verbose output +> --version version for gapic-showcase +``` + +## Running the Server + +Run the showcase server to allow requests to be sent to it. This opens port `:7469` to send and +receive requests. + +```shell +$ gapic-showcase run +> 2022/11/21 16:22:15 Showcase listening on port: :7469 +> 2022/11/21 16:22:15 Starting endpoint 0: gRPC endpoint +> 2022/11/21 16:22:15 Starting endpoint 1: HTTP/REST endpoint +> 2022/11/21 16:22:15 Starting endpoint multiplexer +> 2022/11/21 16:22:15 Listening for gRPC-fallback connections +> 2022/11/21 16:22:15 Listening for gRPC connections +> 2022/11/21 16:22:15 Listening for REST connections +> 2022/11/21 16:22:15 Fallback server listening on port: :1337 +``` + +## Running the Integration Tests + +Open a new terminal window in the root project directory. + +```shell +$ cd showcase +$ mvn verify -P enable-integration-tests -P enable-golden-tests +``` + +Note: + +* `-P enable-golden-tests` is optional. These tests do not require a local server. + +## Update the Golden Showcase Files + +Open a new terminal window in the root project directory. + +```shell +$ cd showcase +$ mvn compile -P update +``` From cee6ae1a07853becf20962855a59a1a466c5378e Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 14 Feb 2023 10:45:37 -0500 Subject: [PATCH 2/9] bringing new setup to development.md --- gapic-generator-java/DEVELOPMENT.md | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/gapic-generator-java/DEVELOPMENT.md b/gapic-generator-java/DEVELOPMENT.md index f822bdc3f1..6e1f89b1f7 100644 --- a/gapic-generator-java/DEVELOPMENT.md +++ b/gapic-generator-java/DEVELOPMENT.md @@ -2,34 +2,28 @@ ## Set Up -1. Clone this repo. +1. Clone this repo. -2. Copy the Git pre-commit hooks. This will automatically check the build, run - tests, and perform linting before each commit. (Symlinks don't seem to work, - but if you find a way, please add it here!) +2. (OPTIONAL) Copy the Git pre-commit hooks. This will automatically check the build, run + tests, and perform linting before each commit. (Symlinks don't seem to work, + but if you find a way, please add it here!) ```sh cp .githooks/pre-commit .git/hooks/pre-commit ``` +3. Install [`bazelisk`](https://github.com/bazelbuild/bazelisk) in your `PATH`. + ## Code Formatting -- Run linter checks without actually doing the formatting. +- Run linter checks without actually doing the formatting. - ```sh - bazel run //:google_java_format_verification - ``` - or ```sh mvn fmt:check ``` -- Format files. +- Format files. - ```sh - bazel run //:google_java_format - ``` - or ```sh mvn fmt:format ``` From 357934fee8e91977777308ac2391937bb84932b1 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 14 Feb 2023 11:45:08 -0500 Subject: [PATCH 3/9] Moving content to the root DEVELOPMENT.md --- DEVELOPMENT.md | 41 +++++++++++++++++++++++++++++ README.md | 11 ++------ gapic-generator-java/DEVELOPMENT.md | 28 -------------------- 3 files changed, 43 insertions(+), 37 deletions(-) create mode 100644 DEVELOPMENT.md diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md new file mode 100644 index 0000000000..6b773f3046 --- /dev/null +++ b/DEVELOPMENT.md @@ -0,0 +1,41 @@ +# Development Setup + +You need Java 11 or higher to run the build. The build produces Java 8-compatible +bytecode. + +Install [`bazelisk`](https://github.com/bazelbuild/bazelisk) in your `PATH` +for gapic-generator-java's Bazel build. + +## Set Up + +1. Clone this repo. + +2. (OPTIONAL) Copy the Git pre-commit hooks. This will automatically check the build, run + tests, and perform linting before each commit. (Symlinks don't seem to work, + but if you find a way, please add it here!) + + ```sh + cp .githooks/pre-commit .git/hooks/pre-commit + ``` + +## Run Tests for All Modules + +- Run all unit tests in all modules. + + ```sh + mvn install + ``` + +## Code Formatting + +- Run linter checks without actually doing the formatting. + + ```sh + mvn fmt:check + ``` + +- Format files. + + ```sh + mvn fmt:format + ``` diff --git a/README.md b/README.md index 4993566606..8fe2ae2e6c 100644 --- a/README.md +++ b/README.md @@ -17,13 +17,6 @@ This repository consists of the following modules: produced from this repository. This is used by [google-cloud-java/java-shared-dependencies]( https://github.com/googleapis/google-cloud-java/blob/main/java-shared-dependencies/first-party-dependencies/pom.xml). -## Run Tests for All Modules +## Development Setup -You need Java 11 or higher to run the build. The build produces Java 8-compatible -bytecode. - -- Run all unit tests in all modules. - - ```sh - mvn install - ``` +See [DEVELOPMENT.md](DEVELOPMENT.md). \ No newline at end of file diff --git a/gapic-generator-java/DEVELOPMENT.md b/gapic-generator-java/DEVELOPMENT.md index 6e1f89b1f7..ecfff7b585 100644 --- a/gapic-generator-java/DEVELOPMENT.md +++ b/gapic-generator-java/DEVELOPMENT.md @@ -1,33 +1,5 @@ # Development Workflow -## Set Up - -1. Clone this repo. - -2. (OPTIONAL) Copy the Git pre-commit hooks. This will automatically check the build, run - tests, and perform linting before each commit. (Symlinks don't seem to work, - but if you find a way, please add it here!) - - ```sh - cp .githooks/pre-commit .git/hooks/pre-commit - ``` - -3. Install [`bazelisk`](https://github.com/bazelbuild/bazelisk) in your `PATH`. - -## Code Formatting - -- Run linter checks without actually doing the formatting. - - ```sh - mvn fmt:check - ``` - -- Format files. - - ```sh - mvn fmt:format - ``` - ## Test Running - Run all unit and integration tests. From 94add91764e37d424d9354e4e1e72512e0d2154d Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 15 Feb 2023 09:35:48 -0500 Subject: [PATCH 4/9] bazel command is at the root --- gapic-generator-java/DEVELOPMENT.md | 69 ++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 20 deletions(-) diff --git a/gapic-generator-java/DEVELOPMENT.md b/gapic-generator-java/DEVELOPMENT.md index ecfff7b585..0f87024403 100644 --- a/gapic-generator-java/DEVELOPMENT.md +++ b/gapic-generator-java/DEVELOPMENT.md @@ -2,38 +2,66 @@ ## Test Running -- Run all unit and integration tests. +### Unit Tests - ```sh - mvn install # unit tests, maven test wouldn't work in root folder because gapic-generator-java is dependant on test jars of gax-java - bazel test //... # integration tests - ``` -- For running unit tests in `gapic-generator-java` submodule, first build all modules with `mvn install -DskipTests`, then `cd` into `gapic-generator-java` submodule for the following commands: - - Run a single or multiple unit tests: +To run the unit tests in `gapic-generator-java` submodule, first build all +modules with `mvn -pl '!gapic-generator-java' install -DskipTests` at the root +directory, +then `cd` into `gapic-generator-java` submodule for the following commands: + +- Run all unit tests: + + ```sh + # In gapic-generator-java submodule + mvn test + ``` + +- Run a single or multiple unit tests: + + ```sh + # In gapic-generator-java submodule + mvn test -Dtest=JavaCodeGeneratorTest - ```sh - mvn test -Dtest=JavaCodeGeneratorTest - - mvn test "-Dtest=Basic*, !%regex[.*.Unstable.*], !%regex[.*.MyTest.class#one.*|two.*], %regex[#fast.*|slow.*]" - ``` + mvn test "-Dtest=Basic*, !%regex[.*.Unstable.*], !%regex[.*.MyTest.class#one.*|two.*], %regex[#fast.*|slow.*]" + ``` - - Update all unit test golden files: +- Update all unit test golden files: - ```sh - mvn test -DupdateUnitGoldens - ``` + ```sh + # In gapic-generator-java submodule + mvn test -DupdateUnitGoldens + ``` - - Update a single unit test golden file, for example `JavaCodeGeneratorTest.java`: +- Update a single unit test golden file, for example `JavaCodeGeneratorTest.java`: + + ```sh + # In gapic-generator-java submodule + mvn test -DupdateUnitGoldens -Dtest=JavaCodeGeneratorTest + ``` + +Note that `mvn -pl '!gapic-generator-java' install -DskipTests` +at the root directory is needed for `mvn test` commands, +because the gapic-generator-java submodule depends on the "test jars" of +gax-java. The test jars are absent until Maven's "package" phase, which is later +than the "test" phase. + +### Integration Tests + +To run integration test for gapic-generator-java, run this Bazel command in the +root of the repository (where you have WORKSPACE file for Bazel.) + +```sh +# In the repository root directory +bazel test //... # integration tests +``` - ```sh - mvn test -DupdateUnitGoldens -Dtest=JavaCodeGeneratorTest - ``` - Run a single integration test for API like `Redis`, it generates Java source code using the Java microgenerator and compares them with the goldens files in `test/integration/goldens/redis`. ```sh + # In the repository root directory bazel test //test/integration:redis ``` @@ -41,6 +69,7 @@ files in `test/integration/goldens/redis`. ```sh + # In the repository root directory bazel run //test/integration:update_redis ``` From 63be140d106b14a4c3369ffe50da57a175e2d26c Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 15 Feb 2023 09:44:21 -0500 Subject: [PATCH 5/9] Adding gax-java/DEVELOPMENT.md --- gax-java/CONTRIBUTING.md | 15 --------------- gax-java/DEVELOPMENT.md | 23 +++++++++++++++++++++++ gax-java/README.md | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 gax-java/DEVELOPMENT.md diff --git a/gax-java/CONTRIBUTING.md b/gax-java/CONTRIBUTING.md index 110ed02ec0..321735f3fd 100644 --- a/gax-java/CONTRIBUTING.md +++ b/gax-java/CONTRIBUTING.md @@ -20,21 +20,6 @@ frustration later on. All submissions, including submissions by project members, require review. We use Github pull requests for this purpose. -### Building -To build GAX: - -```sh -# Go to the repository root -cd gapic-generator-java - -# Install dependency modules to local Maven repository. Note that -# gapic-generator-java module is not a dependency of gax-java -mvn -B -ntp install -DskipTests --projects '!gapic-generator-java,!gax-java' - -# Build and install gax-java -mvn clean install -f gax-java -``` - ### The small print Contributions made by corporations are covered by a different agreement than the one above, the diff --git a/gax-java/DEVELOPMENT.md b/gax-java/DEVELOPMENT.md new file mode 100644 index 0000000000..8288ce0ad7 --- /dev/null +++ b/gax-java/DEVELOPMENT.md @@ -0,0 +1,23 @@ +# Development of gax-java + +## Building + +To build GAX: + +```sh +# Go to the repository root +cd gapic-generator-java + +# Install dependency modules to local Maven repository. Note that +# gapic-generator-java module is not a dependency of gax-java +mvn -pl '!gapic-generator-java,!gax-java' install -DskipTests + +# Build and install gax-java +mvn clean install -f gax-java +``` + +## How to see the effect of GAX change in code generation by gapic-generator-java + +To see the effect of GAX changes in local gapic-generator-java invocation, see +"Running the Plugin under googleapis with local gapic-generator-java" in +[gapic-generator-java/DEVELOPMENT.md](../gapic-generator-java/DEVELOPMENT.md) diff --git a/gax-java/README.md b/gax-java/README.md index a0d1aa77a3..5550c16018 100644 --- a/gax-java/README.md +++ b/gax-java/README.md @@ -15,7 +15,7 @@ files can use services such as paged list iteration, request batching, and polling of long-running operations to provide a more convenient and idiomatic API surface to callers. -Currently, this library shouldn't be used independently from google-cloud-java, otherwise there is +Currently, this library shouldn't be used independently of google-cloud-java, otherwise there is a high risk of diamond dependency problems, because google-cloud-java uses beta features from this library which can change in breaking ways between versions. See [VERSIONING](#versioning) for more information. From 55ac741ae8bf1f6a574393ddd71a1d0da6181113 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 15 Feb 2023 09:50:14 -0500 Subject: [PATCH 6/9] bazelisk --- gapic-generator-java/DEVELOPMENT.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gapic-generator-java/DEVELOPMENT.md b/gapic-generator-java/DEVELOPMENT.md index 0f87024403..acdc71df66 100644 --- a/gapic-generator-java/DEVELOPMENT.md +++ b/gapic-generator-java/DEVELOPMENT.md @@ -52,7 +52,7 @@ root of the repository (where you have WORKSPACE file for Bazel.) ```sh # In the repository root directory -bazel test //... # integration tests +bazelisk test //... # integration tests ``` @@ -62,7 +62,7 @@ bazel test //... # integration tests ```sh # In the repository root directory - bazel test //test/integration:redis + bazelisk test //test/integration:redis ``` - Update integration test golden files, for example `Redis`. This clobbers all the @@ -70,7 +70,7 @@ bazel test //... # integration tests ```sh # In the repository root directory - bazel run //test/integration:update_redis + bazelisk run //test/integration:update_redis ``` ## Running the Plugin under googleapis with local gapic-generator-java @@ -145,7 +145,7 @@ To generate a production GAPIC API: run: ``` - bazel build //google/cloud/speech/v2:google-cloud-speech-v2-java + bazelisk build //google/cloud/speech/v2:google-cloud-speech-v2-java ``` Note: If you are running into bazel build issues, you can try to remove gapic-generator-java cached in your local m2 From b11f32915d14c7124a5407af64ba4f75bffee9ae Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 15 Feb 2023 11:00:34 -0500 Subject: [PATCH 7/9] GAX version --- gax-java/README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gax-java/README.md b/gax-java/README.md index 5550c16018..8e9830c2f2 100644 --- a/gax-java/README.md +++ b/gax-java/README.md @@ -36,30 +36,32 @@ If you are using Maven, add this to your pom.xml file com.google.api gax - 2.8.1 + 2.23.0 com.google.api gax-grpc - 2.8.1 + 2.23.0 ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.api:gax:2.8.1', - 'com.google.api:gax-grpc:2.8.1' +compile 'com.google.api:gax:2.23.0', + 'com.google.api:gax-grpc:2.23.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.api" % "gax" % "2.8.1" -libraryDependencies += "com.google.api" % "gax-grpc" % "2.8.1" +libraryDependencies += "com.google.api" % "gax" % "2.23.0" +libraryDependencies += "com.google.api" % "gax-grpc" % "2.23.0" ``` [//]: # ({x-version-update-end}) +To find the latest version, see https://search.maven.org/artifact/com.google.api/gax. + Java Versions ------------- From 4e83ec1fc6bf30f1cc3059586d8f5f17d85a50cf Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:16:44 -0500 Subject: [PATCH 8/9] chore(main): release 2.15.1 (#1339) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Emily Wang --- CHANGELOG.md | 10 +++++++ WORKSPACE | 2 +- api-common-java/pom.xml | 4 +-- gapic-generator-java-bom/pom.xml | 24 ++++++++-------- gapic-generator-java-pom-parent/pom.xml | 2 +- gapic-generator-java/pom.xml | 6 ++-- gax-java/dependencies.properties | 8 +++--- gax-java/gax-bom/pom.xml | 14 +++++----- gax-java/gax-grpc/pom.xml | 4 +-- gax-java/gax-httpjson/pom.xml | 4 +-- gax-java/gax/pom.xml | 4 +-- gax-java/pom.xml | 14 +++++----- .../grpc-google-common-protos/pom.xml | 4 +-- java-common-protos/pom.xml | 8 +++--- .../proto-google-common-protos/pom.xml | 4 +-- java-iam/grpc-google-iam-v1/pom.xml | 4 +-- java-iam/grpc-google-iam-v2/pom.xml | 4 +-- java-iam/grpc-google-iam-v2beta/pom.xml | 4 +-- java-iam/pom.xml | 22 +++++++-------- java-iam/proto-google-iam-v1/pom.xml | 4 +-- java-iam/proto-google-iam-v2/pom.xml | 4 +-- java-iam/proto-google-iam-v2beta/pom.xml | 4 +-- showcase/pom.xml | 2 +- versions.txt | 28 +++++++++---------- 24 files changed, 99 insertions(+), 89 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc8059f3fd..3c88b962e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## [2.15.1](https://github.com/googleapis/gapic-generator-java/compare/v2.15.0...v2.15.1) (2023-02-15) + + +### Bug Fixes + +* **batcher:** Exceptions in unaryCaller bubble up ([#1166](https://github.com/googleapis/gapic-generator-java/issues/1166)) ([bcf5ed8](https://github.com/googleapis/gapic-generator-java/commit/bcf5ed856d664f84fa033cee0cc27fb57b97b678)) +* **deps:** Update dependency com.google.auth:google-auth-library-bom to v1.16.0 ([#1355](https://github.com/googleapis/gapic-generator-java/issues/1355)) ([b7de1bc](https://github.com/googleapis/gapic-generator-java/commit/b7de1bc260a641e0c0ca717a33d61fbaa8a2fcf6)) +* **deps:** Update dependency io.grpc:grpc-bom to v1.53.0 ([#1345](https://github.com/googleapis/gapic-generator-java/issues/1345)) ([1e82422](https://github.com/googleapis/gapic-generator-java/commit/1e824223afa0b8a62e9e50ae38cc73e8036e6348)) +* Use pkg_tar from rules_pkg ([#1303](https://github.com/googleapis/gapic-generator-java/issues/1303)) ([fbae565](https://github.com/googleapis/gapic-generator-java/commit/fbae565291aee092acab3df86de858aea129b670)) + ## [2.15.0](https://github.com/googleapis/gapic-generator-java/compare/v2.14.0...v2.15.0) (2023-02-02) diff --git a/WORKSPACE b/WORKSPACE index 2e8237b02f..d1c0525513 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -60,7 +60,7 @@ maven_install( repositories = ["https://repo.maven.apache.org/maven2/"], ) -_gapic_generator_java_version = "2.15.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current} +_gapic_generator_java_version = "2.15.1" # {x-version-update:gapic-generator-java:current} maven_install( artifacts = [ diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml index 43710485b9..2e542c1213 100644 --- a/api-common-java/pom.xml +++ b/api-common-java/pom.xml @@ -5,14 +5,14 @@ com.google.api api-common jar - 2.6.1-SNAPSHOT + 2.6.1 API Common Common utilities for Google APIs in Java com.google.api gapic-generator-java-pom-parent - 2.15.1-SNAPSHOT + 2.15.1 ../gapic-generator-java-pom-parent diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 4849d77f07..09bb22d4e1 100644 --- a/gapic-generator-java-bom/pom.xml +++ b/gapic-generator-java-bom/pom.xml @@ -4,7 +4,7 @@ com.google.api gapic-generator-java-bom pom - 2.15.1-SNAPSHOT + 2.15.1 GAPIC Generator Java BOM BOM for the libraries in gapic-generator-java repository. Users should not @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-pom-parent - 2.15.1-SNAPSHOT + 2.15.1 ../gapic-generator-java-pom-parent @@ -60,56 +60,56 @@ com.google.api api-common - 2.6.1-SNAPSHOT + 2.6.1 com.google.api gax-bom - 2.23.1-SNAPSHOT + 2.23.1 pom import com.google.api.grpc grpc-google-common-protos - 2.14.1-SNAPSHOT + 2.14.1 com.google.api.grpc proto-google-common-protos - 2.14.1-SNAPSHOT + 2.14.1 com.google.api.grpc proto-google-iam-v1 - 1.9.1-SNAPSHOT + 1.9.1 com.google.api.grpc proto-google-iam-v2 - 1.9.1-SNAPSHOT + 1.9.1 com.google.api.grpc proto-google-iam-v2beta - 1.9.1-SNAPSHOT + 1.9.1 com.google.api.grpc grpc-google-iam-v1 - 1.9.1-SNAPSHOT + 1.9.1 com.google.api.grpc grpc-google-iam-v2 - 1.9.1-SNAPSHOT + 1.9.1 com.google.api.grpc grpc-google-iam-v2beta - 1.9.1-SNAPSHOT + 1.9.1 diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml index bf90f49a9b..5e356643aa 100644 --- a/gapic-generator-java-pom-parent/pom.xml +++ b/gapic-generator-java-pom-parent/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.google.api gapic-generator-java-pom-parent - 2.15.1-SNAPSHOT + 2.15.1 pom GAPIC Generator Java POM Parent https://github.com/googleapis/gapic-generator-java diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index aad9f2b659..730830e717 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api gapic-generator-java - 2.15.1-SNAPSHOT + 2.15.1 GAPIC Generator Java GAPIC generator Java @@ -23,7 +23,7 @@ com.google.api gapic-generator-java-pom-parent - 2.15.1-SNAPSHOT + 2.15.1 ../gapic-generator-java-pom-parent @@ -32,7 +32,7 @@ com.google.api gapic-generator-java-bom - 2.15.1-SNAPSHOT + 2.15.1 pom import diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index 27a092bc1d..de92d13cfc 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -8,16 +8,16 @@ # Versions of oneself # {x-version-update-start:gax:current} -version.gax=2.23.1-SNAPSHOT +version.gax=2.23.1 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_grpc=2.23.1-SNAPSHOT +version.gax_grpc=2.23.1 # {x-version-update-end} # {x-version-update-start:gax:current} -version.gax_bom=2.23.1-SNAPSHOT +version.gax_bom=2.23.1 # {x-version-update-end} # {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.108.1-SNAPSHOT +version.gax_httpjson=0.108.1 # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml index 9be3e41910..98ff0b22e9 100644 --- a/gax-java/gax-bom/pom.xml +++ b/gax-java/gax-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api gax-bom - 2.23.1-SNAPSHOT + 2.23.1 pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -42,34 +42,34 @@ com.google.api gax - 2.23.1-SNAPSHOT + 2.23.1 com.google.api gax - 2.23.1-SNAPSHOT + 2.23.1 testlib com.google.api gax-grpc - 2.23.1-SNAPSHOT + 2.23.1 com.google.api gax-grpc - 2.23.1-SNAPSHOT + 2.23.1 testlib com.google.api gax-httpjson - 0.108.1-SNAPSHOT + 0.108.1 com.google.api gax-httpjson - 0.108.1-SNAPSHOT + 0.108.1 testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index ffa979dda2..57ad2cce27 100644 --- a/gax-java/gax-grpc/pom.xml +++ b/gax-java/gax-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-grpc - 2.23.1-SNAPSHOT + 2.23.1 jar GAX (Google Api eXtensions) for Java (gRPC) Google Api eXtensions for Java (gRPC) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.23.1-SNAPSHOT + 2.23.1 diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index 7eaa8d4e11..146a37be75 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 0.108.1-SNAPSHOT + 0.108.1 jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.23.1-SNAPSHOT + 2.23.1 diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index ee1dfa0c2c..11f72d6947 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.23.1-SNAPSHOT + 2.23.1 jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.23.1-SNAPSHOT + 2.23.1 diff --git a/gax-java/pom.xml b/gax-java/pom.xml index aed1a9dacd..df4c6e4c9c 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,14 +4,14 @@ com.google.api gax-parent pom - 2.23.1-SNAPSHOT + 2.23.1 GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) com.google.api gapic-generator-java-pom-parent - 2.15.1-SNAPSHOT + 2.15.1 ../gapic-generator-java-pom-parent @@ -51,7 +51,7 @@ com.google.api api-common - 2.6.1-SNAPSHOT + 2.6.1 com.google.auth @@ -109,24 +109,24 @@ com.google.api gax - 2.23.1-SNAPSHOT + 2.23.1 com.google.api gax - 2.23.1-SNAPSHOT + 2.23.1 test-jar testlib com.google.api.grpc proto-google-common-protos - 2.14.1-SNAPSHOT + 2.14.1 com.google.api.grpc grpc-google-common-protos - 2.14.1-SNAPSHOT + 2.14.1 io.grpc diff --git a/java-common-protos/grpc-google-common-protos/pom.xml b/java-common-protos/grpc-google-common-protos/pom.xml index f68360bc7f..4e632d825d 100644 --- a/java-common-protos/grpc-google-common-protos/pom.xml +++ b/java-common-protos/grpc-google-common-protos/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-common-protos - 2.14.1-SNAPSHOT + 2.14.1 grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.14.1-SNAPSHOT + 2.14.1 diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index f17711c67c..eff391c2ff 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -4,7 +4,7 @@ com.google.api.grpc google-common-protos-parent pom - 2.14.1-SNAPSHOT + 2.14.1 Google Common Protos Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.15.1-SNAPSHOT + 2.15.1 ../gapic-generator-java-pom-parent @@ -69,7 +69,7 @@ com.google.api.grpc grpc-google-common-protos - 2.14.1-SNAPSHOT + 2.14.1 io.grpc @@ -81,7 +81,7 @@ com.google.api.grpc proto-google-common-protos - 2.14.1-SNAPSHOT + 2.14.1 com.google.guava diff --git a/java-common-protos/proto-google-common-protos/pom.xml b/java-common-protos/proto-google-common-protos/pom.xml index c105de9a77..4a9d53e87d 100644 --- a/java-common-protos/proto-google-common-protos/pom.xml +++ b/java-common-protos/proto-google-common-protos/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-common-protos - 2.14.1-SNAPSHOT + 2.14.1 proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.14.1-SNAPSHOT + 2.14.1 diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index e8f7887bdf..48d3be9ff2 100644 --- a/java-iam/grpc-google-iam-v1/pom.xml +++ b/java-iam/grpc-google-iam-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v1 - 1.9.1-SNAPSHOT + 1.9.1 grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.9.1-SNAPSHOT + 1.9.1 diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index 5319f9d8eb..6c7902f7ea 100644 --- a/java-iam/grpc-google-iam-v2/pom.xml +++ b/java-iam/grpc-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2 - 1.9.1-SNAPSHOT + 1.9.1 grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.9.1-SNAPSHOT + 1.9.1 diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index 82e8be4183..a2d7e7b518 100644 --- a/java-iam/grpc-google-iam-v2beta/pom.xml +++ b/java-iam/grpc-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2beta - 1.9.1-SNAPSHOT + 1.9.1 grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.9.1-SNAPSHOT + 1.9.1 diff --git a/java-iam/pom.xml b/java-iam/pom.xml index a752d0d619..924be68796 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.9.1-SNAPSHOT + 1.9.1 Google IAM Parent Java idiomatic client for Google Cloud Platform services. @@ -13,7 +13,7 @@ com.google.api gapic-generator-java-pom-parent - 2.15.1-SNAPSHOT + 2.15.1 ../gapic-generator-java-pom-parent @@ -81,49 +81,49 @@ com.google.api gax-bom - 2.23.1-SNAPSHOT + 2.23.1 pom import com.google.api.grpc proto-google-iam-v2 - 1.9.1-SNAPSHOT + 1.9.1 com.google.api.grpc grpc-google-iam-v2 - 1.9.1-SNAPSHOT + 1.9.1 com.google.cloud google-iam-policy - 1.9.1-SNAPSHOT + 1.9.1 com.google.api.grpc proto-google-common-protos - 2.14.1-SNAPSHOT + 2.14.1 com.google.api.grpc proto-google-iam-v2beta - 1.9.1-SNAPSHOT + 1.9.1 com.google.api.grpc grpc-google-iam-v1 - 1.9.1-SNAPSHOT + 1.9.1 com.google.api.grpc grpc-google-iam-v2beta - 1.9.1-SNAPSHOT + 1.9.1 com.google.api.grpc proto-google-iam-v1 - 1.9.1-SNAPSHOT + 1.9.1 javax.annotation diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index 4f068d377c..f9bbe69900 100644 --- a/java-iam/proto-google-iam-v1/pom.xml +++ b/java-iam/proto-google-iam-v1/pom.xml @@ -3,13 +3,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v1 - 1.9.1-SNAPSHOT + 1.9.1 proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.9.1-SNAPSHOT + 1.9.1 diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index c57cf81811..2e27ba8f96 100644 --- a/java-iam/proto-google-iam-v2/pom.xml +++ b/java-iam/proto-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2 - 1.9.1-SNAPSHOT + 1.9.1 proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.9.1-SNAPSHOT + 1.9.1 diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index 05a339dae8..4955da7d40 100644 --- a/java-iam/proto-google-iam-v2beta/pom.xml +++ b/java-iam/proto-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2beta - 1.9.1-SNAPSHOT + 1.9.1 proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.9.1-SNAPSHOT + 1.9.1 diff --git a/showcase/pom.xml b/showcase/pom.xml index 70d83246d5..e557cb8cde 100644 --- a/showcase/pom.xml +++ b/showcase/pom.xml @@ -15,7 +15,7 @@ com.google.api gapic-generator-java-bom - 2.15.1-SNAPSHOT + 2.15.1 ../gapic-generator-java-bom diff --git a/versions.txt b/versions.txt index 39dfad5335..e45e9c1a5e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -gapic-generator-java:2.15.0:2.15.1-SNAPSHOT -api-common:2.6.0:2.6.1-SNAPSHOT -gax:2.23.0:2.23.1-SNAPSHOT -gax-grpc:2.23.0:2.23.1-SNAPSHOT -gax-httpjson:0.108.0:0.108.1-SNAPSHOT -proto-google-common-protos:2.14.0:2.14.1-SNAPSHOT -grpc-google-common-protos:2.14.0:2.14.1-SNAPSHOT -proto-google-iam-v1:1.9.0:1.9.1-SNAPSHOT -grpc-google-iam-v1:1.9.0:1.9.1-SNAPSHOT -proto-google-iam-v2beta:1.9.0:1.9.1-SNAPSHOT -grpc-google-iam-v2beta:1.9.0:1.9.1-SNAPSHOT -google-iam-policy:1.9.0:1.9.1-SNAPSHOT -proto-google-iam-v2:1.9.0:1.9.1-SNAPSHOT -grpc-google-iam-v2:1.9.0:1.9.1-SNAPSHOT +gapic-generator-java:2.15.1:2.15.1 +api-common:2.6.1:2.6.1 +gax:2.23.1:2.23.1 +gax-grpc:2.23.1:2.23.1 +gax-httpjson:0.108.1:0.108.1 +proto-google-common-protos:2.14.1:2.14.1 +grpc-google-common-protos:2.14.1:2.14.1 +proto-google-iam-v1:1.9.1:1.9.1 +grpc-google-iam-v1:1.9.1:1.9.1 +proto-google-iam-v2beta:1.9.1:1.9.1 +grpc-google-iam-v2beta:1.9.1:1.9.1 +google-iam-policy:1.9.1:1.9.1 +proto-google-iam-v2:1.9.1:1.9.1 +grpc-google-iam-v2:1.9.1:1.9.1 From 40407f65f7d362c899a97201c7a53beaf5b25dba Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 15 Feb 2023 11:32:47 -0500 Subject: [PATCH 9/9] Remove build status in gax-java --- gax-java/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gax-java/README.md b/gax-java/README.md index 8e9830c2f2..e3666de1cd 100644 --- a/gax-java/README.md +++ b/gax-java/README.md @@ -1,9 +1,7 @@ Google API Extensions for Java ============================== -[![Build Status](https://travis-ci.org/googleapis/gax-java.svg?branch=main)](https://travis-ci.org/googleapis/gax-java) - -- [Documentation](https://googleapis.dev/java/gax/latest/) +- [API Documentation](https://cloud.google.com/java/docs/reference/gax/latest/overview.html) Google API Extensions for Java (GAX Java) is a library which aids in the development of client libraries for server APIs, based on [GRPC](http://grpc.io)