Skip to content

Commit 2f5481a

Browse files
authored
deps(gax-httpjson): upgrade conscrypt-openjdk-uber to 2.6.2 (#14117)
## Description Upgrade `org.conscrypt:conscrypt-openjdk-uber` from `2.6.0` to `2.6.2`. Conscrypt 2.6.2 compiles native binaries against an older glibc baseline, improving compatibility across older Linux environments and test frameworks like Robolectric (see robolectric/robolectric#11362). Error: ``` Exception: java.lang.UnsatisfiedLinkError: /tmp/libconscrypt_openjdk_jni-linux-x86_6417845320266820000.so: /lib64/libc.so.6: version `GLIBC_2.35' not found (required by /tmp/libconscrypt_openjdk_jni-linux-x86_6417845320266820000.so) ``` ## Changes - Bump `conscrypt.version` to `2.6.2` in `sdk-platform-java/gapic-generator-java-pom-parent/pom.xml` - Update Conscrypt version to `2.6.2` in `sdk-platform-java/gax-java/dependencies.properties` - Update Conscrypt version to `2.6.2` in `sdk-platform-java/dependencies.txt` - Update expected downstream version in `.kokoro/java-storage-expected-flattened-dependencies.txt` - Update version reference in `java-cloud-bom/README.md` - Update Conscrypt capabilities doc links in `HttpJsonConscryptUtils.java` and `ITPostQuantumCryptography.java`
1 parent 7604971 commit 2f5481a

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

.kokoro/java-storage-expected-flattened-dependencies.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ org.apache.httpcomponents:httpcore:jar:4.4.16:compile
8080
org.checkerframework:checker-qual:jar:3.49.0:compile
8181
org.codehaus.mojo:animal-sniffer-annotations:jar:1.27:compile
8282
org.codehaus.woodstox:stax2-api:jar:4.2.2:compile
83-
org.conscrypt:conscrypt-openjdk-uber:jar:2.6.0:compile
83+
org.conscrypt:conscrypt-openjdk-uber:jar:2.6.2:compile
8484
org.jspecify:jspecify:jar:1.0.0:compile
8585
org.slf4j:slf4j-api:jar:2.0.16:compile
8686
org.threeten:threetenbp:jar:1.7.0:compile

java-cloud-bom/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This is the table of modules included in the latest libraries-bom release:
4949
| Artifact ID | Library Type | Google Cloud Library Reference | Google Cloud Product Reference |
5050
| --------- | ------------ | ------------ | ------------ |
5151
| api-common | Runtime | [2.66.0](https://cloud.google.com/java/docs/reference/api-common/latest/overview) | N/A |
52-
| conscrypt-openjdk-uber | Product | [2.6.0](https://cloud.google.com/java/docs/reference/conscrypt-openjdk-uber/latest/overview) | N/A |
52+
| conscrypt-openjdk-uber | Product | [2.6.2](https://cloud.google.com/java/docs/reference/conscrypt-openjdk-uber/latest/overview) | N/A |
5353
| gax | Runtime | [2.83.0](https://cloud.google.com/java/docs/reference/gax/latest/overview) | N/A |
5454
| google-analytics-admin | Product | [0.105.0](https://cloud.google.com/java/docs/reference/google-analytics-admin/latest/overview) | [Analytics Admin](https://developers.google.com/analytics) |
5555
| google-analytics-data | Product | [0.106.0](https://cloud.google.com/java/docs/reference/google-analytics-data/latest/overview) | [Analytics Data](https://developers.google.com/analytics/trusted-testing/analytics-data) |

java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITPostQuantumCryptography.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ void testHttpJsonPqc() throws Exception {
152152
// Go's crypto/tls library only recognizes standard Curve IDs (e.g. X25519MLKEM768 and
153153
// X25519), which is not a 1:1 mapping with the full list of named groups that Conscrypt
154154
// supports (see
155-
// https://github.com/google/conscrypt/blob/2.6.0/CAPABILITIES.md#supported-named-groups).
155+
// https://github.com/google/conscrypt/blob/2.6.2/CAPABILITIES.md#supported-named-groups).
156156
// Draft/standalone groups like X25519Kyber768Draft00 and MLKEM1024 are formatted as
157157
// "Unknown-Curve-25497" and "Unknown-Curve-514" by the Showcase server.
158158
List<String> supportedGroups =

sdk-platform-java/dependencies.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ com.google.j2objc:j2objc-annotations,j2objc-annotations=3.1
2121
org.threeten:threetenbp,threetenbp=1.7.3
2222
org.slf4j:slf4j-api,slf4j=2.0.18
2323
org.jspecify:jspecify,jspecify=1.0.0
24-
org.conscrypt:conscrypt-openjdk-uber,conscrypt=2.6.1
24+
org.conscrypt:conscrypt-openjdk-uber,conscrypt=2.6.2
2525

2626
# 1P Shared-Deps
2727
# These dependencies are declared: https://github.com/googleapis/google-cloud-java/blob/main/sdk-platform-java/java-shared-dependencies/first-party-dependencies/pom.xml

sdk-platform-java/gapic-generator-java-pom-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<mockito.version>4.11.0</mockito.version>
4242
<awaitility.version>4.3.0</awaitility.version>
4343
<slf4j.version>2.0.16</slf4j.version>
44-
<conscrypt.version>2.6.0</conscrypt.version>
44+
<conscrypt.version>2.6.2</conscrypt.version>
4545
<!-- skipping clirr check for protobuf 4.x upgrade -->
4646
<clirr.skip>true</clirr.skip>
4747
<ignoreNonCompile>true</ignoreNonCompile><!-- maven-dependency-plugin:analyze to skip test scope dependencies -->

sdk-platform-java/gax-java/dependencies.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-ap
7979
maven.org_graalvm_sdk=org.graalvm.sdk:nativeimage:24.1.2
8080
maven.org_slf4j_slf4j_api=org.slf4j:slf4j-api:2.0.16
8181
maven.com_google_protobuf_protobuf_java_util=com.google.protobuf:protobuf-java-util:3.25.5
82-
maven.org_conscrypt_conscrypt_openjdk_uber=org.conscrypt:conscrypt-openjdk-uber:2.6.0
82+
maven.org_conscrypt_conscrypt_openjdk_uber=org.conscrypt:conscrypt-openjdk-uber:2.6.2
8383

8484
# Testing maven artifacts
8585
maven.org_jspecify_jspecify=org.jspecify:jspecify:1.0.0

sdk-platform-java/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonConscryptUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class HttpJsonConscryptUtils {
5555
* ClientHello extension in preference order. The server selects the first group it supports.
5656
*
5757
* <p>For details on Conscrypt's supported TLS algorithms, see <a
58-
* href="https://github.com/google/conscrypt/blob/2.6.0/CAPABILITIES.md">Conscrypt
58+
* href="https://github.com/google/conscrypt/blob/2.6.2/CAPABILITIES.md">Conscrypt
5959
* CAPABILITIES.md</a>.
6060
*/
6161
static final String[] DEFAULT_CONSCRYPT_NAMED_GROUPS =

0 commit comments

Comments
 (0)