[Do not merge] Beam 2.58.0rc1 validation

GoogleCloudPlatform · Jul 19, 2024 · d28b769 · d28b769
1 parent d7db191
commit d28b769
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java b/it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/TemplateTestBase.java
@@ -482,6 +482,7 @@ protected LaunchInfo launchTemplate(LaunchConfig.Builder options, boolean setupS
   protected LaunchInfo launchTemplate(
       LaunchConfig.Builder options, boolean setupShutdownHook, Template templateMetadata)
       throws IOException {
+    options.addParameter("customBeamRequirement", "2.68.0rc1");
 
     boolean flex =
         templateMetadata.flexContainerName() != null

diff --git a/plugins/core-plugin/pom.xml b/plugins/core-plugin/pom.xml
@@ -37,7 +37,7 @@
 
     <reflections.version>0.9.11</reflections.version>
     <gson.version>2.9.1</gson.version>
-    <commons-lang3.version>3.11</commons-lang3.version>
+    <commons-lang3.version>3.14.0</commons-lang3.version>
     <freemarker.version>2.3.32</freemarker.version>
     <auto-value.version>1.10.4</auto-value.version>
   </properties>

diff --git a/pom.xml b/pom.xml
@@ -31,6 +31,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+<!--    <os.detected.classifier>osx-x86_64</os.detected.classifier>-->
     <java.version>11</java.version>
     <!-- Plugins -->
     <templates-maven-plugin.version>1.0-SNAPSHOT</templates-maven-plugin.version>
@@ -47,9 +48,9 @@
     <jacoco.version>0.8.8</jacoco.version>
 
     <!-- Beam and linked versions -->
-    <beam.version>2.57.0</beam.version>
-    <beam-python.version>2.57.0</beam-python.version>
-    <beam-maven-repo></beam-maven-repo>
+    <beam.version>2.58.0</beam.version>
+    <beam-python.version>2.58.0rc1</beam-python.version>
+    <beam-maven-repo>https://repository.apache.org/content/repositories/orgapachebeam-1381/</beam-maven-repo>
 
     <!-- Common dependency versions -->
     <autovalue.version>1.10.4</autovalue.version>
@@ -58,7 +59,7 @@
     <checkstyle.version>10.7.0</checkstyle.version>
     <commons-codec.version>1.16.0</commons-codec.version>
     <commons-io.version>2.11.0</commons-io.version>
-    <commons-lang3.version>3.12.0</commons-lang3.version>
+    <commons-lang3.version>3.14.0</commons-lang3.version>
     <conscrypt.version>2.5.2</conscrypt.version>
     <derby.version>10.14.2.0</derby.version>
     <grpc.gen.version>1.13.1</grpc.gen.version>
@@ -590,7 +591,7 @@
     <profile>
       <id>validateCandidate</id>
       <activation>
-        <activeByDefault>false</activeByDefault>
+        <jdk>[1.)</jdk>
       </activation>
       <repositories>
         <repository>
@@ -602,7 +603,7 @@
     <profile>
       <id>splunkDeps</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <jdk>[1.)</jdk>
       </activation>
       <repositories>
         <repository>

diff --git a/v1/pom.xml b/v1/pom.xml
@@ -947,7 +947,7 @@
     <profile>
       <id>missing-artifact-repos</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <jdk>[1.)</jdk>
       </activation>
       <repositories>
         <repository>

diff --git a/v2/cdc-parent/cdc-embedded-connector/pom.xml b/v2/cdc-parent/cdc-embedded-connector/pom.xml
@@ -72,7 +72,7 @@
     <profile>
       <id>mysql</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <jdk>[1.)</jdk>
       </activation>
       <dependencies>
         <dependency>

diff --git a/v2/pom.xml b/v2/pom.xml
@@ -465,7 +465,7 @@
         <profile>
             <id>missing-artifact-repos</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <jdk>[1.)</jdk>
             </activation>
             <repositories>
                 <repository>