Upgrade to Beam 2.68.0 (#2830)

* Update pom and requirements

* Update python requirements

* Pin jsonschema

* Add todo

* Fix expected exception messages for Spanner tests

Author: Amar3tto

pom.xml

@@ -48,8 +48,8 @@
     <jacoco.version>0.8.13</jacoco.version>
 
     <!-- Beam and linked versions -->
-    <beam.version>2.67.0</beam.version>
-    <beam-python.version>2.67.0</beam-python.version>
+    <beam.version>2.68.0</beam.version>
+    <beam-python.version>2.68.0</beam-python.version>
     <beam-maven-repo></beam-maven-repo>
 
     <!-- Common dependency versions -->
@@ -83,7 +83,7 @@
     <spotless-maven-plugin.version>2.46.1</spotless-maven-plugin.version>
     <surefire.version>2.21.0</surefire.version>
     <truth.version>1.1.5</truth.version>
-    <gax.version>2.68.1</gax.version>
+    <gax.version>2.68.2</gax.version>
 
     <!-- Drop pinned version once maven-dependency-plugin gets past plexus-archiver 4.8.0 -->
     <plexus-archiver.version>4.8.0</plexus-archiver.version>

python/default_base_python_requirements.txt

@@ -1,2 +1,3 @@
-apache-beam[gcp]==2.67.0
+apache-beam[gcp]==2.68.0
+jsonschema==4.25.1 # TODO: remove when correct version could come from beam
 setuptools

python/default_base_yaml_requirements.txt

@@ -1,2 +1,3 @@
-apache-beam[dataframe,gcp,test,yaml]==2.67.0
+apache-beam[dataframe,gcp,test,yaml]==2.68.0
+jsonschema==4.25.1 # TODO: remove when correct version could come from beam
 setuptools

python/src/main/python/job-builder-server/requirements.txt

@@ -1,4 +1,5 @@
-apache-beam[gcp]==2.67.0
+apache-beam[gcp]==2.68.0
+jsonschema==4.25.1 # TODO: remove when correct version could come from beam
 torch
 transformers
 torchvision

python/src/main/python/streaming-llm/base_requirements.txt

@@ -331,7 +331,7 @@ public void datatypeMismatch() {
     Assert.assertNotNull(exception);
     Assert.assertEquals(
         exception.getMessage(),
-        "FAILED_PRECONDITION: io.grpc.StatusRuntimeException: FAILED_PRECONDITION: Invalid value for column id in table Books: Expected INT64.");
+        "INVALID_ARGUMENT: io.grpc.StatusRuntimeException: INVALID_ARGUMENT: Failed to initialize transaction due to invalid mutation key.");
     assertSpannerExceptionClassification(exception, PERMANENT_ERROR, actualTag);
   }
 
@@ -385,7 +385,7 @@ public void writeToStoredGeneratedColumn() {
     Assert.assertNotNull(exception);
     Assert.assertEquals(
         exception.getMessage(),
-        "FAILED_PRECONDITION: io.grpc.StatusRuntimeException: FAILED_PRECONDITION: Cannot write into generated column `Books.titleLowerStored`.");
+        "INVALID_ARGUMENT: io.grpc.StatusRuntimeException: INVALID_ARGUMENT: Failed to initialize transaction due to invalid mutation key.");
     assertSpannerExceptionClassification(exception, PERMANENT_ERROR, actualTag);
   }
 
@@ -404,7 +404,7 @@ public void pkValueOrDependantColValueNotProvidedForGenPKWhileUpdating() {
     Assert.assertNotNull(exception);
     Assert.assertEquals(
         exception.getMessage(),
-        "FAILED_PRECONDITION: io.grpc.StatusRuntimeException: FAILED_PRECONDITION: For an Update, the value of a generated primary key `id2` must be explicitly specified, or else its non-key dependent column `part1` must be specified. Key: [1,<default>]");
+        "INVALID_ARGUMENT: io.grpc.StatusRuntimeException: INVALID_ARGUMENT: Failed to initialize transaction due to invalid mutation key.");
     assertSpannerExceptionClassification(exception, PERMANENT_ERROR, actualTag);
   }
 
@@ -422,7 +422,7 @@ public void deleteWithPartialKey() {
     Assert.assertNotNull(exception);
     Assert.assertEquals(
         exception.getMessage(),
-        "FAILED_PRECONDITION: io.grpc.StatusRuntimeException: FAILED_PRECONDITION: Wrong number of key parts for MultiKeyTable. Expected: 3. Got: [\"1\"]");
+        "INVALID_ARGUMENT: io.grpc.StatusRuntimeException: INVALID_ARGUMENT: Failed to initialize transaction due to invalid mutation key.");
     assertSpannerExceptionClassification(exception, PERMANENT_ERROR, actualTag);
   }
 }