From ccadeac6ee527b8eef8d42a686ee5c732c44ebce Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Tue, 28 May 2024 09:46:48 -0700
Subject: [PATCH] Internal change

PiperOrigin-RevId: 637931548
---
 editions/golden/editions_transform_proto2.proto | 1 +
 editions/golden/editions_transform_proto3.proto | 1 +
 editions/proto/editions_transform_proto2.proto  | 3 ++-
 editions/proto/editions_transform_proto3.proto  | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/editions/golden/editions_transform_proto2.proto b/editions/golden/editions_transform_proto2.proto
index 84807b6d59..dcd88ae906 100644
--- a/editions/golden/editions_transform_proto2.proto
+++ b/editions/golden/editions_transform_proto2.proto
@@ -21,6 +21,7 @@ import "google/protobuf/editions/proto/editions_transform_proto3.proto";
 
 option features.repeated_field_encoding = EXPANDED;
 option features.utf8_validation = NONE;
+option java_api_version = 1;
 option java_multiple_files = true;
 
 message EmptyMessage {
diff --git a/editions/golden/editions_transform_proto3.proto b/editions/golden/editions_transform_proto3.proto
index cbb91d0fc0..2aff5d7245 100644
--- a/editions/golden/editions_transform_proto3.proto
+++ b/editions/golden/editions_transform_proto3.proto
@@ -12,6 +12,7 @@ package protobuf_editions_test;
 import "net/proto/proto1_features.proto";
 
 option features.field_presence = IMPLICIT;
+option java_api_version = 1;
 
 enum TestEnumProto3 {
   TEST_ENUM_PROTO3_UNKNOWN = 0;
diff --git a/editions/proto/editions_transform_proto2.proto b/editions/proto/editions_transform_proto2.proto
index e502cde57a..abc3617ffd 100644
--- a/editions/proto/editions_transform_proto2.proto
+++ b/editions/proto/editions_transform_proto2.proto
@@ -16,6 +16,7 @@ import "google/protobuf/editions/proto/editions_transform_proto3.proto";
 
 package protobuf_editions_test;
 
+option java_api_version = 1;
 option java_multiple_files = true;
 option cc_enable_arenas = true;
 
@@ -88,4 +89,4 @@ enum TestEnum {
 message TestOpenEnumMessage {
   optional TestEnumProto3 open_enum_field = 1;
   optional TestEnum closed_enum_field = 2;
-}
\ No newline at end of file
+}
diff --git a/editions/proto/editions_transform_proto3.proto b/editions/proto/editions_transform_proto3.proto
index 6dc8b4f5a5..6fb98ef230 100644
--- a/editions/proto/editions_transform_proto3.proto
+++ b/editions/proto/editions_transform_proto3.proto
@@ -9,6 +9,8 @@ syntax = "proto3";
 
 package protobuf_editions_test;
 
+option java_api_version = 1;
+
 enum TestEnumProto3 {
   TEST_ENUM_PROTO3_UNKNOWN = 0;
   TEST_ENUM_PROTO3_VALUE = 1;