fix: merge master

Author: miraleung

test/integration/BUILD.bazel

@@ -1,6 +1,7 @@
 load(
  "@com_google_googleapis_imports//:imports.bzl",
  "proto_library_with_info",
+ java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
  java_gapic_library = "java_gapic_library2",
 )
 load(
@@ -39,25 +40,6 @@ golden_update(
  target = ":asset_java_gapic",
 )
 
-golden_update(
- name = "asset_update",
- data = ["//test/integration/goldens/asset:goldens_files"],
- data = ["//test/integration/goldens/asset:goldens_files"],
- target = ":asset_java_gapic",
-)
-
-golden_update(
- name = "redis_update",
- data = ["//test/integration/goldens/redis:goldens_files"],
- target = ":redis_java_gapic",
-)
-
-golden_update(
- name = "asset_update",
- data = ["//test/integration/goldens/asset:goldens_files"],
- target = ":asset_java_gapic",
-)
-
 ####################################################
 # API Library Rules
 ####################################################
@@ -105,6 +87,17 @@ java_gapic_library(
  ],
 )
 
+java_gapic_assembly_gradle_pkg(
+ name = "google-cloud-redis-v1-java",
+ deps = [
+ ":redis_java_gapic",
+ "@com_google_googleapis//google/cloud/redis/v1:redis_java_grpc",
+ "@com_google_googleapis//google/cloud/redis/v1:redis_java_proto",
+ "@com_google_googleapis//google/cloud/redis/v1:redis_proto",
+ ],
+)
+
+# Logging API
 java_gapic_library(
  name = "logging_java_gapic",
  srcs = ["@com_google_googleapis//google/logging/v2:logging_proto_with_info"],
@@ -119,3 +112,16 @@ java_gapic_library(
  "@com_google_googleapis//google/logging/v2:logging_java_proto",
  ],
 )
+<<<<<<< HEAD
+=======
+
+java_gapic_assembly_gradle_pkg(
+ name = "google-cloud-logging-v2-java",
+ deps = [
+ ":logging_java_gapic",
+ "@com_google_googleapis//google/logging/v2:logging_java_grpc",
+ "@com_google_googleapis//google/logging/v2:logging_java_proto",
+ "@com_google_googleapis//google/logging/v2:logging_proto",
+ ],
+)
+>>>>>>> 602e1df7 (fix: merge master)