diff --git a/WORKSPACE b/WORKSPACE index de6388de3c..241ef0d98d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -60,8 +60,6 @@ git_repository( git_repository( name = "contrib_rules_jvm", tag = "v0.19.0", - patches = ["//patches:rules_jvm.patch"], - patch_args = ["-p1"], remote = "https://github.com/bazel-contrib/rules_jvm.git", ) diff --git a/ortools/algorithms/samples/code_samples.bzl b/ortools/algorithms/samples/code_samples.bzl index bee17b0e75..78e9951624 100644 --- a/ortools/algorithms/samples/code_samples.bzl +++ b/ortools/algorithms/samples/code_samples.bzl @@ -70,10 +70,6 @@ def code_sample_java(name): srcs = [name + ".java"], main_class = "com.google.ortools.algorithms.samples." + name, test_class = "com.google.ortools.algorithms.samples." + name, - jvm_flags = select({ - "@platforms//os:windows": ["-Djava.library.path=../../../../java/com/google/ortools"], - "//conditions:default": ["-Djava.library.path=ortools/java/com/google/ortools"], - }), deps = [ "//ortools/algorithms/java:knapsacksolver", "//ortools/java/com/google/ortools:Loader", diff --git a/ortools/graph/java/BUILD.bazel b/ortools/graph/java/BUILD.bazel index 7ace328e27..7389e86b64 100644 --- a/ortools/graph/java/BUILD.bazel +++ b/ortools/graph/java/BUILD.bazel @@ -37,10 +37,6 @@ java_junit5_test( name = "FlowTest", size = "small", srcs = ["FlowTest.java"], - jvm_flags = select({ - "@platforms//os:windows": ["-Djava.library.path=../../../../java/com/google/ortools"], - "//conditions:default": ["-Djava.library.path=ortools/java/com/google/ortools"], - }), tags = ["unit"], test_class = "com.google.ortools.graph.FlowTest", deps = [ diff --git a/ortools/graph/samples/code_samples.bzl b/ortools/graph/samples/code_samples.bzl index daa944e496..43fb0a5325 100644 --- a/ortools/graph/samples/code_samples.bzl +++ b/ortools/graph/samples/code_samples.bzl @@ -87,10 +87,6 @@ def code_sample_java(name): srcs = [name + ".java"], main_class = "com.google.ortools.graph.samples." + name, test_class = "com.google.ortools.graph.samples." + name, - jvm_flags = select({ - "@platforms//os:windows": ["-Djava.library.path=../../../../java/com/google/ortools"], - "//conditions:default": ["-Djava.library.path=ortools/java/com/google/ortools"], - }), deps = [ "//ortools/graph/java:graph", "//ortools/java/com/google/ortools:Loader", diff --git a/ortools/linear_solver/java/BUILD.bazel b/ortools/linear_solver/java/BUILD.bazel index 7a470584a2..4e72482397 100644 --- a/ortools/linear_solver/java/BUILD.bazel +++ b/ortools/linear_solver/java/BUILD.bazel @@ -36,10 +36,6 @@ ortools_java_wrap_cc( java_junit5_test( name = "ModelBuilderTest", srcs = ["ModelBuilderTest.java"], - jvm_flags = select({ - "@platforms//os:windows": ["-Djava.library.path=../../../../java/com/google/ortools"], - "//conditions:default": ["-Djava.library.path=ortools/java/com/google/ortools"], - }), tags = ["unit"], test_class = "com.google.ortools.modelbuilder.ModelBuilderTest", deps = [ diff --git a/ortools/linear_solver/samples/code_samples.bzl b/ortools/linear_solver/samples/code_samples.bzl index 1bb371f494..61bd51fbca 100644 --- a/ortools/linear_solver/samples/code_samples.bzl +++ b/ortools/linear_solver/samples/code_samples.bzl @@ -79,10 +79,6 @@ def code_sample_java(name): srcs = [name + ".java"], main_class = "com.google.ortools.linearsolver.samples." + name, test_class = "com.google.ortools.linearsolver.samples." + name, - jvm_flags = select({ - "@platforms//os:windows": ["-Djava.library.path=../../../../java/com/google/ortools"], - "//conditions:default": ["-Djava.library.path=ortools/java/com/google/ortools"], - }), deps = [ "//ortools/linear_solver/java:modelbuilder", "//ortools/java/com/google/ortools/modelbuilder", diff --git a/ortools/sat/java/BUILD.bazel b/ortools/sat/java/BUILD.bazel index 4fb52c46fa..767e7cce72 100644 --- a/ortools/sat/java/BUILD.bazel +++ b/ortools/sat/java/BUILD.bazel @@ -44,10 +44,6 @@ ortools_java_wrap_cc( java_junit5_test( name = "CpModelTest", srcs = ["CpModelTest.java"], - jvm_flags = select({ - "@platforms//os:windows": ["-Djava.library.path=../../../../java/com/google/ortools"], - "//conditions:default": ["-Djava.library.path=ortools/java/com/google/ortools"], - }), test_class = "com.google.ortools.sat.CpModelTest", deps = [ "//ortools/java/com/google/ortools:Loader", @@ -68,10 +64,6 @@ java_junit5_test( java_junit5_test( name = "CpSolverTest", srcs = ["CpSolverTest.java"], - jvm_flags = select({ - "@platforms//os:windows": ["-Djava.library.path=../../../../java/com/google/ortools"], - "//conditions:default": ["-Djava.library.path=ortools/java/com/google/ortools"], - }), test_class = "com.google.ortools.sat.CpSolverTest", deps = [ "//ortools/java/com/google/ortools:Loader", @@ -92,10 +84,6 @@ java_junit5_test( java_junit5_test( name = "LinearExprTest", srcs = ["LinearExprTest.java"], - jvm_flags = select({ - "@platforms//os:windows": ["-Djava.library.path=../../../../java/com/google/ortools"], - "//conditions:default": ["-Djava.library.path=ortools/java/com/google/ortools"], - }), test_class = "com.google.ortools.sat.LinearExprTest", deps = [ "//ortools/java/com/google/ortools:Loader", diff --git a/ortools/sat/samples/code_samples.bzl b/ortools/sat/samples/code_samples.bzl index 21cfe9351f..68cf0e69cd 100644 --- a/ortools/sat/samples/code_samples.bzl +++ b/ortools/sat/samples/code_samples.bzl @@ -84,10 +84,6 @@ def code_sample_java(name): srcs = [name + ".java"], main_class = "com.google.ortools.sat.samples." + name, test_class = "com.google.ortools.sat.samples." + name, - jvm_flags = select({ - "@platforms//os:windows": ["-Djava.library.path=../../../../java/com/google/ortools"], - "//conditions:default": ["-Djava.library.path=ortools/java/com/google/ortools"], - }), deps = [ "//ortools/sat/java:sat", "//ortools/java/com/google/ortools:Loader", diff --git a/patches/rules_jvm.patch b/patches/rules_jvm.patch deleted file mode 100644 index a68e5fdb44..0000000000 --- a/patches/rules_jvm.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/java/private/junit5.bzl b/java/private/junit5.bzl -index 94018e2..a3415c5 100644 ---- a/java/private/junit5.bzl -+++ b/java/private/junit5.bzl -@@ -90,9 +90,6 @@ def java_junit5_test( - jvm_flags = jvm_flags + ["-DJUNIT5_EXCLUDE_ENGINES=%s" % ",".join(exclude_engines)] - - security_manager_flag_seen = False -- for flag in jvm_flags: -- if flag.startswith("-Djava.security.manager="): -- security_manager_flag_seen = True - if not security_manager_flag_seen: - jvm_flags = jvm_flags + ["-Djava.security.manager=allow"] -