Cleanup unused Bazel 6 test filtering Follow up to https://github.com/bazelbuild/rules_java/commit/b55339e359675d03a4f1cc001f1840d0b27966df [^1] PiperOrigin-RevId: 837439832 Change-Id: I8413040e00ce2b4338b2b0dd6802c8c990edb9e1
diff --git a/test/java/common/java_common_tests.bzl b/test/java/common/java_common_tests.bzl index d4528df..2eaf00d 100644 --- a/test/java/common/java_common_tests.bzl +++ b/test/java/common/java_common_tests.bzl
@@ -91,8 +91,6 @@ name = name, impl = _test_compile_exports_with_sources_impl, target = target_name, - # Bazel 6 JavaInfo doesn't expose compile_time_java_dependencies - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_compile_exports_with_sources_impl(env, target): @@ -138,7 +136,6 @@ name = name, impl = _test_compile_extend_compile_time_jdeps_impl, target = name + "/foo", - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_compile_extend_compile_time_jdeps_impl(env, target): @@ -181,7 +178,6 @@ "bar": name + "/bar", "baz": name + "/baz", }, - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_compile_extend_compile_time_jdeps_rule_outputs_impl(env, targets): @@ -234,7 +230,6 @@ name = name, impl = _test_compile_bootclasspath_impl, target = name + "/custom", - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_compile_bootclasspath_impl(env, target): @@ -269,7 +264,6 @@ name = name, impl = _test_compile_override_with_empty_bootclasspath_impl, target = name + "/custom", - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_compile_override_with_empty_bootclasspath_impl(env, target):
diff --git a/test/java/common/java_info_tests.bzl b/test/java/common/java_info_tests.bzl index 5d3c666..a646e11 100644 --- a/test/java/common/java_info_tests.bzl +++ b/test/java/common/java_info_tests.bzl
@@ -1255,7 +1255,6 @@ name = name, impl = _output_source_jars_returns_depset_test_impl, target = target_name, - attr_values = {"tags": ["min_bazel_7"]}, # changed in Bazel 7 ) def _output_source_jars_returns_depset_test_impl(env, target):
diff --git a/test/java/common/java_plugin_info_tests.bzl b/test/java/common/java_plugin_info_tests.bzl index c3b8b37..ed742f1 100644 --- a/test/java/common/java_plugin_info_tests.bzl +++ b/test/java/common/java_plugin_info_tests.bzl
@@ -124,7 +124,6 @@ name = name, impl = _test_without_processor_class_impl, target = target_name, - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_without_processor_class_impl(env, target):
diff --git a/test/java/common/rules/java_binary_tests.bzl b/test/java/common/rules/java_binary_tests.bzl index 08386ad..97a8571 100644 --- a/test/java/common/rules/java_binary_tests.bzl +++ b/test/java/common/rules/java_binary_tests.bzl
@@ -18,7 +18,6 @@ name = name, impl = _test_java_binary_provides_binary_java_info_impl, target = Label(":bin"), - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_java_binary_provides_binary_java_info_impl(env, target): @@ -150,9 +149,6 @@ name = name, impl = _test_java_binary_propagates_direct_native_libraries_impl, target = name + "/binary", - # in Bazel 6, the windows stub was created by a bespoke, native and - # opaque-to-Starlark LauncherFileWriteAction - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_java_binary_propagates_direct_native_libraries_impl(env, target):
diff --git a/test/java/common/rules/java_import_tests.bzl b/test/java/common/rules/java_import_tests.bzl index 37941ef..7afbc77 100644 --- a/test/java/common/rules/java_import_tests.bzl +++ b/test/java/common/rules/java_import_tests.bzl
@@ -775,8 +775,6 @@ name = name, impl = _test_neverlink_is_populated_impl, target = target_name, - # in Bazel 6, JavaInfo._neverlink isn't exposed to Starlark - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_neverlink_is_populated_impl(env, target):
diff --git a/test/java/common/rules/java_test_tests.bzl b/test/java/common/rules/java_test_tests.bzl index 4cc39ca..f4db104 100644 --- a/test/java/common/rules/java_test_tests.bzl +++ b/test/java/common/rules/java_test_tests.bzl
@@ -56,9 +56,6 @@ name = name, impl = _test_java_test_propagates_direct_native_libraries_impl, target = name + "/binary", - # in Bazel 6, the windows stub was created by a bespoke, native and - # opaque-to-Starlark LauncherFileWriteAction - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_java_test_propagates_direct_native_libraries_impl(env, target):
diff --git a/test/java/toolchains/java_runtime_tests.bzl b/test/java/toolchains/java_runtime_tests.bzl index 4f1ec88..f501496 100644 --- a/test/java/toolchains/java_runtime_tests.bzl +++ b/test/java/toolchains/java_runtime_tests.bzl
@@ -38,8 +38,6 @@ config_settings = { "//command_line_option:extra_toolchains": [Label(name + "/java_runtime_toolchain")], }, - # Bazel 6 doesn't accept Label's for the transition above - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_with_absolute_java_home_impl(env, target): @@ -80,8 +78,6 @@ config_settings = { "//command_line_option:extra_toolchains": [Label(name + "/java_runtime_toolchain")], }, - # Bazel 6 doesn't accept Label's for the transition above - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_with_hermetic_java_home_impl(env, target): @@ -129,8 +125,6 @@ config_settings = { "//command_line_option:extra_toolchains": [Label(name + "/java_runtime_toolchain")], }, - # Bazel 6 doesn't accept Label's for the transition above - attr_values = {"tags": ["min_bazel_7"]}, ) def _test_with_generated_java_executable_impl(env, target):