From f84ca07db030fc2c8bb62bd64bc380cbd8f84d36 Mon Sep 17 00:00:00 2001
From: Sandy Zhang <sandyzhang@google.com>
Date: Tue, 19 Mar 2024 15:09:00 -0700
Subject: [PATCH] Move java_features.proto to java/core/srce/main/resources

This also fixes maven to package this correctly as google/protobuf/java_features.proto (same dir as WKT/descriptor.proto) instead of com/google/protobuf/java_features.proto.

Fixes https://github.com/protocolbuffers/protobuf/issues/16155

PiperOrigin-RevId: 617307475
---
 java/core/BUILD.bazel                                     | 8 ++++----
 java/core/generate-sources-build.xml                      | 2 +-
 java/core/pom.xml                                         | 2 +-
 .../com => resources}/google/protobuf/java_features.proto | 0
 java/kotlin-lite/generate-sources-build.xml               | 2 +-
 java/lite/generate-sources-build.xml                      | 2 +-
 java/lite/pom.xml                                         | 2 +-
 java/pom.xml                                              | 2 +-
 .../editions/golden/editions_transform_proto2.proto       | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename java/core/src/main/{java/com => resources}/google/protobuf/java_features.proto (100%)

diff --git a/java/core/BUILD.bazel b/java/core/BUILD.bazel
index d7d89c087f35..ba676c9c9987 100644
--- a/java/core/BUILD.bazel
+++ b/java/core/BUILD.bazel
@@ -171,8 +171,8 @@ protobuf_java_library(
 
 proto_library(
     name = "java_features_proto",
-    srcs = ["src/main/java/com/google/protobuf/java_features.proto"],
-    strip_import_prefix = "/java/core/src/main/java/com",
+    srcs = ["src/main/resources/google/protobuf/java_features.proto"],
+    strip_import_prefix = "/java/core/src/main/resources",
     visibility = [
         "//java/kotlin:__pkg__",
         "//java/kotlin-lite:__pkg__",
@@ -184,7 +184,7 @@ proto_library(
 
 filegroup(
     name = "java_features_proto_srcs",
-    srcs = ["src/main/java/com/google/protobuf/java_features.proto"],
+    srcs = ["src/main/resources/google/protobuf/java_features.proto"],
     visibility = ["//pkg:__pkg__"],
 )
 
@@ -560,7 +560,7 @@ pkg_files(
     name = "dist_files",
     srcs = glob([
         "src/main/java/com/google/protobuf/*.java",
-        "src/main/java/com/google/protobuf/*.proto",
+        "src/main/resources/google/protobuf/*.proto",
         "src/test/java/**/*.java",
         "src/test/proto/**/*.proto",
     ]) + [
diff --git a/java/core/generate-sources-build.xml b/java/core/generate-sources-build.xml
index 4ffd4384dc41..7021aa8e2231 100644
--- a/java/core/generate-sources-build.xml
+++ b/java/core/generate-sources-build.xml
@@ -5,7 +5,7 @@
         <arg value="--java_out=${generated.sources.dir}"/>
         <arg value="--proto_path=${protobuf.source.dir}"/>
         <arg value="--proto_path=${protobuf.java_source.dir}"/>
-        <arg value="${protobuf.java_source.dir}/main/java/com/google/protobuf/java_features.proto"/>
+        <arg value="${protobuf.java_source.dir}/google/protobuf/java_features.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/any.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
diff --git a/java/core/pom.xml b/java/core/pom.xml
index cdb9a113e9d5..43a22c557b7d 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -62,7 +62,7 @@
       <resource>
         <directory>${protobuf.java_source.dir}</directory>
         <includes>
-          <include>main/java/com/google/protobuf/java_features.proto</include>
+          <include>google/protobuf/java_features.proto</include>
         </includes>
       </resource>
     </resources>
diff --git a/java/core/src/main/java/com/google/protobuf/java_features.proto b/java/core/src/main/resources/google/protobuf/java_features.proto
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/java_features.proto
rename to java/core/src/main/resources/google/protobuf/java_features.proto
diff --git a/java/kotlin-lite/generate-sources-build.xml b/java/kotlin-lite/generate-sources-build.xml
index b8728e2df8df..e15f169e310a 100644
--- a/java/kotlin-lite/generate-sources-build.xml
+++ b/java/kotlin-lite/generate-sources-build.xml
@@ -5,7 +5,7 @@
         <arg value="--kotlin_out=lite:${generated.sources.dir}"/>
         <arg value="--proto_path=${protobuf.source.dir}"/>
         <arg value="--proto_path=${protobuf.java_source.dir}"/>
-        <arg value="${protobuf.java_source.dir}/main/java/com/google/protobuf/java_features.proto"/>
+        <arg value="${protobuf.java_source.dir}/google/protobuf/java_features.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/any.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
diff --git a/java/lite/generate-sources-build.xml b/java/lite/generate-sources-build.xml
index b35bd63989bf..f1dcadb15ce2 100644
--- a/java/lite/generate-sources-build.xml
+++ b/java/lite/generate-sources-build.xml
@@ -5,7 +5,7 @@
         <arg value="--java_out=lite:${generated.sources.dir}"/>
         <arg value="--proto_path=${protobuf.source.dir}"/>
         <arg value="--proto_path=${protobuf.java_source.dir}"/>
-        <arg value="${protobuf.java_source.dir}/main/java/com/google/protobuf/java_features.proto"/>
+        <arg value="${protobuf.java_source.dir}/google/protobuf/java_features.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/any.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
         <arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
diff --git a/java/lite/pom.xml b/java/lite/pom.xml
index 3121dd8c1aee..dc8eb8e610f9 100644
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@@ -61,7 +61,7 @@
       <resource>
         <directory>${protobuf.java_source.dir}</directory>
         <includes>
-          <include>main/java/com/google/protobuf/java_features.proto</include>
+          <include>google/protobuf/java_features.proto</include>
         </includes>
       </resource>
     </resources>
diff --git a/java/pom.xml b/java/pom.xml
index 2c017a3f0838..4a06bd80c84a 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>
-    <protobuf.java_source.dir>${protobuf.basedir}/java/core/src</protobuf.java_source.dir>
+    <protobuf.java_source.dir>${protobuf.basedir}/java/core/src/main/resources</protobuf.java_source.dir>
     <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>
diff --git a/src/google/protobuf/editions/golden/editions_transform_proto2.proto b/src/google/protobuf/editions/golden/editions_transform_proto2.proto
index 0e538701b025..260a8d26ae80 100644
--- a/src/google/protobuf/editions/golden/editions_transform_proto2.proto
+++ b/src/google/protobuf/editions/golden/editions_transform_proto2.proto
@@ -15,7 +15,7 @@ edition = "2023";
 package protobuf_editions_test;
 
 import "net/proto/proto1_features.proto";
-import "third_party/java_src/protobuf/current/java/com/google/protobuf/java_features.proto";
+import "third_party/java/protobuf/java_features.proto";
 import "google/protobuf/cpp_features.proto";
 import "google/protobuf/editions/proto/editions_transform_proto3.proto";