Sync from Piper @467099277

PROTOBUF_SYNC_PIPER

java/internal/BUILD.bazel

diff --git a/java/internal/BUILD.bazel b/java/internal/BUILD.bazel
index 662dabd..ff111e7 100644
--- a/java/internal/BUILD.bazel
+++ b/java/internal/BUILD.bazel
@@ -1,13 +1,24 @@
-package(default_visibility = ["//java:__subpackages__"])
-
 load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
 
+package(default_visibility = ["//java:__subpackages__"])
+
 pkg_files(
     name = "dist_files",
     srcs = [
         "BUILD.bazel",
+        "JavaVersionTest.java",
         "testing.bzl",
     ],
     strip_prefix = strip_prefix.from_root(""),
     visibility = ["//java:__pkg__"],
 )
+
+java_test(
+    name = "java_version",
+    srcs = ["JavaVersionTest.java"],
+    test_class = "JavaVersionTest",
+    deps = [
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)

java/pom.xml

diff --git a/java/pom.xml b/java/pom.xml
index c086992..f8083c4 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -33,7 +33,7 @@
     <!-- These are relative to the submodules -->
     <protobuf.basedir>${project.basedir}/../..</protobuf.basedir>
     <protobuf.source.dir>${protobuf.basedir}/src</protobuf.source.dir>
-    <protoc>${protobuf.source.dir}/protoc</protoc>
+    <protoc>${protobuf.basedir}/protoc</protoc>
     <test.proto.dir>src/test/proto</test.proto.dir>
     <generated.sources.dir>${project.build.directory}/generated-sources</generated.sources.dir>
     <generated.testsources.dir>${project.build.directory}/generated-test-sources</generated.testsources.dir>