Skip to content

Commit f647320

Browse files
diegomarquezpdiegomarquezp
committed
Merge remote-tracking branch 'origin/main' into fix-httpjson-retry-metrics
2 parents 8f3331e + 9332326 commit f647320

File tree

46 files changed

+165
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+165
-149
lines changed

‎.cloudbuild/graalvm/cloudbuild-test-a.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.38.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.39.0' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'

‎.cloudbuild/graalvm/cloudbuild-test-b.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.38.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.39.0' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'

‎.cloudbuild/graalvm/cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.38.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.39.0' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
1919
steps:
2020
# GraalVM A build

‎.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_IMAGE_NAME: "gcr.io/cloud-devrel-public-resources/java-library-generation"
18-
_GAPIC_GENERATOR_JAVA_VERSION: '2.48.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
18+
_GAPIC_GENERATOR_JAVA_VERSION: '2.49.0' # {x-version-update:gapic-generator-java:current}
1919
_SHA_IMAGE_ID: "${_IMAGE_NAME}:${COMMIT_SHA}"
2020
_LATEST_IMAGE_ID: "${_IMAGE_NAME}:latest"
2121
_VERSIONED_IMAGE_ID: "${_IMAGE_NAME}:${_GAPIC_GENERATOR_JAVA_VERSION}"

‎.cloudbuild/library_generation/library_generation.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FROM gcr.io/cloud-devrel-public-resources/java21@sha256:2ceff5eeea72260258df56d4
1919
WORKDIR /sdk-platform-java
2020
COPY . .
2121
# {x-version-update-start:gapic-generator-java:current}
22-
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.48.1-SNAPSHOT"
22+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.49.0"
2323
# {x-version-update-end}
2424

2525
RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip

‎.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "2.48.0"
2+
".": "2.49.0"
33
}

‎CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Changelog
22

3+
## [2.49.0](https://github.com/googleapis/sdk-platform-java/compare/v2.48.0...v2.49.0) (2024-10-25)
4+
5+
6+
### Features
7+
8+
* Move release note generation to a sub module ([#3299](https://github.com/googleapis/sdk-platform-java/issues/3299)) ([7d6d66a](https://github.com/googleapis/sdk-platform-java/commit/7d6d66a161db5edc538aec065405954acf4434c5))
9+
10+
11+
### Bug Fixes
12+
13+
* add additional potential exceptions when retrieving protobuf manifest file to get version ([#3315](https://github.com/googleapis/sdk-platform-java/issues/3315)) ([ef9e518](https://github.com/googleapis/sdk-platform-java/commit/ef9e5189740ea5be46ad0d51c2ff554cd99ac162))
14+
15+
16+
### Dependencies
17+
18+
* update dependency com.google.errorprone:error_prone_annotations to v2.35.1 ([#3316](https://github.com/googleapis/sdk-platform-java/issues/3316)) ([d7c290f](https://github.com/googleapis/sdk-platform-java/commit/d7c290f3e49c8ec7c480229e2c8ae38fcdcd99f6))
19+
320
## [2.48.0](https://github.com/googleapis/sdk-platform-java/compare/v2.47.0...v2.48.0) (2024-10-22)
421

522

‎WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
5858
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
5959
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")
6060

61-
_gapic_generator_java_version = "2.48.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current}
61+
_gapic_generator_java_version = "2.49.0" # {x-version-update:gapic-generator-java:current}
6262

6363
maven_install(
6464
artifacts = [

‎api-common-java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<groupId>com.google.api</groupId>
66
<artifactId>api-common</artifactId>
77
<packaging>jar</packaging>
8-
<version>2.39.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
8+
<version>2.40.0</version><!-- {x-version-update:api-common:current} -->
99
<name>API Common</name>
1010
<description>Common utilities for Google APIs in Java</description>
1111

1212
<parent>
1313
<groupId>com.google.api</groupId>
1414
<artifactId>gapic-generator-java-pom-parent</artifactId>
15-
<version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
15+
<version>2.49.0</version><!-- {x-version-update:gapic-generator-java:current} -->
1616
<relativePath>../gapic-generator-java-pom-parent</relativePath>
1717
</parent>
1818

‎coverage-report/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@
3131
<dependency>
3232
<groupId>com.google.api</groupId>
3333
<artifactId>gax</artifactId>
34-
<version>2.56.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
34+
<version>2.57.0</version> <!-- {x-version-update:gax:current} -->
3535
</dependency>
3636
<dependency>
3737
<groupId>com.google.api</groupId>
3838
<artifactId>gax-grpc</artifactId>
39-
<version>2.56.1-SNAPSHOT</version> <!-- {x-version-update:gax-grpc:current} -->
39+
<version>2.57.0</version> <!-- {x-version-update:gax-grpc:current} -->
4040
</dependency>
4141
<dependency>
4242
<groupId>com.google.api</groupId>
4343
<artifactId>gax-httpjson</artifactId>
44-
<version>2.56.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
44+
<version>2.57.0</version> <!-- {x-version-update:gax:current} -->
4545
</dependency>
4646
<dependency>
4747
<groupId>com.google.api</groupId>
4848
<artifactId>api-common</artifactId>
49-
<version>2.39.1-SNAPSHOT</version> <!-- {x-version-update:api-common:current} -->
49+
<version>2.40.0</version> <!-- {x-version-update:api-common:current} -->
5050
</dependency>
5151
</dependencies>
5252

‎gapic-generator-java-bom/pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.google.api</groupId>
55
<artifactId>gapic-generator-java-bom</artifactId>
66
<packaging>pom</packaging>
7-
<version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
7+
<version>2.49.0</version><!-- {x-version-update:gapic-generator-java:current} -->
88
<name>GAPIC Generator Java BOM</name>
99
<description>
1010
BOM for the libraries in gapic-generator-java repository. Users should not
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>com.google.api</groupId>
1717
<artifactId>gapic-generator-java-pom-parent</artifactId>
18-
<version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
18+
<version>2.49.0</version><!-- {x-version-update:gapic-generator-java:current} -->
1919
<relativePath>../gapic-generator-java-pom-parent</relativePath>
2020
</parent>
2121

@@ -75,61 +75,61 @@
7575
<dependency>
7676
<groupId>com.google.api</groupId>
7777
<artifactId>api-common</artifactId>
78-
<version>2.39.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
78+
<version>2.40.0</version><!-- {x-version-update:api-common:current} -->
7979
</dependency>
8080
<dependency>
8181
<groupId>com.google.api</groupId>
8282
<artifactId>gax-bom</artifactId>
83-
<version>2.56.1-SNAPSHOT</version><!-- {x-version-update:gax:current} -->
83+
<version>2.57.0</version><!-- {x-version-update:gax:current} -->
8484
<type>pom</type>
8585
<scope>import</scope>
8686
</dependency>
8787
<dependency>
8888
<groupId>com.google.api</groupId>
8989
<artifactId>gapic-generator-java</artifactId>
90-
<version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
90+
<version>2.49.0</version><!-- {x-version-update:gapic-generator-java:current} -->
9191
</dependency>
9292
<dependency>
9393
<groupId>com.google.api.grpc</groupId>
9494
<artifactId>grpc-google-common-protos</artifactId>
95-
<version>2.47.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
95+
<version>2.48.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
9696
</dependency>
9797
<dependency>
9898
<groupId>com.google.api.grpc</groupId>
9999
<artifactId>proto-google-common-protos</artifactId>
100-
<version>2.47.1-SNAPSHOT</version><!-- {x-version-update:proto-google-common-protos:current} -->
100+
<version>2.48.0</version><!-- {x-version-update:proto-google-common-protos:current} -->
101101
</dependency>
102102
<dependency>
103103
<groupId>com.google.api.grpc</groupId>
104104
<artifactId>proto-google-iam-v1</artifactId>
105-
<version>1.42.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v1:current} -->
105+
<version>1.43.0</version><!-- {x-version-update:proto-google-iam-v1:current} -->
106106
</dependency>
107107
<dependency>
108108
<groupId>com.google.api.grpc</groupId>
109109
<artifactId>proto-google-iam-v2</artifactId>
110-
<version>1.42.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2:current} -->
110+
<version>1.43.0</version><!-- {x-version-update:proto-google-iam-v2:current} -->
111111
</dependency>
112112
<dependency>
113113
<groupId>com.google.api.grpc</groupId>
114114
<artifactId>proto-google-iam-v2beta</artifactId>
115-
<version>1.42.1-SNAPSHOT</version><!-- {x-version-update:proto-google-iam-v2beta:current} -->
115+
<version>1.43.0</version><!-- {x-version-update:proto-google-iam-v2beta:current} -->
116116
</dependency>
117117

118118
<!-- Following test deps are kept to keep them consistent with versions above -->
119119
<dependency>
120120
<groupId>com.google.api.grpc</groupId>
121121
<artifactId>grpc-google-iam-v1</artifactId>
122-
<version>1.42.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v1:current} -->
122+
<version>1.43.0</version><!-- {x-version-update:grpc-google-iam-v1:current} -->
123123
</dependency>
124124
<dependency>
125125
<groupId>com.google.api.grpc</groupId>
126126
<artifactId>grpc-google-iam-v2</artifactId>
127-
<version>1.42.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2:current} -->
127+
<version>1.43.0</version><!-- {x-version-update:grpc-google-iam-v2:current} -->
128128
</dependency>
129129
<dependency>
130130
<groupId>com.google.api.grpc</groupId>
131131
<artifactId>grpc-google-iam-v2beta</artifactId>
132-
<version>1.42.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-iam-v2beta:current} -->
132+
<version>1.43.0</version><!-- {x-version-update:grpc-google-iam-v2beta:current} -->
133133
</dependency>
134134
</dependencies>
135135

‎gapic-generator-java-pom-parent/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.google.api</groupId>
77
<artifactId>gapic-generator-java-pom-parent</artifactId>
8-
<version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
8+
<version>2.49.0</version><!-- {x-version-update:gapic-generator-java:current} -->
99
<packaging>pom</packaging>
1010
<name>GAPIC Generator Java POM Parent</name>
1111
<url>https://github.com/googleapis/sdk-platform-java</url>
@@ -34,7 +34,7 @@
3434
<protobuf.version>3.25.5</protobuf.version>
3535
<opentelemetry.version>1.42.1</opentelemetry.version>
3636
<maven.compiler.release>8</maven.compiler.release>
37-
<errorprone.version>2.34.0</errorprone.version>
37+
<errorprone.version>2.35.1</errorprone.version>
3838
<j2objc-annotations.version>3.0.0</j2objc-annotations.version>
3939
<threetenbp.version>1.7.0</threetenbp.version>
4040
<junit.version>5.11.2</junit.version>

‎gapic-generator-java/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api</groupId>
66
<artifactId>gapic-generator-java</artifactId>
7-
<version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
7+
<version>2.49.0</version><!-- {x-version-update:gapic-generator-java:current} -->
88
<name>GAPIC Generator Java</name>
99
<description>GAPIC generator Java</description>
1010

@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>com.google.api</groupId>
2424
<artifactId>gapic-generator-java-pom-parent</artifactId>
25-
<version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
25+
<version>2.49.0</version><!-- {x-version-update:gapic-generator-java:current} -->
2626
<relativePath>../gapic-generator-java-pom-parent</relativePath>
2727
</parent>
2828

@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.google.api</groupId>
3333
<artifactId>gapic-generator-java-bom</artifactId>
34-
<version>2.48.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
34+
<version>2.49.0</version><!-- {x-version-update:gapic-generator-java:current} -->
3535
<type>pom</type>
3636
<scope>import</scope>
3737
</dependency>

‎gax-java/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@ If you are using Maven, add this to your pom.xml file
3434
<dependency>
3535
<groupId>com.google.api</groupId>
3636
<artifactId>gax</artifactId>
37-
<version>2.56.0</version>
37+
<version>2.57.0</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>com.google.api</groupId>
4141
<artifactId>gax-grpc</artifactId>
42-
<version>2.56.0</version>
42+
<version>2.57.0</version>
4343
</dependency>
4444
```
4545

4646
If you are using Gradle, add this to your dependencies
4747

4848
```Groovy
49-
compile 'com.google.api:gax:2.56.0',
50-
'com.google.api:gax-grpc:2.56.0'
49+
compile 'com.google.api:gax:2.57.0',
50+
'com.google.api:gax-grpc:2.57.0'
5151
```
5252

5353
If you are using SBT, add this to your dependencies
5454

5555
```Scala
56-
libraryDependencies += "com.google.api" % "gax" % "2.56.0"
57-
libraryDependencies += "com.google.api" % "gax-grpc" % "2.56.0"
56+
libraryDependencies += "com.google.api" % "gax" % "2.57.0"
57+
libraryDependencies += "com.google.api" % "gax-grpc" % "2.57.0"
5858
```
5959
[//]: # ({x-version-update-end})
6060

‎gax-java/dependencies.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
# Versions of oneself
1010
# {x-version-update-start:gax:current}
11-
version.gax=2.56.1-SNAPSHOT
11+
version.gax=2.57.0
1212
# {x-version-update-end}
1313
# {x-version-update-start:gax:current}
14-
version.gax_grpc=2.56.1-SNAPSHOT
14+
version.gax_grpc=2.57.0
1515
# {x-version-update-end}
1616
# {x-version-update-start:gax:current}
17-
version.gax_bom=2.56.1-SNAPSHOT
17+
version.gax_bom=2.57.0
1818
# {x-version-update-end}
1919
# {x-version-update-start:gax:current}
20-
version.gax_httpjson=2.56.1-SNAPSHOT
20+
version.gax_httpjson=2.57.0
2121
# {x-version-update-end}
2222

2323
# Versions for dependencies which actual artifacts differ between Bazel and Gradle.
@@ -63,7 +63,7 @@ maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.2
6363
maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.17.0
6464
maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4
6565
maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2
66-
maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.34.0
66+
maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.35.1
6767
maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:2.8
6868
maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.11.0
6969
maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.11.0

0 commit comments

Comments
 (0)