From e915ce24b3d43c0fffcbf847354288c07dda1de0 Mon Sep 17 00:00:00 2001
From: Protobuf Team Bot <protobuf-team-bot@google.com>
Date: Wed, 24 Jul 2024 08:17:14 -0700
Subject: [PATCH] Updating version.json and repo version numbers to: 25.4

---
 src/google/protobuf/any.pb.h                  |  2 +-
 src/google/protobuf/api.pb.h                  |  2 +-
 .../protobuf/compiler/java/java_features.pb.h |  2 +-
 src/google/protobuf/compiler/plugin.pb.h      |  2 +-
 src/google/protobuf/compiler/versions.h       |  6 +++---
 src/google/protobuf/cpp_features.pb.h         |  2 +-
 src/google/protobuf/descriptor.pb.h           |  2 +-
 src/google/protobuf/duration.pb.h             |  2 +-
 src/google/protobuf/empty.pb.h                |  2 +-
 src/google/protobuf/field_mask.pb.h           |  2 +-
 src/google/protobuf/port_def.inc              |  2 +-
 src/google/protobuf/source_context.pb.h       |  2 +-
 src/google/protobuf/struct.pb.h               |  2 +-
 src/google/protobuf/stubs/common.h            |  2 +-
 src/google/protobuf/timestamp.pb.h            |  2 +-
 src/google/protobuf/type.pb.h                 |  2 +-
 src/google/protobuf/wrappers.pb.h             |  2 +-
 version.json                                  | 20 +++++++++----------
 18 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h
index d355e1413c..44faa12cd7 100644
--- a/src/google/protobuf/any.pb.h
+++ b/src/google/protobuf/any.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/any.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto_2epb_2eh
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index be5bc72cb5..2fa7fbba23 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/api.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto_2epb_2eh
diff --git a/src/google/protobuf/compiler/java/java_features.pb.h b/src/google/protobuf/compiler/java/java_features.pb.h
index 7e8fa0e839..e9f4790054 100644
--- a/src/google/protobuf/compiler/java/java_features.pb.h
+++ b/src/google/protobuf/compiler/java/java_features.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/compiler/java/java_features.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fjava_2fjava_5ffeatures_2eproto_2epb_2eh
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h
index bf91ebeaf8..8a5ee821dc 100644
--- a/src/google/protobuf/compiler/plugin.pb.h
+++ b/src/google/protobuf/compiler/plugin.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/compiler/plugin.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto_2epb_2eh
diff --git a/src/google/protobuf/compiler/versions.h b/src/google/protobuf/compiler/versions.h
index 29004483be..a328cbd0e5 100644
--- a/src/google/protobuf/compiler/versions.h
+++ b/src/google/protobuf/compiler/versions.h
@@ -46,8 +46,8 @@
 //
 // Please avoid changing them manually, as they should be updated automatically
 // by Protobuf release process.
-#define PROTOBUF_CPP_VERSION_STRING "4.25.4-dev" PROTOBUF_GENCODE_VERSION_SUFFIX
-#define PROTOBUF_JAVA_VERSION_STRING "3.25.4-dev" PROTOBUF_GENCODE_VERSION_SUFFIX
-#define PROTOBUF_PYTHON_VERSION_STRING "4.25.4-dev" PROTOBUF_GENCODE_VERSION_SUFFIX
+#define PROTOBUF_CPP_VERSION_STRING "4.25.4" PROTOBUF_GENCODE_VERSION_SUFFIX
+#define PROTOBUF_JAVA_VERSION_STRING "3.25.4" PROTOBUF_GENCODE_VERSION_SUFFIX
+#define PROTOBUF_PYTHON_VERSION_STRING "4.25.4" PROTOBUF_GENCODE_VERSION_SUFFIX
 
 #endif  // GOOGLE_PROTOBUF_VERSIONS_H__
diff --git a/src/google/protobuf/cpp_features.pb.h b/src/google/protobuf/cpp_features.pb.h
index a89d7f58d1..2fe33d5e89 100644
--- a/src/google/protobuf/cpp_features.pb.h
+++ b/src/google/protobuf/cpp_features.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/cpp_features.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcpp_5ffeatures_2eproto_2epb_2eh
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index bc21c6753a..3833eaf041 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/descriptor.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto_2epb_2eh
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index c87afae742..7d2f63f463 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/duration.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto_2epb_2eh
diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h
index dee282ff1c..a39e66893c 100644
--- a/src/google/protobuf/empty.pb.h
+++ b/src/google/protobuf/empty.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/empty.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto_2epb_2eh
diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h
index 589092319a..cbbd8dc70d 100644
--- a/src/google/protobuf/field_mask.pb.h
+++ b/src/google/protobuf/field_mask.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/field_mask.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto_2epb_2eh
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index c70c7a68c4..53764f49e3 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -219,7 +219,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #ifdef PROTOBUF_VERSION_SUFFIX
 #error PROTOBUF_VERSION_SUFFIX was previously defined
 #endif
-#define PROTOBUF_VERSION_SUFFIX "-dev"
+#define PROTOBUF_VERSION_SUFFIX ""
 
 #ifdef PROTOBUF_MINIMUM_EDITION
 #error PROTOBUF_MINIMUM_EDITION was previously defined
diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h
index 7b1dac1299..5157fdd3a6 100644
--- a/src/google/protobuf/source_context.pb.h
+++ b/src/google/protobuf/source_context.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/source_context.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto_2epb_2eh
diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h
index e8c2d8cfbb..90acf279f8 100644
--- a/src/google/protobuf/struct.pb.h
+++ b/src/google/protobuf/struct.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/struct.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto_2epb_2eh
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index d7ff55768c..c99bee2c50 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -47,7 +47,7 @@ namespace internal {
 #define GOOGLE_PROTOBUF_VERSION 4025004
 
 // A suffix string for alpha, beta or rc releases. Empty for stable releases.
-#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-dev"
+#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
 
 // The minimum header version which works with the current version of
 // the library.  This constant should only be used by protoc's C++ code
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h
index e1d0768005..b08f116635 100644
--- a/src/google/protobuf/timestamp.pb.h
+++ b/src/google/protobuf/timestamp.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/timestamp.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto_2epb_2eh
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index dbd190b99b..c570a827e6 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/type.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto_2epb_2eh
diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h
index be24ae0e09..cbd9848b68 100644
--- a/src/google/protobuf/wrappers.pb.h
+++ b/src/google/protobuf/wrappers.pb.h
@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/protobuf/wrappers.proto
-// Protobuf C++ Version: 4.25.4-dev
+// Protobuf C++ Version: 4.25.4
 
 #ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
 #define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto_2epb_2eh
diff --git a/version.json b/version.json
index 78ecab885d..52eb08718f 100644
--- a/version.json
+++ b/version.json
@@ -1,17 +1,17 @@
 {
     "25.x": {
-        "protoc_version": "25.4-dev",
+        "protoc_version": "25.4",
         "lts": false,
-        "date": "2024-02-15",
+        "date": "2024-07-24",
         "languages": {
-            "cpp": "4.25.4-dev",
-            "csharp": "3.25.4-dev",
-            "java": "3.25.4-dev",
-            "javascript": "3.25.4-dev",
-            "objectivec": "3.25.4-dev",
-            "php": "3.25.4-dev",
-            "python": "4.25.4-dev",
-            "ruby": "3.25.4-dev"
+            "cpp": "4.25.4",
+            "csharp": "3.25.4",
+            "java": "3.25.4",
+            "javascript": "3.25.4",
+            "objectivec": "3.25.4",
+            "php": "3.25.4",
+            "python": "4.25.4",
+            "ruby": "3.25.4"
         }
     }
 }
\ No newline at end of file