Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: protocolbuffers/protobuf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v27.2
Choose a base ref
...
head repository: protocolbuffers/protobuf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v27.3
Choose a head ref
  • 20 commits
  • 63 files changed
  • 9 contributors

Commits on Jun 25, 2024

  1. Fix segmentation faults with enabled keep_descriptor_pool_after_reque…

    …st (#16993)
    
    (cherry picked from commit e844510)
    simonberger committed Jun 25, 2024

    Verified

    This commit was signed with the committer’s verified signature.
    baywet Vincent Biret
    Copy the full SHA
    ca3b732 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    baywet Vincent Biret
    Copy the full SHA
    71b2940 View commit details
  3. Merge pull request #17236 from protocolbuffers/27.x-202406251914

    Merge release commits to 27.x
    mkruskal-google authored Jun 25, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    11307ca View commit details

Commits on Jul 1, 2024

  1. Refactor the way we turn on the optimization in StrongPointer.

    Some versions of gcc seem to advertise __cpp_nontype_template_args but not
    support the argument in some cases.
    Only attempt the template parameter if we are using the optimized .reloc
    approach.
    
    Fixes #16868
    
    PiperOrigin-RevId: 634787159
    protobuf-github-bot authored and zhangskz committed Jul 1, 2024
    Copy the full SHA
    a15c9c5 View commit details
  2. Merge pull request #17295 from protocolbuffers/cp-strongpointer

    Refactor the way we turn on the optimization in StrongPointer.
    zhangskz authored Jul 1, 2024
    Copy the full SHA
    2440498 View commit details

Commits on Jul 3, 2024

  1. [Ruby] Fix mismatched pointer type (#17240)

    This PR fixes the following error on windows ruby 3.4 (head):
    
    ```
    current directory:
    D:/a/sass-embedded-host-ruby/sass-embedded-host-ruby/vendor/bundle/ruby/3.4.0+0/gems/google-protobuf-4.27.1/ext/google/protobuf_c
    make.exe DESTDIR\= sitearchdir\=./.gem.20240623-6612-4umz58
    sitelibdir\=./.gem.20240623-6612-4umz58
    generating protobuf_c-x64-mingw-ucrt.def
    compiling protobuf.c
    compiling convert.c
    compiling defs.c
    defs.c: In function 'MethodDescriptor_initialize':
    defs.c:1513:19: error: assignment to 'const upb_MethodDef *' from incompatible
    pointer type 'const upb_ServiceDef *' [-Wincompatible-pointer-types]
     1513 |   self->methoddef = (const upb_ServiceDef*)NUM2ULL(ptr);
          |                   ^
    make: *** [Makefile:250: defs.o] Error 1
    
    make failed, exit code 2
    ```
    
    - Closes #17266
    
    Closes #17240
    
    COPYBARA_INTEGRATE_REVIEW=#17240 from ntkme:fix-ruby-upb-pointer-type 22e9859
    PiperOrigin-RevId: 648923147
    ntkme authored and zhangskz committed Jul 3, 2024
    Copy the full SHA
    a1d4777 View commit details
  2. Merge pull request #17326 from protocolbuffers/cp-ruby

    [Ruby] Fix mismatched pointer type (#17240)
    zhangskz authored Jul 3, 2024
    Copy the full SHA
    7592817 View commit details
  3. Omit the _raw_default_instance_ declaration when using DLL linkage.

    In that mode we might not be able to make a `constexpr` pointer to the default
    instance. Omitting the declaration will only turn off an optimization, but the
    code will still be correct.
    
    Fixes #17303
    
    PiperOrigin-RevId: 649160060
    protobuf-github-bot authored and zhangskz committed Jul 3, 2024
    Copy the full SHA
    22d9a03 View commit details
  4. Update staleness

    zhangskz committed Jul 3, 2024
    Copy the full SHA
    b7ef2ca View commit details

Commits on Jul 8, 2024

  1. Upgrade our C++ release tests to large runners.

    PiperOrigin-RevId: 647405381
    mkruskal-google authored and zhangskz committed Jul 8, 2024
    Copy the full SHA
    fa2b2d6 View commit details
  2. Use explicit names of our large runners

    PiperOrigin-RevId: 650360525
    mkruskal-google authored and zhangskz committed Jul 8, 2024
    Copy the full SHA
    4e3b4f0 View commit details
  3. Upgrade macos-11 tests to macos-12

    Github dropped macos-11 on their runners on June 28th.  This causes all our jobs to stall looking for a suitable runner.
    
    PiperOrigin-RevId: 648527302
    mkruskal-google authored and zhangskz committed Jul 8, 2024
    Copy the full SHA
    aec8a76 View commit details
  4. Merge pull request #17232 from simonberger/bugfix/php-ext-persistent-…

    …global-corruption-27.x
    
    Backported Fix segmentation faults with enabled keep_descriptor_pool_after_request
    haberman authored Jul 8, 2024
    Copy the full SHA
    c1ec82f View commit details

Commits on Jul 9, 2024

  1. Merge pull request #17331 from protocolbuffers/cp-cp

    Omit the `_raw_default_instance_` declaration when using DLL linkage.
    zhangskz authored Jul 9, 2024
    Copy the full SHA
    861be78 View commit details

Commits on Jul 15, 2024

  1. Revert workaround for std::mutex issues on github windows runners.

    PiperOrigin-RevId: 648802955
    mkruskal-google authored and zhangskz committed Jul 15, 2024
    Copy the full SHA
    ba3e7d7 View commit details
  2. Downgrade CMake to 3.29 to workaround Abseil issue.

    This was fixed in abseil/abseil-cpp@cd7f66c, but older versions of Abseil break in CMake 3.30, which github runners now use by default.
    
    PiperOrigin-RevId: 651854867
    mkruskal-google authored and zhangskz committed Jul 15, 2024
    Copy the full SHA
    8a579c1 View commit details

Commits on Jul 16, 2024

  1. Merge pull request #17473 from protocolbuffers/cp-revert-hack

    Cherry-pick "Revert workaround for std::mutex issues on github windows runners" and "Downgrade CMake to 3.29 to workaround Abseil issue."
    zhangskz authored Jul 16, 2024
    Copy the full SHA
    c9839cb View commit details

Commits on Jul 25, 2024

  1. Remove /utf-8 flag added in #14197

    We have received several reports in #17036 that the addition of this flag
    actually broke the use of command argument files with non-ASCII characters in
    their names. It looks like #14253 ended up fixing the original issue with a
    different solution anyway. Hopefully this change fixes the issue with non-ASCII
    characters.
    
    PiperOrigin-RevId: 655660885
    acozzette authored and zhangskz committed Jul 25, 2024
    Copy the full SHA
    e20cb7a View commit details
  2. Merge pull request #17617 from protocolbuffers/cp-utf8-ascii

    Remove `/utf-8` flag added in #14197
    zhangskz authored Jul 25, 2024
    Copy the full SHA
    67d7298 View commit details

Commits on Jul 31, 2024

  1. Copy the full SHA
    7cc670c View commit details
Showing with 136 additions and 256 deletions.
  1. +10 −4 .github/workflows/test_cpp.yml
  2. +5 −5 .github/workflows/test_upb.yml
  3. +1 −1 CMakeLists.txt
  4. +1 −1 MODULE.bazel
  5. +1 −1 Protobuf-C++.podspec
  6. +1 −1 Protobuf.podspec
  7. +0 −1 build_defs/cpp_opts.bzl
  8. +1 −1 csharp/Google.Protobuf.Tools.nuspec
  9. +1 −1 csharp/src/Google.Protobuf/Google.Protobuf.csproj
  10. +1 −1 java/bom/pom.xml
  11. +1 −1 java/core/pom.xml
  12. +1 −1 java/core/src/main/java/com/google/protobuf/RuntimeVersion.java
  13. +1 −1 java/kotlin-lite/pom.xml
  14. +1 −1 java/kotlin/pom.xml
  15. +1 −1 java/lite/pom.xml
  16. +1 −1 java/pom.xml
  17. +1 −1 java/protoc/pom.xml
  18. +1 −1 java/util/pom.xml
  19. +6 −6 php/ext/google/protobuf/protobuf.c
  20. +1 −1 php/ext/google/protobuf/protobuf.h
  21. +5 −5 protobuf_version.bzl
  22. +0 −4 protos/protos_extension_lock_test.cc
  23. +1 −1 python/google/protobuf/__init__.py
  24. +1 −1 python/google/protobuf/runtime_version.py
  25. +1 −1 ruby/ext/google/protobuf_c/defs.c
  26. +1 −1 ruby/google-protobuf.gemspec
  27. +2 −2 ruby/pom.xml
  28. +1 −1 src/google/protobuf/any.pb.cc
  29. +2 −4 src/google/protobuf/any.pb.h
  30. +1 −1 src/google/protobuf/api.pb.cc
  31. +2 −8 src/google/protobuf/api.pb.h
  32. +13 −2 src/google/protobuf/compiler/cpp/message.cc
  33. +1 −1 src/google/protobuf/compiler/java/java_features.pb.cc
  34. +2 −4 src/google/protobuf/compiler/java/java_features.pb.h
  35. +0 −3 src/google/protobuf/compiler/main.cc
  36. +0 −3 src/google/protobuf/compiler/main_no_generators.cc
  37. +1 −1 src/google/protobuf/compiler/plugin.pb.cc
  38. +2 −10 src/google/protobuf/compiler/plugin.pb.h
  39. +3 −3 src/google/protobuf/compiler/versions.h
  40. +1 −1 src/google/protobuf/cpp_features.pb.cc
  41. +2 −4 src/google/protobuf/cpp_features.pb.h
  42. +1 −1 src/google/protobuf/descriptor.pb.cc
  43. +2 −68 src/google/protobuf/descriptor.pb.h
  44. +1 −1 src/google/protobuf/duration.pb.cc
  45. +2 −4 src/google/protobuf/duration.pb.h
  46. +1 −1 src/google/protobuf/empty.pb.cc
  47. +2 −4 src/google/protobuf/empty.pb.h
  48. +1 −1 src/google/protobuf/field_mask.pb.cc
  49. +2 −4 src/google/protobuf/field_mask.pb.h
  50. +18 −14 src/google/protobuf/port.h
  51. +1 −1 src/google/protobuf/runtime_version.h
  52. +1 −1 src/google/protobuf/source_context.pb.cc
  53. +2 −4 src/google/protobuf/source_context.pb.h
  54. +1 −1 src/google/protobuf/struct.pb.cc
  55. +2 −8 src/google/protobuf/struct.pb.h
  56. +1 −1 src/google/protobuf/stubs/common.h
  57. +1 −1 src/google/protobuf/timestamp.pb.cc
  58. +2 −4 src/google/protobuf/timestamp.pb.h
  59. +1 −1 src/google/protobuf/type.pb.cc
  60. +2 −12 src/google/protobuf/type.pb.h
  61. +1 −1 src/google/protobuf/wrappers.pb.cc
  62. +2 −20 src/google/protobuf/wrappers.pb.h
  63. +10 −10 version.json
14 changes: 10 additions & 4 deletions .github/workflows/test_cpp.yml
Original file line number Diff line number Diff line change
@@ -19,9 +19,9 @@ jobs:
config:
- { name: Optimized, flags: --config=opt }
- { name: Debug, flags: --config=dbg }
- { name: ASAN, flags: --config=asan, runner: ubuntu-20-large }
- { name: MSAN, flags: --config=docker-msan, runner: ubuntu-20-large }
- { name: TSAN, flags: --config=tsan, runner: ubuntu-20-large }
- { name: ASAN, flags: --config=asan, runner: ubuntu-20-4core }
- { name: MSAN, flags: --config=docker-msan, runner: ubuntu-20-4core }
- { name: TSAN, flags: --config=tsan, runner: ubuntu-20-4core }
- { name: UBSAN, flags: --config=ubsan }
- { name: No-RTTI, flags: --cxxopt=-fno-rtti }
include:
@@ -80,7 +80,7 @@ jobs:
matrix:
arch: [x86_64, aarch64]
name: Linux Release ${{ matrix.arch}}
runs-on: ubuntu-latest
runs-on: ubuntu-20-4core
steps:
- name: Checkout pending changes
uses: protocolbuffers/protobuf-ci/checkout@v3
@@ -426,6 +426,12 @@ jobs:
arch: ${{ matrix.windows-arch || 'x64' }}
vsversion: ${{ matrix.vsversion }}

# Workaround for Abseil incompatibility with CMake 3.30 (b/352354235).
- name: Downgrade CMake
if: ${{ runner.os == 'Windows' }}
run: choco install cmake --version 3.29.6 --force
shell: bash

# Workaround for incompatibility between gcloud and windows-2019 runners.
- name: Install Python
if: ${{ matrix.python-version }}
10 changes: 5 additions & 5 deletions .github/workflows/test_upb.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ jobs:
- { name: "Bazel 7", bazel_version: "7.1.1" }
- { name: "Fastbuild" }
- { name: "Optimized", flags: "-c opt" }
- { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-20-large }
- { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-20-4core }
- { name: "UBSAN", flags: "--config=ubsan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/... -//lua/..." }
- { name: "32-bit", flags: "--copt=-m32 --linkopt=-m32", exclude-targets: "-//benchmarks:benchmark -//python/..." }
# TODO: Add 32-bit ASAN test
@@ -172,13 +172,13 @@ jobs:
# supported Python versions and assume this gives us sufficient test
# coverage.
- { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'binary' }
- { os: macos-11, python-version: "3.8", architecture: x64, type: 'binary' }
- { os: macos-12, python-version: "3.8", architecture: x64, type: 'binary' }
- { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'binary' }
- { os: macos-12, python-version: "3.12", architecture: x64, type: 'binary' }
- { os: macos-13, python-version: "3.12", architecture: x64, type: 'binary' }
- { os: ubuntu-latest, python-version: "3.8", architecture: x64, type: 'source' }
- { os: macos-11, python-version: "3.8", architecture: x64, type: 'source' }
- { os: macos-12, python-version: "3.8", architecture: x64, type: 'source' }
- { os: ubuntu-latest, python-version: "3.12", architecture: x64, type: 'source' }
- { os: macos-12, python-version: "3.12", architecture: x64, type: 'source' }
- { os: macos-13, python-version: "3.12", architecture: x64, type: 'source' }

# Windows uses the full API up until Python 3.10.
- { os: windows-2019, python-version: "3.8", architecture: x86, type: 'binary' }
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ if (protobuf_BUILD_SHARED_LIBS)
endif ()

# Version metadata
set(protobuf_VERSION_STRING "5.27.2")
set(protobuf_VERSION_STRING "5.27.3")
set(protobuf_DESCRIPTION "Protocol Buffers")
set(protobuf_CONTACT "protobuf@googlegroups.com")

2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
# https://github.com/protocolbuffers/protobuf/issues/14313
module(
name = "protobuf",
version = "27.2", # Automatically updated on release
version = "27.3", # Automatically updated on release
compatibility_level = 1,
repo_name = "com_google_protobuf",
)
2 changes: 1 addition & 1 deletion Protobuf-C++.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Protobuf-C++'
s.version = '5.27.2'
s.version = '5.27.3'
s.summary = 'Protocol Buffers v3 runtime library for C++.'
s.homepage = 'https://github.com/google/protobuf'
s.license = 'BSD-3-Clause'
2 changes: 1 addition & 1 deletion Protobuf.podspec
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
# dependent projects use the :git notation to refer to the library.
Pod::Spec.new do |s|
s.name = 'Protobuf'
s.version = '3.27.2'
s.version = '3.27.3'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/protocolbuffers/protobuf'
s.license = 'BSD-3-Clause'
1 change: 0 additions & 1 deletion build_defs/cpp_opts.bzl
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ COPTS = select({
"/wd4506", # no definition for inline function 'function'
"/wd4800", # 'type' : forcing value to bool 'true' or 'false' (performance warning)
"/wd4996", # The compiler encountered a deprecated declaration.
"/utf-8", # Set source and execution character sets to UTF-8
],
"//conditions:default": [
"-DHAVE_ZLIB",
2 changes: 1 addition & 1 deletion csharp/Google.Protobuf.Tools.nuspec
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<title>Google Protocol Buffers tools</title>
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
<description>See project site for more info.</description>
<version>3.27.2</version>
<version>3.27.3</version>
<authors>Google Inc.</authors>
<owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>
2 changes: 1 addition & 1 deletion csharp/src/Google.Protobuf/Google.Protobuf.csproj
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
<Copyright>Copyright 2015, Google Inc.</Copyright>
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
<VersionPrefix>3.27.2</VersionPrefix>
<VersionPrefix>3.27.3</VersionPrefix>
<LangVersion>10.0</LangVersion>
<Authors>Google Inc.</Authors>
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>
2 changes: 1 addition & 1 deletion java/bom/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>4.27.2</version>
<version>4.27.3</version>
<packaging>pom</packaging>

<name>Protocol Buffers [BOM]</name>
2 changes: 1 addition & 1 deletion java/core/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>4.27.2</version>
<version>4.27.3</version>
</parent>

<artifactId>protobuf-java</artifactId>
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ public enum RuntimeDomain {
public static final RuntimeDomain DOMAIN = RuntimeDomain.PUBLIC;
public static final int MAJOR = 4;
public static final int MINOR = 27;
public static final int PATCH = 2;
public static final int PATCH = 3;
public static final String SUFFIX = "";

private static final String VERSION_STRING = versionString(MAJOR, MINOR, PATCH, SUFFIX);
2 changes: 1 addition & 1 deletion java/kotlin-lite/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>4.27.2</version>
<version>4.27.3</version>
</parent>

<artifactId>protobuf-kotlin-lite</artifactId>
2 changes: 1 addition & 1 deletion java/kotlin/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>4.27.2</version>
<version>4.27.3</version>
</parent>

<artifactId>protobuf-kotlin</artifactId>
2 changes: 1 addition & 1 deletion java/lite/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>4.27.2</version>
<version>4.27.3</version>
</parent>

<artifactId>protobuf-javalite</artifactId>
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>4.27.2</version>
<version>4.27.3</version>
<packaging>pom</packaging>

<name>Protocol Buffers [Parent]</name>
2 changes: 1 addition & 1 deletion java/protoc/pom.xml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<version>4.27.2</version>
<version>4.27.3</version>
<packaging>pom</packaging>
<name>Protobuf Compiler</name>
<description>
2 changes: 1 addition & 1 deletion java/util/pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>4.27.2</version>
<version>4.27.3</version>
</parent>

<artifactId>protobuf-java-util</artifactId>
12 changes: 6 additions & 6 deletions php/ext/google/protobuf/protobuf.c
Original file line number Diff line number Diff line change
@@ -143,11 +143,11 @@ static PHP_GINIT_FUNCTION(protobuf) { protobuf_globals->global_symtab = NULL; }
static PHP_RINIT_FUNCTION(protobuf) {
// Create the global generated pool.
// Reuse the symtab (if any) left to us by the last request.
upb_DefPool* symtab = PROTOBUF_G(global_symtab);
if (!symtab) {
PROTOBUF_G(global_symtab) = symtab = upb_DefPool_New();
zend_hash_init(&PROTOBUF_G(name_msg_cache), 64, NULL, NULL, 0);
zend_hash_init(&PROTOBUF_G(name_enum_cache), 64, NULL, NULL, 0);
if (!PROTOBUF_G(global_symtab)) {
zend_bool persistent = PROTOBUF_G(keep_descriptor_pool_after_request);
PROTOBUF_G(global_symtab) = upb_DefPool_New();
zend_hash_init(&PROTOBUF_G(name_msg_cache), 64, NULL, NULL, persistent);
zend_hash_init(&PROTOBUF_G(name_enum_cache), 64, NULL, NULL, persistent);
}

zend_hash_init(&PROTOBUF_G(object_cache), 64, NULL, NULL, 0);
@@ -308,7 +308,7 @@ zend_module_entry protobuf_module_entry = {
protobuf_functions, // function list
PHP_MINIT(protobuf), // process startup
PHP_MSHUTDOWN(protobuf), // process shutdown
PHP_RINIT(protobuf), // request shutdown
PHP_RINIT(protobuf), // request startup
PHP_RSHUTDOWN(protobuf), // request shutdown
NULL, // extension info
PHP_PROTOBUF_VERSION, // extension version
2 changes: 1 addition & 1 deletion php/ext/google/protobuf/protobuf.h
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO()

#define PHP_PROTOBUF_VERSION "4.27.2"
#define PHP_PROTOBUF_VERSION "4.27.3"

// ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types:
10 changes: 5 additions & 5 deletions protobuf_version.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
""" Contains version numbers to be used in other bzl files """
PROTOC_VERSION = "27.2"
PROTOBUF_JAVA_VERSION = "4.27.2"
PROTOBUF_PYTHON_VERSION = "5.27.2"
PROTOBUF_PHP_VERSION = "4.27.2"
PROTOBUF_RUBY_VERSION = "4.27.2"
PROTOC_VERSION = "27.3"
PROTOBUF_JAVA_VERSION = "4.27.3"
PROTOBUF_PYTHON_VERSION = "5.27.3"
PROTOBUF_PHP_VERSION = "4.27.3"
PROTOBUF_RUBY_VERSION = "4.27.3"
4 changes: 0 additions & 4 deletions protos/protos_extension_lock_test.cc
Original file line number Diff line number Diff line change
@@ -102,8 +102,6 @@ void TestConcurrentExtensionAccess(::protos::ExtensionRegistry registry) {
test_theme();
test_theme_extension();
}
#ifndef _MSC_VER
// TODO Re-enable this once github runner issue is resolved.

TEST(CppGeneratedCode, ConcurrentAccessDoesNotRaceBothLazy) {
::upb::Arena arena;
@@ -122,7 +120,5 @@ TEST(CppGeneratedCode, ConcurrentAccessDoesNotRaceBothEager) {
{{&theme, &ThemeExtension::theme_extension}, arena});
}

#endif // _MSC_VER

} // namespace
} // namespace protos_generator::test::protos
2 changes: 1 addition & 1 deletion python/google/protobuf/__init__.py
Original file line number Diff line number Diff line change
@@ -7,4 +7,4 @@

# Copyright 2007 Google Inc. All Rights Reserved.

__version__ = '5.27.2'
__version__ = '5.27.3'
2 changes: 1 addition & 1 deletion python/google/protobuf/runtime_version.py
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ class VersionError(Exception):
DOMAIN = Domain.PUBLIC
MAJOR = 5
MINOR = 27
PATCH = 2
PATCH = 3
SUFFIX = ''


2 changes: 1 addition & 1 deletion ruby/ext/google/protobuf_c/defs.c
Original file line number Diff line number Diff line change
@@ -1510,7 +1510,7 @@ static VALUE MethodDescriptor_initialize(VALUE _self, VALUE cookie,
}

RB_OBJ_WRITE(_self, &self->descriptor_pool, descriptor_pool);
self->methoddef = (const upb_ServiceDef*)NUM2ULL(ptr);
self->methoddef = (const upb_MethodDef*)NUM2ULL(ptr);

return Qnil;
}
2 changes: 1 addition & 1 deletion ruby/google-protobuf.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "google-protobuf"
s.version = "4.27.2"
s.version = "4.27.3"
git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
s.licenses = ["BSD-3-Clause"]
s.summary = "Protocol Buffers"
4 changes: 2 additions & 2 deletions ruby/pom.xml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

<groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId>
<version>4.27.2</version>
<version>4.27.3</version>
<name>Protocol Buffer JRuby native extension</name>
<description>
Protocol Buffers are a way of encoding structured data in an efficient yet
@@ -76,7 +76,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>4.27.2</version>
<version>4.27.3</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
2 changes: 1 addition & 1 deletion src/google/protobuf/any.pb.cc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions src/google/protobuf/any.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/google/protobuf/api.pb.cc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading