Merge 22.x back to main (#12169)

Closes #12169

PiperOrigin-RevId: 515161008
pull/12149/head
deannagarcia 2 years ago committed by Copybara-Service
parent 972609b679
commit 15bd2c21cf
  1. 8
      .github/workflows/test_java.yml
  2. 2
      CMakeLists.txt
  3. 2
      Protobuf-C++.podspec
  4. 2
      Protobuf.podspec
  5. 10
      build_defs/BUILD.bazel
  6. 22
      build_defs/java_opts.bzl
  7. 1
      ci/push_auto_update.sh
  8. 2
      csharp/Google.Protobuf.Tools.nuspec
  9. 2
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  10. 10
      java/README.md
  11. 2
      java/bom/pom.xml
  12. 18
      java/core/BUILD.bazel
  13. 2
      java/core/pom.xml
  14. 8
      java/internal/JavaVersionTest.java
  15. 2
      java/kotlin-lite/pom.xml
  16. 2
      java/kotlin/pom.xml
  17. 2
      java/lite.md
  18. 2
      java/lite/pom.xml
  19. 2
      java/pom.xml
  20. 2
      java/protoc/pom.xml
  21. 6
      java/util/BUILD.bazel
  22. 2
      java/util/pom.xml
  23. 2
      php/ext/google/protobuf/protobuf.h
  24. 14
      pkg/BUILD.bazel
  25. 11
      protobuf_version.bzl
  26. 1
      python/BUILD.bazel
  27. 2
      python/google/protobuf/__init__.py
  28. 2
      ruby/google-protobuf.gemspec
  29. 4
      ruby/pom.xml
  30. 2
      src/google/protobuf/any.pb.h
  31. 2
      src/google/protobuf/api.pb.h
  32. 6
      src/google/protobuf/compiler/BUILD.bazel
  33. 2
      src/google/protobuf/compiler/plugin.pb.h
  34. 2
      src/google/protobuf/descriptor.pb.h
  35. 2
      src/google/protobuf/duration.pb.h
  36. 2
      src/google/protobuf/empty.pb.h
  37. 2
      src/google/protobuf/field_mask.pb.h
  38. 2
      src/google/protobuf/port_def.inc
  39. 2
      src/google/protobuf/source_context.pb.h
  40. 2
      src/google/protobuf/struct.pb.h
  41. 2
      src/google/protobuf/stubs/common.h
  42. 2
      src/google/protobuf/timestamp.pb.h
  43. 2
      src/google/protobuf/type.pb.h
  44. 2
      src/google/protobuf/wrappers.pb.h

@ -14,13 +14,17 @@ jobs:
fail-fast: false
matrix:
include:
- name: OpenJDK 8
version: '8'
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:8-03a376b5d6ef66f827fc307716e3b841cc26b709
targets: //java/... //java/internal:java_version
- name: OpenJDK 11
version: '11'
image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-6361b3a6e5c97e9951d03a4de28542fc45f1adab
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:11-03a376b5d6ef66f827fc307716e3b841cc26b709
targets: //java/... //java/internal:java_version
- name: OpenJDK 17
version: '17'
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-508417e5215994ade7585d28ba3aad681a25fa5d
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-03a376b5d6ef66f827fc307716e3b841cc26b709
targets: //java/... //java/internal:java_version
- name: aarch64
version: 'aarch64'

@ -93,7 +93,7 @@ if (protobuf_BUILD_SHARED_LIBS)
endif ()
# Version metadata
set(protobuf_VERSION_STRING "3.21.4")
set(protobuf_VERSION_STRING "4.22.1")
set(protobuf_DESCRIPTION "Protocol Buffers")
set(protobuf_CONTACT "protobuf@googlegroups.com")

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Protobuf-C++'
s.version = '3.21.12'
s.version = '4.22.1'
s.summary = 'Protocol Buffers v3 runtime library for C++.'
s.homepage = 'https://github.com/google/protobuf'
s.license = 'BSD-3-Clause'

@ -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.21.12'
s.version = '3.22.1'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/protocolbuffers/protobuf'
s.license = 'BSD-3-Clause'

@ -84,6 +84,14 @@ config_setting(
},
)
selects.config_setting_group(
name = "config_win",
match_any = [
":config_win32",
":config_win64",
]
)
config_setting(
name = "config_osx_aarch64",
values = {"cpu": "osx-aarch_64"},
@ -91,7 +99,7 @@ config_setting(
config_setting(
name = "config_osx_x86_64",
values = {"cpu": "osx-aarch_64"},
values = {"cpu": "osx-x86_64"},
)
selects.config_setting_group(

@ -0,0 +1,22 @@
"""Java options and protobuf-specific java build rules with those options."""
load("@rules_java//java:defs.bzl", "java_library")
load("@rules_jvm_external//:defs.bzl", "java_export")
JAVA_OPTS = [
"-source 8",
"-target 8",
"-Xep:Java8ApiChecker:ERROR",
]
def protobuf_java_export(**kwargs):
java_export(
javacopts = JAVA_OPTS,
**kwargs
)
def protobuf_java_library(**kwargs):
java_library(
javacopts = JAVA_OPTS,
**kwargs
)

@ -39,6 +39,7 @@ else
commit_message="Auto-generate files"
fi
git pull --rebase
git add -A
git diff --staged --quiet || git commit -am "$commit_message"
git push || echo "Conflicting commit hit, retrying in next job..."

@ -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.21.12</version>
<version>3.22.1</version>
<authors>Google Inc.</authors>
<owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

@ -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.21.12</VersionPrefix>
<VersionPrefix>3.22.1</VersionPrefix>
<LangVersion>10.0</LangVersion>
<Authors>Google Inc.</Authors>
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

@ -23,7 +23,7 @@ If you are using Maven, use the following:
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.21.12</version>
<version>3.22.1</version>
</dependency>
```
@ -37,16 +37,16 @@ protobuf-java-util package:
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>3.21.12</version>
<version>3.22.1</version>
</dependency>
```
### Gradle
If you are using Gradle, add the following to your `build.gradle` file's
dependencies: `implementation 'com.google.protobuf:protobuf-java:3.21.12'`
Again, be sure to check that the version number matches (or is newer than) the
version number of protoc that you are using.
dependencies: `implementation 'com.google.protobuf:protobuf-java:3.22.1'` Again,
be sure to check that the version number matches (or is newer than) the version
number of protoc that you are using.
### Use Java Protocol Buffers on Android

@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>3.21.12</version>
<version>3.22.1</version>
<packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name>

@ -1,8 +1,8 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@rules_java//java:defs.bzl", "java_library", "java_lite_proto_library", "java_proto_library")
load("@rules_jvm_external//:defs.bzl", "java_export")
load("@rules_java//java:defs.bzl", "java_lite_proto_library", "java_proto_library")
load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
load("//build_defs:java_opts.bzl", "protobuf_java_export", "protobuf_java_library")
load("//conformance:defs.bzl", "conformance_test")
load("//:protobuf.bzl", "internal_gen_well_known_protos_java")
load("//:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
@ -121,7 +121,7 @@ internal_gen_well_known_protos_java(
)
# Should be used as `//java/lite`.
java_library(
protobuf_java_library(
name = "lite",
srcs = LITE_SRCS + [
":gen_well_known_protos_javalite",
@ -132,7 +132,7 @@ java_library(
)
# Bazel users, don't depend on this target, use //java/lite.
java_export(
protobuf_java_export(
name = "lite_mvn",
maven_coordinates = "com.google.protobuf:protobuf-javalite:%s" % PROTOBUF_JAVA_VERSION,
pom_template = "//java/lite:pom_template.xml",
@ -143,7 +143,7 @@ java_export(
runtime_deps = [":lite"],
)
java_library(
protobuf_java_library(
name = "lite_runtime_only",
srcs = LITE_SRCS,
)
@ -166,7 +166,7 @@ internal_gen_well_known_protos_java(
],
)
java_library(
protobuf_java_library(
name = "core",
srcs = glob(
[
@ -186,7 +186,7 @@ java_library(
)
# Bazel users, don't depend on this target, use :core.
java_export(
protobuf_java_export(
name = "core_mvn",
maven_coordinates = "com.google.protobuf:protobuf-java:%s" % PROTOBUF_JAVA_VERSION,
pom_template = "pom_template.xml",
@ -269,7 +269,7 @@ java_proto_library(
deps = [":java_test_protos"],
)
java_library(
protobuf_java_library(
name = "test_util",
srcs = [
"src/test/java/com/google/protobuf/TestUtil.java",
@ -390,7 +390,7 @@ genrule(
cmd = "awk -f $(location //java/lite:lite.awk) $(location src/test/java/com/google/protobuf/TestUtil.java) > $@",
)
java_library(
protobuf_java_library(
name = "test_util_lite",
srcs = [
"src/test/java/com/google/protobuf/TestUtilLite.java",

@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.21.12</version>
<version>3.22.1</version>
</parent>
<artifactId>protobuf-java</artifactId>

@ -44,9 +44,11 @@ public class JavaVersionTest {
System.err.println("No kokoro java version found, skipping check");
return;
}
// Java 8's version is read as "1.8"
if (exp.equals("8")) exp = "1.8";
String version = System.getProperty("java.version");
assertWithMessage("Expected Python " + exp + " but found Python " + version)
.that(version.startsWith(exp))
.isTrue();
assertWithMessage("Expected Java " + exp + " but found Java " + version)
.that(version.startsWith(exp))
.isTrue();
}
}

@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.21.12</version>
<version>3.22.1</version>
</parent>
<artifactId>protobuf-kotlin-lite</artifactId>

@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.21.12</version>
<version>3.22.1</version>
</parent>
<artifactId>protobuf-kotlin</artifactId>

@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId>
<version>3.21.12</version>
<version>3.22.1</version>
</dependency>
```

@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.21.12</version>
<version>3.22.1</version>
</parent>
<artifactId>protobuf-javalite</artifactId>

@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.21.12</version>
<version>3.22.1</version>
<packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name>

@ -8,7 +8,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<version>3.21.6</version>
<version>3.22.1</version>
<packaging>pom</packaging>
<name>Protobuf Compiler</name>
<description>

@ -1,11 +1,11 @@
load("@rules_java//java:defs.bzl", "java_proto_library")
load("@rules_jvm_external//:defs.bzl", "java_export")
load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
load("@rules_proto//proto:defs.bzl", "proto_library")
load("//build_defs:java_opts.bzl", "protobuf_java_export", "protobuf_java_library")
load("//:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
load("//java/internal:testing.bzl", "junit_tests")
java_library(
protobuf_java_library(
name = "util",
srcs = glob([
"src/main/java/com/google/protobuf/util/*.java",
@ -22,7 +22,7 @@ java_library(
)
# Bazel users, don't depend on this target, use :util.
java_export(
protobuf_java_export(
name = "util_mvn",
deploy_env = ["//java/core"],
maven_coordinates = "com.google.protobuf:protobuf-java-util:%s" % PROTOBUF_JAVA_VERSION,

@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.21.12</version>
<version>3.22.1</version>
</parent>
<artifactId>protobuf-java-util</artifactId>

@ -127,7 +127,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO()
#define PHP_PROTOBUF_VERSION "3.21.12"
#define PHP_PROTOBUF_VERSION "3.22.1"
// ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types:

@ -62,11 +62,23 @@ genrule(
srcs = ["//:protoc_static"],
outs = ["bin/protoc"],
cmd = "cp $< $@",
tags = ["manual"],
)
genrule(
name = "rename_protoc_exe",
srcs = ["//:protoc_static"],
outs = ["bin/protoc.exe"],
cmd = "cp $< $@",
tags = ["manual"],
)
pkg_files(
name = "protoc_files",
srcs = ["bin/protoc"],
srcs = select({
"//build_defs:config_win": ["bin/protoc.exe"],
"//conditions:default": ["bin/protoc"],
}),
attributes = pkg_attributes(mode = "0555"),
prefix = "bin/",
visibility = ["//visibility:private"],

@ -1,5 +1,6 @@
PROTOC_VERSION = "21.12"
PROTOBUF_JAVA_VERSION = "3.21.12"
PROTOBUF_PYTHON_VERSION = "4.21.12"
PROTOBUF_PHP_VERSION = "3.21.12"
PROTOBUF_RUBY_VERSION = "3.21.12"
""" Contains version numbers to be used in other bzl files """
PROTOC_VERSION = "22.1"
PROTOBUF_JAVA_VERSION = "3.22.1"
PROTOBUF_PYTHON_VERSION = "4.22.1"
PROTOBUF_PHP_VERSION = "3.22.1"
PROTOBUF_RUBY_VERSION = "3.22.1"

@ -56,6 +56,7 @@ internal_copy_files(
srcs = [
"//:well_known_type_protos",
"//src/google/protobuf:descriptor_proto_srcs",
"//src/google/protobuf/compiler:plugin.proto",
],
strip_prefix = "src",
)

@ -30,4 +30,4 @@
# Copyright 2007 Google Inc. All Rights Reserved.
__version__ = '4.21.12'
__version__ = '4.22.1'

@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "google-protobuf"
s.version = "3.21.12"
s.version = "3.22.1"
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"

@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId>
<version>3.21.12</version>
<version>3.22.1</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>3.21.12</version>
<version>3.22.1</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -20,6 +20,7 @@ proto_library(
"//:__pkg__",
"//pkg:__pkg__",
],
strip_import_prefix = "/src",
deps = ["//:descriptor_proto"],
)
@ -210,7 +211,10 @@ filegroup(
exports_files(
srcs = ["plugin.proto"],
visibility = ["//:__pkg__"],
visibility = [
"//:__pkg__",
"//python:__pkg__",
],
)
cc_library(

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -222,7 +222,7 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and
#ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined
#endif
#define PROTOBUF_VERSION 3021012
#define PROTOBUF_VERSION 4022001
#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -66,7 +66,7 @@ namespace internal {
// The current version, represented as a single integer to make comparison
// easier: major * 10^6 + minor * 10^3 + micro
#define GOOGLE_PROTOBUF_VERSION 3021012
#define GOOGLE_PROTOBUF_VERSION 4022001
// A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

@ -15,7 +15,7 @@
#error "your headers."
#endif // PROTOBUF_VERSION
#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
#if 4022001 < PROTOBUF_MIN_PROTOC_VERSION
#error "This file was generated by an older version of protoc which is"
#error "incompatible with your Protocol Buffer headers. Please"
#error "regenerate this file with a newer version of protoc."

Loading…
Cancel
Save