use glob and fix some issues

avro-converter/BUILD.bazel

@@ -23,11 +23,19 @@ java_library(
 
 java_test_suite(
     name = "avro-converter-tests",
+<<<<<<< Updated upstream
     srcs = [
         "src/test/java/io/confluent/connect/avro/AvroConverterTest.java",
         "src/test/java/io/confluent/connect/avro/DeprecatedTestTopicNameStrategy.java",
     ],
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/connect/avro/AvroConverterTest.java",
+#        "src/test/java/io/confluent/connect/avro/DeprecatedTestTopicNameStrategy.java",
+#    ],
+>>>>>>> Stashed changes
     deps = [
         ":avro-converter",
         "//avro-serializer",

avro-data/BUILD.bazel

@@ -55,10 +55,11 @@ filegroup(
 
 java_test_suite(
     name = "avro-data-tests",
-    srcs = [
-        "src/test/java/io/confluent/connect/avro/AdditionalAvroDataTest.java",
-        "src/test/java/io/confluent/connect/avro/AvroDataTest.java",
-    ],
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/connect/avro/AdditionalAvroDataTest.java",
+#        "src/test/java/io/confluent/connect/avro/AvroDataTest.java",
+#    ],
     data = [":avsc-srcs"],
     tags = ["no-java-spotbugs"],
     deps = [

avro-serde/BUILD.bazel

@@ -27,6 +27,7 @@ java_library(
 
 java_test_suite(
     name = "avro-serde-tests",
+<<<<<<< Updated upstream
     srcs = [
         "src/test/java/io/confluent/kafka/example/Widget.java",
         "src/test/java/io/confluent/kafka/streams/serdes/avro/AvroUtils.java",
@@ -38,6 +39,19 @@ java_test_suite(
         "src/test/java/io/confluent/kafka/streams/serdes/avro/SpecificAvroSerdeTest.java",
     ],
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/kafka/example/Widget.java",
+#        "src/test/java/io/confluent/kafka/streams/serdes/avro/AvroUtils.java",
+#        "src/test/java/io/confluent/kafka/streams/serdes/avro/ConfigurationUtilsTest.java",
+#        "src/test/java/io/confluent/kafka/streams/serdes/avro/GenericAvroSerdeTest.java",
+#        "src/test/java/io/confluent/kafka/streams/serdes/avro/PrimitiveAvroSerdeTest.java",
+#        "src/test/java/io/confluent/kafka/streams/serdes/avro/ReflectionAvroSerdeGenericTest.java",
+#        "src/test/java/io/confluent/kafka/streams/serdes/avro/ReflectionAvroSerdeSpecificTest.java",
+#        "src/test/java/io/confluent/kafka/streams/serdes/avro/SpecificAvroSerdeTest.java",
+#    ],
+>>>>>>> Stashed changes
     deps = [
         ":avro-serde",
         "//avro-serializer",

avro-serializer/BUILD.bazel

@@ -54,16 +54,17 @@ java_export(
 
 java_test_suite(
     name = "avro-serializer-tests",
-    srcs = [
-        "src/test/java/io/confluent/kafka/example/ExtendedWidget.java",
-        "src/test/java/io/confluent/kafka/example/Widget.java",
-        "src/test/java/io/confluent/kafka/formatter/AvroMessageFormatterTest.java",
-        "src/test/java/io/confluent/kafka/formatter/KafkaAvroFormatterTest.java",
-        "src/test/java/io/confluent/kafka/serializers/AbstractKafkaAvroDeserializerTest.java",
-        "src/test/java/io/confluent/kafka/serializers/AvroSchemaTest.java",
-        "src/test/java/io/confluent/kafka/serializers/ContextNameStrategyTest.java",
-        "src/test/java/io/confluent/kafka/serializers/KafkaAvroSerializerTest.java",
-    ],
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/kafka/example/ExtendedWidget.java",
+#        "src/test/java/io/confluent/kafka/example/Widget.java",
+#        "src/test/java/io/confluent/kafka/formatter/AvroMessageFormatterTest.java",
+#        "src/test/java/io/confluent/kafka/formatter/KafkaAvroFormatterTest.java",
+#        "src/test/java/io/confluent/kafka/serializers/AbstractKafkaAvroDeserializerTest.java",
+#        "src/test/java/io/confluent/kafka/serializers/AvroSchemaTest.java",
+#        "src/test/java/io/confluent/kafka/serializers/ContextNameStrategyTest.java",
+#        "src/test/java/io/confluent/kafka/serializers/KafkaAvroSerializerTest.java",
+#    ],
     runner = "junit4",
     tags = ["no-java-spotbugs"],
     deps = [

benchmark/BUILD.bazel

@@ -52,8 +52,13 @@ jmh_java_benchmarks(
 
 java_test_suite(
     name = "benchmark-tests",
+<<<<<<< Updated upstream
     srcs = ["src/test/java/io/confluent/schemaregistry/benchmark/SerdeBenchmarkTest.java"],
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = ["src/test/java/io/confluent/schemaregistry/benchmark/SerdeBenchmarkTest.java"],
+>>>>>>> Stashed changes
     deps = [
         ":benchmark",
         "@maven//:com_google_guava_guava",

client-encryption-aws/BUILD.bazel

@@ -17,13 +17,23 @@ java_library(
 
 java_test_suite(
     name = "client-encryption-aws-tests",
+<<<<<<< Updated upstream
     srcs = [
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/aws/AwsFieldEncryptionExecutorTest.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/aws/AwsFieldEncryptionProperties.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/aws/FakeAwsKms.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/aws/RestApiAwsFieldEncryptionTest.java",
     ],
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/aws/AwsFieldEncryptionExecutorTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/aws/AwsFieldEncryptionProperties.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/aws/FakeAwsKms.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/aws/RestApiAwsFieldEncryptionTest.java",
+#    ],
+>>>>>>> Stashed changes
     deps = [
         ":client-encryption-aws",
         "//avro-serializer",

client-encryption-azure/BUILD.bazel

@@ -21,12 +21,21 @@ java_library(
 
 java_test_suite(
     name = "client-encryption-azure-tests",
+<<<<<<< Updated upstream
     srcs = [
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/azure/AzureFieldEncryptionExecutorTest.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/azure/AzureFieldEncryptionProperties.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/azure/RestApiAzureFieldEncryptionTest.java",
     ],
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/azure/AzureFieldEncryptionExecutorTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/azure/AzureFieldEncryptionProperties.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/azure/RestApiAzureFieldEncryptionTest.java",
+#    ],
+>>>>>>> Stashed changes
     deps = [
         ":client-encryption-azure",
         "//avro-serializer",

client-encryption-gcp/BUILD.bazel

@@ -17,13 +17,23 @@ java_library(
 
 java_test_suite(
     name = "client-encryption-gcp-tests",
+<<<<<<< Updated upstream
     srcs = [
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/gcp/FakeCloudKms.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/gcp/GcpFieldEncryptionExecutorTest.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/gcp/GcpFieldEncryptionProperties.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/gcp/RestApiGcpFieldEncryptionTest.java",
     ],
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/gcp/FakeCloudKms.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/gcp/GcpFieldEncryptionExecutorTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/gcp/GcpFieldEncryptionProperties.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/gcp/RestApiGcpFieldEncryptionTest.java",
+#    ],
+>>>>>>> Stashed changes
     deps = [
         ":client-encryption-gcp",
         "//avro-serializer",

client-encryption-hcvault/BUILD.bazel

@@ -20,12 +20,21 @@ java_library(
 
 java_test_suite(
     name = "client-encryption-hcvault-tests",
+<<<<<<< Updated upstream
     srcs = [
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/hcvault/HcVaultFieldEncryptionExecutorTest.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/hcvault/HcVaultFieldEncryptionProperties.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/hcvault/RestApiHcVaultFieldEncryptionTest.java",
     ],
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/hcvault/HcVaultFieldEncryptionExecutorTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/hcvault/HcVaultFieldEncryptionProperties.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/hcvault/RestApiHcVaultFieldEncryptionTest.java",
+#    ],
+>>>>>>> Stashed changes
     deps = [
         ":client-encryption-hcvault",
         "//avro-serializer",

client-encryption/BUILD.bazel

@@ -26,13 +26,23 @@ java_library(
 
 java_library(
     name = "test-utils",
+<<<<<<< Updated upstream
     srcs = [
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/FieldEncryptionExecutorTest.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/FieldEncryptionProperties.java",
         "src/test/java/io/confluent/kafka/schemaregistry/encryption/RestApiFieldEncryptionTest.java",
         "src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java",
     ],
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/FieldEncryptionExecutorTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/FieldEncryptionProperties.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/encryption/RestApiFieldEncryptionTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java",
+#    ],
+>>>>>>> Stashed changes
     visibility = ["//visibility:public"],
     deps = [
         ":client-encryption",

client/BUILD.bazel

@@ -112,6 +112,7 @@ java_export(
 
 java_test_suite(
     name = "client-tests",
+<<<<<<< Updated upstream
     srcs = [
         "src/test/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClientTest.java",
         "src/test/java/io/confluent/kafka/schemaregistry/client/config/provider/SchemaRegistryConfigProviderTest.java",
@@ -136,6 +137,32 @@ java_test_suite(
         "src/test/java/io/confluent/kafka/schemaregistry/utils/WildcardMatcherTest.java",
     ],
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClientTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/config/provider/SchemaRegistryConfigProviderTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/rest/RestServiceTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/rest/ServerClusterIdTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/rest/UriBuilderTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/rest/entities/MergeEntitiesTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/rest/entities/requests/RegisterSchemaRequestTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/rest/utils/UrlListTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/SslFactoryTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/basicauth/BasicAuthCredentialProviderFactoryTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/basicauth/SaslBasicAuthCredentialProviderTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/basicauth/UrlBasicAuthCredentialProviderTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/basicauth/UserInfoCredentialProviderTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/bearerauth/BearerAuthCredentialProviderFactoryTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/bearerauth/StaticTokenCredentialProviderTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/bearerauth/oauth/CachedOauthTokenRetrieverTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/bearerauth/oauth/OauthCredentialProviderTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/bearerauth/oauth/OauthTokenCacheTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/security/bearerauth/oauth/SaslOauthCredentialProviderTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/utils/QualifiedSubjectTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/utils/WildcardMatcherTest.java",
+#    ],
+>>>>>>> Stashed changes
     deps = [
         ":client",
         "//core",

core/BUILD.bazel

@@ -241,6 +241,7 @@ avro_java_library(
 
 java_library(
     name = "test-utils",
+#    srcs = glob(["src/test/**/*.java"]),
     srcs = [
         "src/test/java/io/confluent/kafka/schemaregistry/ClusterTestHarness.java",
         "src/test/java/io/confluent/kafka/schemaregistry/LeaderElectorTest.java",
@@ -295,6 +296,7 @@ java_library(
 
 java_test_suite(
     name = "core-tests",
+<<<<<<< Updated upstream
     srcs = [
         "src/test/java/io/confluent/kafka/schemaregistry/avro/AvroCompatibilityTest.java",
         "src/test/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClientTest.java",
@@ -328,6 +330,42 @@ java_test_suite(
     ],
     data = glob(["test/resources/*"]),
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+    timeout = "long",
+#    srcs = [
+#        "src/test/java/io/confluent/kafka/schemaregistry/avro/AvroCompatibilityTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClientTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/client/MockSchemaRegistryClientTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/leaderelector/kafka/SchemaRegistryCoordinatorTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/leaderelector/kafka/SchemaRegistryProtocolTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/metrics/CustomSchemaProviderMetricTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/metrics/MetricsTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/RequestHeaderBuilderTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiCompatibilityTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiContextTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiMetadataEncoderTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiModeTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiSchemaTooLargeTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiSslTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/RestApiTransitiveCompatibilityTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/SchemaRegistryConfigTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/SchemaRegistryErrorHandlerTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/SchemaRegistryExtensionTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/filters/ContextFilterTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/rest/protobuf/RestApiTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/storage/KafkaStoreReaderThreadTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/storage/KafkaStoreSASLTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/storage/KafkaStoreSSLNoAuthTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/storage/KafkaStoreTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/storage/OffsetCheckpointTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/storage/SchemaRegistryKeysTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/storage/SchemaValuesTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/storage/encoder/MetadataEncoderServiceTest.java",
+#    ],
+    resources = glob(["test/resources/*"]),
+>>>>>>> Stashed changes
     runtime_deps = [
         "@maven//:org_slf4j_slf4j_reload4j",
     ],

json-schema-converter/BUILD.bazel

@@ -40,12 +40,13 @@ java_library(
 
 java_test_suite(
     name = "json-schema-converter-tests",
-    srcs = [
-        "src/test/java/io/confluent/connect/json/AdditionalJsonSchemaDataTest.java",
-        "src/test/java/io/confluent/connect/json/JsonSchemaConverterTest.java",
-        "src/test/java/io/confluent/connect/json/JsonSchemaDataTest.java",
-        "src/test/java/io/confluent/connect/json/ResourceLoader.java",
-    ],
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/connect/json/AdditionalJsonSchemaDataTest.java",
+#        "src/test/java/io/confluent/connect/json/JsonSchemaConverterTest.java",
+#        "src/test/java/io/confluent/connect/json/JsonSchemaDataTest.java",
+#        "src/test/java/io/confluent/connect/json/ResourceLoader.java",
+#    ],
     resources = glob(["src/test/resources/**/*"]),
     tags = ["no-java-spotbugs"],
     deps = [

json-schema-provider/BUILD.bazel

@@ -59,13 +59,14 @@ java_export(
 
 java_test_suite(
     name = "json-schema-provider-tests",
-    srcs = [
-        "src/test/java/io/confluent/kafka/schemaregistry/json/JsonSchemaTest.java",
-        "src/test/java/io/confluent/kafka/schemaregistry/json/TestSchemaValidation.java",
-        "src/test/java/io/confluent/kafka/schemaregistry/json/TestSchemas.java",
-        "src/test/java/io/confluent/kafka/schemaregistry/json/diff/SchemaDiffTest.java",
-        "src/test/java/io/confluent/kafka/schemaregistry/json/utils/MaximumCardinalityMatchTest.java",
-    ],
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = [
+#        "src/test/java/io/confluent/kafka/schemaregistry/json/JsonSchemaTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/json/TestSchemaValidation.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/json/TestSchemas.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/json/diff/SchemaDiffTest.java",
+#        "src/test/java/io/confluent/kafka/schemaregistry/json/utils/MaximumCardinalityMatchTest.java",
+#    ],
     resources = glob(["src/test/resources/**/*"]),
     tags = ["no-java-spotbugs"],
     deps = [

json-schema-serde/BUILD.bazel

@@ -14,8 +14,13 @@ java_library(
 
 java_test_suite(
     name = "json-schema-serde-tests",
+<<<<<<< Updated upstream
     srcs = ["src/test/java/io/confluent/kafka/streams/serdes/json/KafkaJsonSchemaSerdeTest.java"],
     tags = ["no-java-spotbugs"],
+=======
+    srcs = glob(["src/test/**/*.java"]),
+#    srcs = ["src/test/java/io/confluent/kafka/streams/serdes/json/KafkaJsonSchemaSerdeTest.java"],
+>>>>>>> Stashed changes
     deps = [
         ":json-schema-serde",
         "//avro-serializer",