fix(migration): resolve GHA build blocks and native-image issues

- Declared missing direct dependencies (maven-resolver-api, guava) in validate-bom tests.
- Stripped carriage returns (\r) from pre-install script outputs for Windows GHA runner compatibility.
- Deleted test native-image.properties in java-spanner-jdbc to prevent build-time initialization failures.
- Resolved merge conflicts in versions.txt.

Author: jinseopkim0

java-cloud-bom/tests/pre-install.sh

@@ -27,7 +27,7 @@ set -eo pipefail
   for f in $(find . -maxdepth 1 -name "java-*" | grep -v "java-cloud-bom" | grep -v "java-shared-config" | grep -v "java-showcase" | grep -v "java-samples"); do
     echo "$f" | sed 's|^\./||'
   done
-) | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
+) | tr -d '\r' | tr '\n' ',' | sed 's/,$//' > bom_projects.txt
 
 mvn install -pl $(cat bom_projects.txt) -am -amd -DskipTests=true -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dclirr.skip=true -Dgcloud.download.skip=true -B -V -T 1C -l java-cloud-bom/tests/mvn-install.log
 rm bom_projects.txt

java-cloud-bom/tests/validate-bom/pom.xml

@@ -61,16 +61,13 @@
       <version>1.5.15</version>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.1</version>
-      <scope>test</scope>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <version>1.4.5</version>
-      <scope>test</scope>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>30.1.1-jre</version>
     </dependency>
   </dependencies>
 

java-spanner-jdbc/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties

@@ -1059,14 +1059,11 @@ google-cloud-developer-knowledge:0.1.0:0.2.0-SNAPSHOT
 proto-google-cloud-developer-knowledge-v1:0.1.0:0.2.0-SNAPSHOT
 grpc-google-cloud-developer-knowledge-v1:0.1.0:0.2.0-SNAPSHOT
 google-cloud-backstory:0.1.0:0.2.0-SNAPSHOT
-<<<<<<< migrate-java-cloud-bom
 google-cloud-bom:0.265.0:0.266.0-SNAPSHOT
 libraries-bom:26.84.0:26.85.0-SNAPSHOT
 java-cloud-bom-tests:0.80.0:0.81.0-SNAPSHOT
 full-convergence-check:0.83.0:0.84.0-SNAPSHOT
-=======
 google-cloud-shared-config:1.17.0:1.17.1-SNAPSHOT
->>>>>>> main
 proto-google-cloud-agentregistry-v1:0.0.0:0.1.0-SNAPSHOT
 grpc-google-cloud-agentregistry-v1:0.0.0:0.1.0-SNAPSHOT
 google-cloud-agentregistry:0.0.0:0.1.0-SNAPSHOT