Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9169 from protocolbuffers/3.19.x

Browse Source 
Merge 3.19.x into master
pull/9183/head
Adam Cozzette 3 years ago committed by GitHub
parent c4c7e2b8f9 31dd7b71cc
commit 7ccf4d8f67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 166 additions and 160 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      CHANGES.txt
  2. 2
      Protobuf-C++.podspec
  3. 2
      Protobuf.podspec
  4. 63
      WORKSPACE
  5. 2
      configure.ac
  6. 2
      csharp/Google.Protobuf.Tools.nuspec
  7. 2
      csharp/src/Google.Protobuf/Google.Protobuf.csproj
  8. 6
      java/README.md
  9. 2
      java/bom/pom.xml
  10. 81
      java/core/BUILD
  11. 2
      java/core/pom.xml
  12. 2
      java/kotlin-lite/pom.xml
  13. 2
      java/kotlin/pom.xml
  14. 2
      java/lite.md
  15. 21
      java/lite/BUILD
  16. 2
      java/lite/pom.xml
  17. 2
      java/pom.xml
  18. 29
      java/util/BUILD
  19. 2
      java/util/pom.xml
  20. 2
      js/package.json
  21. 27
      php/ext/google/protobuf/package.xml
  22. 2
      php/ext/google/protobuf/protobuf.h
  23. 13
      protobuf_deps.bzl
  24. 2
      protobuf_version.bzl
  25. 2
      protoc-artifacts/pom.xml
  26. 2
      python/google/protobuf/__init__.py
  27. 2
      ruby/google-protobuf.gemspec
  28. 4
      ruby/pom.xml
  29. 2
      src/Makefile.am
  30. 2
      src/google/protobuf/any.pb.h
  31. 2
      src/google/protobuf/api.pb.h
  32. 2
      src/google/protobuf/compiler/plugin.pb.h
  33. 2
      src/google/protobuf/descriptor.pb.h
  34. 2
      src/google/protobuf/duration.pb.h
  35. 2
      src/google/protobuf/empty.pb.h
  36. 2
      src/google/protobuf/field_mask.pb.h
  37. 2
      src/google/protobuf/port_def.inc
  38. 2
      src/google/protobuf/source_context.pb.h
  39. 2
      src/google/protobuf/struct.pb.h
  40. 2
      src/google/protobuf/stubs/common.h
  41. 2
      src/google/protobuf/timestamp.pb.h
  42. 2
      src/google/protobuf/type.pb.h
  43. 2
      src/google/protobuf/wrappers.pb.h

14
CHANGES.txt
Unescape View File

@ -1,3 +1,15 @@
2021-10-28 version 3.19.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
Bazel
* Ensure that release archives contain everything needed for Bazel (#9131)
* Align dependency handling with Bazel best practices (#9165)
JavaScript
* Fix `ReferenceError: window is not defined` when getting the global object (#9156)
Ruby
* Fix memory leak in MessageClass.encode (#9150)
2021-10-15 version 3.19.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript) 2021-10-15 version 3.19.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
C++ C++
@ -17,6 +29,7 @@
Kotlin Kotlin
* Switch Kotlin proto DSLs to be implemented with inline value classes * Switch Kotlin proto DSLs to be implemented with inline value classes
* Fix inlining and deprecation for repeated string fields in kotlin (#9120)
Python Python
* Proto2 DecodeError now includes message name in error message * Proto2 DecodeError now includes message name in error message
@ -37,6 +50,7 @@
* Add class method Timestamp.from_time to ruby well known types (#8562) * Add class method Timestamp.from_time to ruby well known types (#8562)
* Adopt pure ruby DSL implementation for JRuby (#9047) * Adopt pure ruby DSL implementation for JRuby (#9047)
* Add size to Map class (#8068) * Add size to Map class (#8068)
* Fix for descriptor_pb.rb: google/protobuf should be required first (#9121)
C# C#
* Correctly set ExtensionRegistry when parsing with MessageParser, but using an already existing CodedInputStream (#7246) * Correctly set ExtensionRegistry when parsing with MessageParser, but using an already existing CodedInputStream (#7246)

2
Protobuf-C++.podspec
Unescape View File

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

2
Protobuf.podspec
Unescape View File

@ -5,7 +5,7 @@
# dependent projects use the :git notation to refer to the library. # dependent projects use the :git notation to refer to the library.
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'Protobuf' s.name = 'Protobuf'
s.version = '3.19.0' s.version = '3.19.1'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/protocolbuffers/protobuf' s.homepage = 'https://github.com/protocolbuffers/protobuf'
s.license = '3-Clause BSD License' s.license = '3-Clause BSD License'

63
WORKSPACE
Unescape View File

@ -27,7 +27,7 @@ http_archive(
) )
# Load common dependencies. # Load common dependencies.
load("//:protobuf_deps.bzl", "protobuf_deps") load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
protobuf_deps() protobuf_deps()
bind( bind(
@ -36,70 +36,23 @@ bind(
) )
load("@rules_jvm_external//:defs.bzl", "maven_install") load("@rules_jvm_external//:defs.bzl", "maven_install")
maven_install(
artifacts = [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.code.gson:gson:2.8.6",
"com.google.errorprone:error_prone_annotations:2.3.2",
"com.google.j2objc:j2objc-annotations:1.3",
"com.google.guava:guava:30.1.1-jre",
"com.google.truth:truth:1.1.2",
"junit:junit:4.12",
"org.easymock:easymock:3.2",
], maven_install(
artifacts = PROTOBUF_MAVEN_ARTIFACTS,
# For updating instructions, see:
# https://github.com/bazelbuild/rules_jvm_external#updating-maven_installjson
maven_install_json = "//:maven_install.json",
repositories = [ repositories = [
"https://repo1.maven.org/maven2", "https://repo1.maven.org/maven2",
"https://repo.maven.apache.org/maven2", "https://repo.maven.apache.org/maven2",
], ],
# For updating instructions, see:
# https://github.com/bazelbuild/rules_jvm_external#updating-maven_installjson
maven_install_json = "//:maven_install.json",
) )
load("@maven//:defs.bzl", "pinned_maven_install") load("@maven//:defs.bzl", "pinned_maven_install")
pinned_maven_install()
bind(
name = "guava",
actual = "@maven//:com_google_guava_guava",
)
bind(
name = "gson",
actual = "@maven//:com_google_code_gson_gson",
)
bind(
name = "error_prone_annotations",
actual = "@maven//:com_google_errorprone_error_prone_annotations",
)
bind( pinned_maven_install()
name = "j2objc_annotations",
actual = "@maven//:com_google_j2objc_j2objc_annotations",
)
bind(
name = "jsr305",
actual = "@maven//:com_google_code_findbugs_jsr305",
)
bind(
name = "junit",
actual = "@maven//:junit_junit",
)
bind(
name = "easymock",
actual = "@maven//:org_easymock_easymock",
)
bind(
name = "truth",
actual = "@maven//:com_google_truth_truth",
)
# For `cc_proto_blacklist_test` and `build_test`. # For `cc_proto_blacklist_test` and `build_test`.
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
bazel_skylib_workspace() bazel_skylib_workspace()

2
configure.ac
Unescape View File

@ -17,7 +17,7 @@ AC_PREREQ(2.59)
# In the SVN trunk, the version should always be the next anticipated release # In the SVN trunk, the version should always be the next anticipated release
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
# the size of one file name in the dist tarfile over the 99-char limit.) # the size of one file name in the dist tarfile over the 99-char limit.)
AC_INIT([Protocol Buffers],[3.19.0],[protobuf@googlegroups.com],[protobuf]) AC_INIT([Protocol Buffers],[3.19.1],[protobuf@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])

2
csharp/Google.Protobuf.Tools.nuspec
Unescape View File

@ -5,7 +5,7 @@
<title>Google Protocol Buffers tools</title> <title>Google Protocol Buffers tools</title>
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary> <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
<description>See project site for more info.</description> <description>See project site for more info.</description>
<version>3.19.0</version> <version>3.19.1</version>
<authors>Google Inc.</authors> <authors>Google Inc.</authors>
<owners>protobuf-packages</owners> <owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>

2
csharp/src/Google.Protobuf/Google.Protobuf.csproj
Unescape View File

@ -4,7 +4,7 @@
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description> <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
<Copyright>Copyright 2015, Google Inc.</Copyright> <Copyright>Copyright 2015, Google Inc.</Copyright>
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle> <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
<VersionPrefix>3.19.0</VersionPrefix> <VersionPrefix>3.19.1</VersionPrefix>
<!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence --> <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
<LangVersion>7.2</LangVersion> <LangVersion>7.2</LangVersion>
<Authors>Google Inc.</Authors> <Authors>Google Inc.</Authors>

6
java/README.md
Unescape View File

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

2
java/bom/pom.xml
Unescape View File

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

81
java/core/BUILD
Unescape View File

@ -1,5 +1,5 @@
load("@bazel_skylib//rules:build_test.bzl", "build_test") load("@bazel_skylib//rules:build_test.bzl", "build_test")
load("@rules_java//java:defs.bzl", "java_library", "java_proto_library", "java_lite_proto_library") 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_jvm_external//:defs.bzl", "java_export")
load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library") load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
load("//:internal.bzl", "conformance_test") load("//:internal.bzl", "conformance_test")
@ -103,7 +103,7 @@ LITE_SRCS = [
java_library( java_library(
name = "lite", name = "lite",
srcs = LITE_SRCS + [ srcs = LITE_SRCS + [
"//:gen_well_known_protos_javalite" "//:gen_well_known_protos_javalite",
], ],
visibility = [ visibility = [
"//java/lite:__pkg__", "//java/lite:__pkg__",
@ -115,10 +115,10 @@ java_export(
name = "lite_mvn", name = "lite_mvn",
maven_coordinates = "com.google.protobuf:protobuf-javalite:%s" % PROTOBUF_VERSION, maven_coordinates = "com.google.protobuf:protobuf-javalite:%s" % PROTOBUF_VERSION,
pom_template = "//java/lite:pom_template.xml", pom_template = "//java/lite:pom_template.xml",
runtime_deps = [":lite"],
resources = [ resources = [
"//:lite_well_known_protos", "//:lite_well_known_protos",
], ],
runtime_deps = [":lite"],
) )
java_library( java_library(
@ -150,25 +150,25 @@ java_export(
name = "core_mvn", name = "core_mvn",
maven_coordinates = "com.google.protobuf:protobuf-java:%s" % PROTOBUF_VERSION, maven_coordinates = "com.google.protobuf:protobuf-java:%s" % PROTOBUF_VERSION,
pom_template = "pom_template.xml", pom_template = "pom_template.xml",
runtime_deps = [":core"],
resources = [ resources = [
"//:well_known_protos", "//:well_known_protos",
], ],
runtime_deps = [":core"],
) )
filegroup( filegroup(
name = "release", name = "release",
visibility = ["//java:__pkg__"],
srcs = [ srcs = [
":core_mvn-pom",
":core_mvn-maven-source",
":core_mvn-docs", ":core_mvn-docs",
":core_mvn-maven-source",
":core_mvn-pom",
":core_mvn-project", ":core_mvn-project",
":lite_mvn-pom",
":lite_mvn-maven-source",
":lite_mvn-docs", ":lite_mvn-docs",
":lite_mvn-maven-source",
":lite_mvn-pom",
":lite_mvn-project", ":lite_mvn-project",
] ],
visibility = ["//java:__pkg__"],
) )
proto_lang_toolchain( proto_lang_toolchain(
@ -222,22 +222,22 @@ java_library(
name = "test_util", name = "test_util",
srcs = [ srcs = [
"src/test/java/com/google/protobuf/TestUtil.java", "src/test/java/com/google/protobuf/TestUtil.java",
"src/test/java/com/google/protobuf/TestUtilLite.java" "src/test/java/com/google/protobuf/TestUtilLite.java",
], ],
deps = [ deps = [
":core", ":core",
":generic_test_protos_java_proto", ":generic_test_protos_java_proto",
":java_test_protos_java_proto", ":java_test_protos_java_proto",
"//external:guava", "@maven//:com_google_guava_guava",
"//external:junit", "@maven//:junit_junit",
], ],
) )
test_suite( test_suite(
name = "tests", name = "tests",
tests = [ tests = [
"core_build_test",
"conformance_test", "conformance_test",
"core_build_test",
"core_tests", "core_tests",
], ],
) )
@ -251,29 +251,32 @@ build_test(
conformance_test( conformance_test(
name = "conformance_test", name = "conformance_test",
testee = "//:conformance_java",
failure_list = "//:conformance/failure_list_java.txt", failure_list = "//:conformance/failure_list_java.txt",
testee = "//:conformance_java",
text_format_failure_list = "//:conformance/text_format_failure_list_java.txt", text_format_failure_list = "//:conformance/text_format_failure_list_java.txt",
) )
junit_tests( junit_tests(
name = "core_tests", name = "core_tests",
srcs = glob(["src/test/java/**/*.java"], exclude = [
"src/test/java/com/google/protobuf/TestUtil.java",
"src/test/java/com/google/protobuf/TestUtilLite.java",
]),
data = ["//:testdata"],
size = "large", size = "large",
srcs = glob(
["src/test/java/**/*.java"],
exclude = [
"src/test/java/com/google/protobuf/TestUtil.java",
"src/test/java/com/google/protobuf/TestUtilLite.java",
],
),
data = ["//:testdata"],
deps = [ deps = [
":core", ":core",
":generic_test_protos_java_proto", ":generic_test_protos_java_proto",
":java_test_protos_java_proto", ":java_test_protos_java_proto",
":test_util", ":test_util",
"//external:easymock", "@maven//:com_google_guava_guava",
"//external:guava", "@maven//:com_google_truth_truth",
"//external:junit", "@maven//:junit_junit",
"//external:truth", "@maven//:org_easymock_easymock",
] ],
) )
java_lite_proto_library( java_lite_proto_library(
@ -296,17 +299,17 @@ genrule(
name = "rewrite_javalite_test_util", name = "rewrite_javalite_test_util",
srcs = [ srcs = [
"//java/lite:lite.awk", "//java/lite:lite.awk",
"src/test/java/com/google/protobuf/TestUtil.java" "src/test/java/com/google/protobuf/TestUtil.java",
], ],
outs = ["TestUtil.java"], outs = ["TestUtil.java"],
cmd = "awk -f $(location //java/lite:lite.awk) $(location src/test/java/com/google/protobuf/TestUtil.java) > $@" cmd = "awk -f $(location //java/lite:lite.awk) $(location src/test/java/com/google/protobuf/TestUtil.java) > $@",
) )
java_library( java_library(
name = "test_util_lite", name = "test_util_lite",
srcs = [ srcs = [
"src/test/java/com/google/protobuf/TestUtilLite.java",
":rewrite_javalite_test_util", ":rewrite_javalite_test_util",
"src/test/java/com/google/protobuf/TestUtilLite.java"
], ],
visibility = [ visibility = [
"//java/lite:__pkg__", "//java/lite:__pkg__",
@ -315,8 +318,8 @@ java_library(
":generic_test_protos_java_proto_lite", ":generic_test_protos_java_proto_lite",
":java_test_protos_java_proto_lite", ":java_test_protos_java_proto_lite",
":lite_runtime_only", ":lite_runtime_only",
"//external:guava", "@maven//:com_google_guava_guava",
"//external:junit", "@maven//:junit_junit",
], ],
) )
@ -365,18 +368,20 @@ LITE_TEST_EXCLUSIONS = [
junit_tests( junit_tests(
name = "lite_tests", name = "lite_tests",
srcs = glob(["src/test/java/**/*.java"], exclude = LITE_TEST_EXCLUSIONS), size = "large",
srcs = glob(
["src/test/java/**/*.java"],
exclude = LITE_TEST_EXCLUSIONS,
),
data = ["//:testdata"], data = ["//:testdata"],
test_prefix = "Lite", test_prefix = "Lite",
size = "large",
deps = [ deps = [
":lite",
":generic_test_protos_java_proto_lite", ":generic_test_protos_java_proto_lite",
":java_test_protos_java_proto_lite", ":java_test_protos_java_proto_lite",
":lite",
":test_util_lite", ":test_util_lite",
"//external:easymock", "@maven//:com_google_truth_truth",
"//external:junit", "@maven//:junit_junit",
"//external:truth", "@maven//:org_easymock_easymock",
] ],
) )

2
java/core/pom.xml
Unescape View File

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

2
java/kotlin-lite/pom.xml
Unescape View File

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

2
java/kotlin/pom.xml
Unescape View File

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

2
java/lite.md
Unescape View File

@ -30,7 +30,7 @@ protobuf Java runtime. If you are using Maven, use the following:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>
<version>3.19.0</version> <version>3.19.1</version>
</dependency> </dependency>
``` ```

21
java/lite/BUILD
Unescape View File

@ -3,8 +3,15 @@ load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain")
load("//:internal.bzl", "conformance_test") load("//:internal.bzl", "conformance_test")
load("//java/internal:testing.bzl", "junit_tests") load("//java/internal:testing.bzl", "junit_tests")
exports_files(["lite.awk"], visibility = ["//java/core:__pkg__"]) exports_files(
exports_files(["pom_template.xml"], visibility = ["//java/core:__pkg__"]) ["lite.awk"],
visibility = ["//java/core:__pkg__"],
)
exports_files(
["pom_template.xml"],
visibility = ["//java/core:__pkg__"],
)
alias( alias(
name = "lite", name = "lite",
@ -35,8 +42,8 @@ proto_lang_toolchain(
test_suite( test_suite(
name = "tests", name = "tests",
tests = [ tests = [
"lite_build_test",
"conformance_test", "conformance_test",
"lite_build_test",
"lite_tests", "lite_tests",
"//java/core:lite_tests", "//java/core:lite_tests",
], ],
@ -51,21 +58,21 @@ build_test(
conformance_test( conformance_test(
name = "conformance_test", name = "conformance_test",
testee = "//:conformance_java_lite",
failure_list = "//:conformance/failure_list_java_lite.txt", failure_list = "//:conformance/failure_list_java_lite.txt",
testee = "//:conformance_java_lite",
text_format_failure_list = "//:conformance/text_format_failure_list_java_lite.txt", text_format_failure_list = "//:conformance/text_format_failure_list_java_lite.txt",
) )
junit_tests( junit_tests(
name = "lite_tests", name = "lite_tests",
srcs = glob(["src/test/**/*.java"]),
size = "small", size = "small",
srcs = glob(["src/test/**/*.java"]),
deps = [ deps = [
":lite", ":lite",
"//external:junit",
"//external:truth",
"//java/core:generic_test_protos_java_proto_lite", "//java/core:generic_test_protos_java_proto_lite",
"//java/core:java_test_protos_java_proto_lite", "//java/core:java_test_protos_java_proto_lite",
"//java/core:test_util_lite", "//java/core:test_util_lite",
"@maven//:com_google_truth_truth",
"@maven//:junit_junit",
], ],
) )

2
java/lite/pom.xml
Unescape View File

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

2
java/pom.xml
Unescape View File

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

29
java/util/BUILD
Unescape View File

@ -11,33 +11,34 @@ java_library(
]), ]),
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
"//external:error_prone_annotations",
"//external:j2objc_annotations",
"//external:gson",
"//external:jsr305",
"//external:guava",
"//java/core", "//java/core",
"//java/lite", "//java/lite",
"@maven//:com_google_code_findbugs_jsr305",
"@maven//:com_google_code_gson_gson",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_j2objc_j2objc_annotations",
], ],
) )
# Bazel users, don't depend on this target, use :util. # Bazel users, don't depend on this target, use :util.
java_export( java_export(
name = "util_mvn", name = "util_mvn",
maven_coordinates = "com.google.protobuf:protobuf-java-util:%s" % PROTOBUF_VERSION, maven_coordinates = "com.google.protobuf:protobuf-java-util:%s" % PROTOBUF_VERSION,
pom_template = "pom_template.xml", pom_template = "pom_template.xml",
runtime_deps = [":util"],
visibility = ["//java:__pkg__"], visibility = ["//java:__pkg__"],
runtime_deps = [":util"],
) )
filegroup( filegroup(
name = "release", name = "release",
visibility = ["//java:__pkg__"],
srcs = [ srcs = [
":util_mvn-pom",
":util_mvn-maven-source",
":util_mvn-docs", ":util_mvn-docs",
":util_mvn-maven-source",
":util_mvn-pom",
":util_mvn-project", ":util_mvn-project",
] ],
visibility = ["//java:__pkg__"],
) )
proto_library( proto_library(
@ -60,15 +61,15 @@ java_proto_library(
junit_tests( junit_tests(
name = "tests", name = "tests",
srcs = glob(["src/test/java/**/*.java"]),
package_name = "com.google.protobuf.util", package_name = "com.google.protobuf.util",
srcs = glob(["src/test/java/**/*.java"]),
deps = [ deps = [
":test_protos_java_proto", ":test_protos_java_proto",
":util", ":util",
"//external:guava",
"//external:junit",
"//external:truth",
"//java/core", "//java/core",
"//java/core:generic_test_protos_java_proto", "//java/core:generic_test_protos_java_proto",
"@maven//:com_google_guava_guava",
"@maven//:com_google_truth_truth",
"@maven//:junit_junit",
], ],
) )

2
java/util/pom.xml
Unescape View File

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

2
js/package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "google-protobuf", "name": "google-protobuf",
"version": "3.19.0", "version": "3.19.1",
"description": "Protocol Buffers for JavaScript", "description": "Protocol Buffers for JavaScript",
"main": "google-protobuf.js", "main": "google-protobuf.js",
"files": [ "files": [

27
php/ext/google/protobuf/package.xml
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<package packagerversion="1.9.5" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd"> <package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.5" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
<name>protobuf</name> <name>protobuf</name>
<channel>pecl.php.net</channel> <channel>pecl.php.net</channel>
<summary>Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.</summary> <summary>Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.</summary>
@ -10,11 +10,11 @@
<email>protobuf-opensource@google.com</email> <email>protobuf-opensource@google.com</email>
<active>yes</active> <active>yes</active>
</lead> </lead>
<date>2021-10-19</date> <date>2021-10-28</date>
<time>11:06:24</time> <time>20:01:12</time>
<version> <version>
<release>3.19.0</release> <release>3.19.1</release>
<api>3.19.0</api> <api>3.19.1</api>
</version> </version>
<stability> <stability>
<release>stable</release> <release>stable</release>
@ -22,7 +22,7 @@
</stability> </stability>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license> <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes> <notes>
* Added &quot;object&quot; as a reserved name (#8962) * No new changes in 3.19.1
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="/" name="/"> <dir baseinstalldir="/" name="/">
@ -1143,5 +1143,20 @@ G A release.
<notes> <notes>
</notes> </notes>
</release> </release>
<release>
<version>
<release>3.19.1</release>
<api>3.19.1</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<date>2021-10-28</date>
<time>20:01:12</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes>
</notes>
</release>
</changelog> </changelog>
</package> </package>

2
php/ext/google/protobuf/protobuf.h
Unescape View File

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

13
protobuf_deps.bzl
Unescape View File

@ -2,6 +2,17 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
PROTOBUF_MAVEN_ARTIFACTS = [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.code.gson:gson:2.8.6",
"com.google.errorprone:error_prone_annotations:2.3.2",
"com.google.j2objc:j2objc-annotations:1.3",
"com.google.guava:guava:30.1.1-jre",
"com.google.truth:truth:1.1.2",
"junit:junit:4.12",
"org.easymock:easymock:3.2",
]
def protobuf_deps(): def protobuf_deps():
"""Loads common dependencies needed to compile the protobuf library.""" """Loads common dependencies needed to compile the protobuf library."""
@ -56,7 +67,7 @@ def protobuf_deps():
) )
if not native.existing_rule("rules_jvm_external"): if not native.existing_rule("rules_jvm_external"):
http_archive( http_archive(
name = "rules_jvm_external", name = "rules_jvm_external",
sha256 = "f36441aa876c4f6427bfb2d1f2d723b48e9d930b62662bf723ddfb8fc80f0140", sha256 = "f36441aa876c4f6427bfb2d1f2d723b48e9d930b62662bf723ddfb8fc80f0140",
strip_prefix = "rules_jvm_external-4.1", strip_prefix = "rules_jvm_external-4.1",

2
protobuf_version.bzl
Unescape View File

@ -1 +1 @@
PROTOBUF_VERSION = '3.19.0' PROTOBUF_VERSION = '3.19.1'

2
protoc-artifacts/pom.xml
Unescape View File

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

2
python/google/protobuf/__init__.py
Unescape View File

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

2
ruby/google-protobuf.gemspec
Unescape View File

@ -1,6 +1,6 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "google-protobuf" s.name = "google-protobuf"
s.version = "3.19.0" s.version = "3.19.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 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.licenses = ["BSD-3-Clause"]
s.summary = "Protocol Buffers" s.summary = "Protocol Buffers"

4
ruby/pom.xml
Unescape View File

@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId> <groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId> <artifactId>protobuf-jruby</artifactId>
<version>3.19.0</version> <version>3.19.1</version>
<name>Protocol Buffer JRuby native extension</name> <name>Protocol Buffer JRuby native extension</name>
<description> <description>
Protocol Buffers are a way of encoding structured data in an efficient yet Protocol Buffers are a way of encoding structured data in an efficient yet
@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>
<version>3.19.0</version> <version>3.19.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jruby</groupId> <groupId>org.jruby</groupId>

2
src/Makefile.am
Unescape View File

@ -18,7 +18,7 @@ else
PTHREAD_DEF = PTHREAD_DEF =
endif endif
PROTOBUF_VERSION = 30:0:0 PROTOBUF_VERSION = 30:1:0
if GCC if GCC
# Turn on all warnings except for sign comparison (we ignore sign comparison # Turn on all warnings except for sign comparison (we ignore sign comparison

2
src/google/protobuf/any.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/api.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/compiler/plugin.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/descriptor.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/duration.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/empty.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/field_mask.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/port_def.inc
Unescape View File

@ -153,7 +153,7 @@
#ifdef PROTOBUF_VERSION #ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined #error PROTOBUF_VERSION was previously defined
#endif #endif
#define PROTOBUF_VERSION 3019000 #define PROTOBUF_VERSION 3019001
#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined

2
src/google/protobuf/source_context.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/struct.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/stubs/common.h
Unescape View File

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

2
src/google/protobuf/timestamp.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/type.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

2
src/google/protobuf/wrappers.pb.h
Unescape View File

@ -13,7 +13,7 @@
#error incompatible with your Protocol Buffer headers. Please update #error incompatible with your Protocol Buffer headers. Please update
#error your headers. #error your headers.
#endif #endif
#if 3019000 < PROTOBUF_MIN_PROTOC_VERSION #if 3019001 < PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is #error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please #error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc. #error regenerate this file with a newer version of protoc.

Write Preview
Loading…
Cancel
Save