diff --git a/WORKSPACE b/WORKSPACE
index bde8a32c7a..24abe23c44 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -155,14 +155,11 @@ python_configure(name = "local_config_python", python_version = "3")
 # Swig support
 
 # pcre source code repository
-http_archive(
+new_git_repository(
     name = "pcre2",
     build_file = "//bazel:pcre2.BUILD",
-    strip_prefix = "pcre2-10.42",
-    urls = [
-        "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.gz",
-    ],
-    sha256 = "c33b418e3b936ee3153de2c61cc638e7e4fe3156022a5c77d0711bcbb9d64f1f",
+    tag = "pcre2-10.42",
+    remote = "https://github.com/PCRE2Project/pcre2.git",
 )
 
 # generate Patch:
@@ -190,7 +187,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
 
 maven_install(
     artifacts = [
-        "net.java.dev.jna:jna:aar:5.8.0"
+        "net.java.dev.jna:jna:aar:5.12.1"
     ],
     repositories = [
         "https://repo1.maven.org/maven2",
diff --git a/bazel/swig_java.bzl b/bazel/swig_java.bzl
index 37175470aa..a757f1040a 100644
--- a/bazel/swig_java.bzl
+++ b/bazel/swig_java.bzl
@@ -28,7 +28,6 @@ def _create_src_jar(ctx, java_runtime_info, input_dir, output_jar):
     )
 
 def _java_wrap_cc_impl(ctx):
-    name = ctx.attr.name
     src = ctx.file.src
     outfile = ctx.outputs.outfile
     outhdr = ctx.outputs.outhdr
@@ -162,6 +161,8 @@ def ortools_java_wrap_cc(
         swig_opt: optional defines passed to the swig command.
         swig_includes: list of swig files included by the current swig file.
         use_directors: Boolean flag.
+        visibility: global visibility of the rule.
+        **kwargs: extra generic arguments, usually passed to sub-rules.
 
     Generated targets:
         {name}: java_library
diff --git a/ortools/linear_solver/samples/code_samples_java_test.sh b/ortools/linear_solver/samples/code_samples_java_test.sh
index 271ba374bf..f770d50daa 100755
--- a/ortools/linear_solver/samples/code_samples_java_test.sh
+++ b/ortools/linear_solver/samples/code_samples_java_test.sh
@@ -19,3 +19,4 @@ function test::ortools::code_samples_linear_solver_java() {
 }
 
 test::ortools::code_samples_linear_solver_java $1
+
diff --git a/ortools/sat/samples/code_samples_java_test.sh b/ortools/sat/samples/code_samples_java_test.sh
index 57231f6a56..a6762e7065 100755
--- a/ortools/sat/samples/code_samples_java_test.sh
+++ b/ortools/sat/samples/code_samples_java_test.sh
@@ -19,3 +19,4 @@ function test::ortools::code_samples_sat_java() {
 }
 
 test::ortools::code_samples_sat_java $1
+