Skip to content

refactor(bigquery): resolve circular test dependency with bigquerystorage #13949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jinseopkim0 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor(bigquery): resolve circular test dependency with bigquerystorage #13949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 22 additions & 1 deletion .kokoro/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,28 @@ function generate_modified_modules_list() {
modules=$(echo "${modules}" | cut -d '/' -f1 | sort -u)
for module in $modules; do
if [[ " ${maven_modules[*]} " =~ " ${module} " ]]; then
modified_module_list+=("${module}")
local duplicate=false
for item in "${modified_module_list[@]}"; do
if [[ "${item}" == "${module}" ]]; then
duplicate=true
break
fi
done
if [[ "${duplicate}" == "false" ]]; then
modified_module_list+=("${module}")
fi
if [[ "${module}" == "java-bigquerystorage" ]]; then
local has_bigquery=false
for item in "${modified_module_list[@]}"; do
if [[ "${item}" == "java-bigquery" ]]; then
has_bigquery=true
break
fi
done
if [[ "${has_bigquery}" == "false" ]]; then
modified_module_list+=("java-bigquery")
fi
fi
fi
done
else
Expand Down
6 changes: 6 additions & 0 deletions .kokoro/presubmit/bigquery-graalvm-native-presubmit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,15 @@ env_vars: {
key: "ENABLE_FLAKYBOT"
value: "false"
}
env_vars: {
key: "INTEGRATION_TEST_ARGS"
value: "-Dit.test=!ITBigQueryWrite*RetryTest -Dtest=!ITBigQueryWrite*RetryTest -Dsurefire.failIfNoSpecifiedTests=false -Dfailsafe.failIfNoSpecifiedTests=false"
}

env_vars: {
key: "BUILD_SUBDIR"
value: "java-bigquery"
}



6 changes: 6 additions & 0 deletions .kokoro/presubmit/bigquery-integration.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,15 @@ env_vars: {
}


env_vars: {
key: "INTEGRATION_TEST_ARGS"
value: "-Dit.test=!ITBigQueryWrite*RetryTest -Dsurefire.failIfNoSpecifiedTests=false -Dfailsafe.failIfNoSpecifiedTests=false"
}

env_vars: {
key: "BUILD_SUBDIR"
value: "java-bigquery"
}



2 changes: 1 addition & 1 deletion WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")

_gapic_generator_java_version = "2.76.0-SNAPSHOT" # {x-version-update:gapic-generator-java:current}
_gapic_generator_java_version = "2.75.0" # {x-version-update:gapic-generator-java:current}

maven_install(
artifacts = [
Expand Down
450 changes: 225 additions & 225 deletions gapic-libraries-bom/pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion google-auth-library-java/appengine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-parent</artifactId>
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
10 changes: 5 additions & 5 deletions google-auth-library-java/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-bom</artifactId>
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-bom:current} -->
<version>1.50.0</version><!-- {x-version-update:google-auth-library-bom:current} -->
<packaging>pom</packaging>

<parent>
Expand All @@ -23,22 +23,22 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-appengine</artifactId>
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-cab-token-generator</artifactId>
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion google-auth-library-java/cab-token-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-parent</artifactId>
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
</parent>

<artifactId>google-auth-library-cab-token-generator</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion google-auth-library-java/credentials/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-parent</artifactId>
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion google-auth-library-java/oauth2_http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-parent</artifactId>
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions google-auth-library-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-parent</artifactId>
<version>1.51.0-SNAPSHOT</version><!-- {x-version-update:google-auth-library-parent:current} -->
<version>1.50.0</version><!-- {x-version-update:google-auth-library-parent:current} -->
<packaging>pom</packaging>
<name>Google Auth Library for Java</name>
<description>Client libraries providing authentication and
Expand Down Expand Up @@ -86,7 +86,7 @@
<project.tink.version>1.15.0</project.tink.version>
<project.slf4j.version>2.0.17</project.slf4j.version>
<project.gson.version>2.13.2</project.gson.version>
<project.api-common.version>2.67.0-SNAPSHOT</project.api-common.version><!-- {x-version-update:api-common:current} -->
<project.api-common.version>2.66.0</project.api-common.version><!-- {x-version-update:api-common:current} -->
<project.commons-codec.version>1.18.0</project.commons-codec.version>
<surefire.version>3.5.2</surefire.version>
<clirr.skip>true</clirr.skip>
Expand Down
8 changes: 4 additions & 4 deletions google-cloud-jar-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-jar-parent</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.90.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
<version>1.89.0</version><!-- {x-version-update:google-cloud-java:current} -->
<packaging>pom</packaging>
<name>Google Cloud JAR Parent</name>
<description>
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pom-parent</artifactId>
<version>1.90.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-pom-parent:current} -->
<version>1.89.0</version><!-- {x-version-update:google-cloud-pom-parent:current} -->
<relativePath>../google-cloud-pom-parent/pom.xml</relativePath>
</parent>
<properties>
Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-dependencies</artifactId>
<version>3.66.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<version>3.65.0</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -47,7 +47,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.72.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
<version>2.71.0</version><!-- {x-version-update:google-cloud-storage:current} -->
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-pom-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>google-cloud-pom-parent</artifactId>
<groupId>com.google.cloud</groupId>
<version>1.90.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-pom-parent:current} -->
<version>1.89.0</version><!-- {x-version-update:google-cloud-pom-parent:current} -->
<packaging>pom</packaging>
<name>Google Cloud POM Parent</name>
<url>https://github.com/googleapis/google-cloud-java</url>
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>sdk-platform-java-config</artifactId>
<version>3.66.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<version>3.65.0</version><!-- {x-version-update:google-cloud-shared-dependencies:current} -->
<relativePath>../sdk-platform-java/sdk-platform-java-config</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions grpc-gcp-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<groupId>com.google.cloud</groupId>
<artifactId>grpc-gcp</artifactId>
<version>1.14.0-SNAPSHOT</version><!-- {x-version-update:grpc-gcp:current} -->
<version>1.13.0</version><!-- {x-version-update:grpc-gcp:current} -->
<packaging>jar</packaging>

<name>gRPC extension library for Google Cloud Platform</name>
Expand Down Expand Up @@ -62,7 +62,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<site.installationModule>grpc-gcp</site.installationModule>
<api-common.version>2.67.0-SNAPSHOT</api-common.version><!-- {x-version-update:api-common:current} -->
<api-common.version>2.66.0</api-common.version><!-- {x-version-update:api-common:current} -->
<auto-value.version>1.11.0</auto-value.version>
<error-prone-annotations.version>2.48.0</error-prone-annotations.version>
<google-http-client.version>2.2.0</google-http-client.version>
Expand All @@ -74,7 +74,7 @@
<junit.version>4.13.2</junit.version>
<opencensus.version>0.31.1</opencensus.version>
<opentelemetry.version>1.62.0</opentelemetry.version>
<spanner.version>6.121.0-SNAPSHOT</spanner.version><!-- {x-version-update:google-cloud-spanner:current} -->
<spanner.version>6.120.0</spanner.version><!-- {x-version-update:google-cloud-spanner:current} -->
<truth.version>1.4.5</truth.version>
<mockito.version>4.11.0</mockito.version>
<checkstyle.skip>true</checkstyle.skip>
Expand Down
10 changes: 5 additions & 5 deletions java-accessapproval/google-cloud-accessapproval-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval-bom</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.96.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<packaging>pom</packaging>

<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pom-parent</artifactId>
<version>1.90.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-pom-parent:current} -->
<version>1.89.0</version><!-- {x-version-update:google-cloud-pom-parent:current} -->
<relativePath>../../google-cloud-pom-parent/pom.xml</relativePath>
</parent>

Expand All @@ -24,17 +24,17 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.96.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-accessapproval-v1</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
<version>2.96.0</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-accessapproval-v1</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
<version>2.96.0</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
</dependency>
<!-- {x-generated-dependencies-end} -->
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions java-accessapproval/google-cloud-accessapproval/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.96.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<packaging>jar</packaging>
<name>Google Cloud Access Approval</name>
<description>Java idiomatic client for Google Cloud accessapproval</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval-parent</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.96.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
</parent>
<properties>
<site.installationModule>google-cloud-accessapproval</site.installationModule>
Expand Down
2 changes: 1 addition & 1 deletion ...e-cloud-accessapproval/src/main/java/com/google/cloud/accessapproval/v1/stub/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
@InternalApi("For internal use only")
final class Version {
// {x-version-update-start:google-cloud-accessapproval:current}
static final String VERSION = "2.97.0-SNAPSHOT";
static final String VERSION = "2.96.0";
// {x-version-update-end}

}
4 changes: 2 additions & 2 deletions java-accessapproval/grpc-google-cloud-accessapproval-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-accessapproval-v1</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
<version>2.96.0</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
<name>grpc-google-cloud-accessapproval-v1</name>
<description>GRPC library for grpc-google-cloud-accessapproval-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval-parent</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.96.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
10 changes: 5 additions & 5 deletions java-accessapproval/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval-parent</artifactId>
<packaging>pom</packaging>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.96.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<name>Google Cloud Access Approval Parent</name>
<description>
Java idiomatic client for Google Cloud Platform services.
Expand All @@ -13,7 +13,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-jar-parent</artifactId>
<version>1.90.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-java:current} -->
<version>1.89.0</version><!-- {x-version-update:google-cloud-java:current} -->
<relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
</parent>

Expand All @@ -30,17 +30,17 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-accessapproval-v1</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
<version>2.96.0</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-accessapproval-v1</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
<version>2.96.0</version><!-- {x-version-update:grpc-google-cloud-accessapproval-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.96.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
</dependency>
<!-- {x-generated-dependencies-end} -->

Expand Down
4 changes: 2 additions & 2 deletions java-accessapproval/proto-google-cloud-accessapproval-v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-accessapproval-v1</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
<version>2.96.0</version><!-- {x-version-update:proto-google-cloud-accessapproval-v1:current} -->
<name>proto-google-cloud-accessapproval-v1beta1</name>
<description>PROTO library for proto-google-cloud-accessapproval-v1</description>
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-accessapproval-parent</artifactId>
<version>2.97.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
<version>2.96.0</version><!-- {x-version-update:google-cloud-accessapproval:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
Loading
Loading