From 7b0ca6995da9c895ac1ca0005b705fa01f009b7f Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Mon, 12 Dec 2022 12:21:15 -0800 Subject: [PATCH 01/14] Updated release branch to latest upb. (#11258) * Updated release branch to latest upb. * Updated amalgamated files. --- php/ext/google/protobuf/php-upb.c | 5 ++--- protobuf_deps.bzl | 4 ++-- ruby/ext/google/protobuf_c/ruby-upb.c | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index 602509a64a4a..7ccb94614317 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c @@ -6143,7 +6143,6 @@ upb_EnumReservedRange* _upb_EnumReservedRanges_New( google_protobuf_EnumDescriptorProto_EnumReservedRange_start(protos[i]); const int32_t end = google_protobuf_EnumDescriptorProto_EnumReservedRange_end(protos[i]); - const int32_t max = kUpb_MaxFieldNumber + 1; // A full validation would also check that each range is disjoint, and that // none of the fields overlap with the extension ranges, but we are just @@ -6151,7 +6150,7 @@ upb_EnumReservedRange* _upb_EnumReservedRanges_New( // Note: Not a typo! Unlike extension ranges and message reserved ranges, // the end value of an enum reserved range is *inclusive*! - if (start < 1 || end < start || end > max) { + if (end < start) { symtab_errf(ctx, "Reserved range (%d, %d) is invalid, enum=%s\n", (int)start, (int)end, upb_EnumDef_FullName(e)); } @@ -8184,7 +8183,7 @@ static void create_fielddef( CHK_OOM( upb_strtable_insert(&oneof->ntof, name.data, name.size, v, ctx->arena)); } else { - if (f->proto3_optional_) { + if (f->proto3_optional_ && !is_extension) { symtab_errf(ctx, "field with proto3_optional was not in a oneof (%s)", f->full_name); } diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl index 6aee8b76dd5b..0949ef370a07 100644 --- a/protobuf_deps.bzl +++ b/protobuf_deps.bzl @@ -117,6 +117,6 @@ def protobuf_deps(): _github_archive( name = "upb", repo = "https://github.com/protocolbuffers/upb", - commit = "969f6fdb88e94ced87953e53716893c68ec7b1ce", - sha256 = "6754b7f95c92f69a832a82931aea40d066cc689dbc1eb3348b84c1ed95285296", + commit = "20b542a767139732548f7b8cf28c4c928cdcb07b", + sha256 = "c77158955326f9e9a0cf8481c118b8ad5c34df99e5db3af27f3d1662d8bedef7", ) diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index 85b1d0f2ffe2..3d3c35be9318 100755 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c @@ -5814,7 +5814,6 @@ upb_EnumReservedRange* _upb_EnumReservedRanges_New( google_protobuf_EnumDescriptorProto_EnumReservedRange_start(protos[i]); const int32_t end = google_protobuf_EnumDescriptorProto_EnumReservedRange_end(protos[i]); - const int32_t max = kUpb_MaxFieldNumber + 1; // A full validation would also check that each range is disjoint, and that // none of the fields overlap with the extension ranges, but we are just @@ -5822,7 +5821,7 @@ upb_EnumReservedRange* _upb_EnumReservedRanges_New( // Note: Not a typo! Unlike extension ranges and message reserved ranges, // the end value of an enum reserved range is *inclusive*! - if (start < 1 || end < start || end > max) { + if (end < start) { symtab_errf(ctx, "Reserved range (%d, %d) is invalid, enum=%s\n", (int)start, (int)end, upb_EnumDef_FullName(e)); } @@ -7855,7 +7854,7 @@ static void create_fielddef( CHK_OOM( upb_strtable_insert(&oneof->ntof, name.data, name.size, v, ctx->arena)); } else { - if (f->proto3_optional_) { + if (f->proto3_optional_ && !is_extension) { symtab_errf(ctx, "field with proto3_optional was not in a oneof (%s)", f->full_name); } From f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Mon, 12 Dec 2022 16:03:12 -0800 Subject: [PATCH 02/14] Updating version.json and repo version numbers to: 21.12 --- Protobuf-C++.podspec | 2 +- Protobuf.podspec | 2 +- configure.ac | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../Google.Protobuf/Google.Protobuf.csproj | 2 +- java/README.md | 6 +++--- java/bom/pom.xml | 2 +- java/core/pom.xml | 2 +- java/kotlin-lite/pom.xml | 2 +- java/kotlin/pom.xml | 2 +- java/lite.md | 2 +- java/lite/pom.xml | 2 +- java/pom.xml | 2 +- java/util/pom.xml | 2 +- php/ext/google/protobuf/protobuf.h | 2 +- protobuf_version.bzl | 8 ++++---- protoc-artifacts/pom.xml | 2 +- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- ruby/pom.xml | 4 ++-- src/Makefile.am | 2 +- src/google/protobuf/any.pb.h | 2 +- src/google/protobuf/api.pb.h | 2 +- src/google/protobuf/compiler/plugin.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 +++++++++---------- 36 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index 0c61573c4a5c..43a32132d008 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '3.21.11' + s.version = '3.21.12' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = 'BSD-3-Clause' diff --git a/Protobuf.podspec b/Protobuf.podspec index 9f9df1577cc7..ebb533d2f49f 100644 --- a/Protobuf.podspec +++ b/Protobuf.podspec @@ -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.11' + s.version = '3.21.12' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = 'BSD-3-Clause' diff --git a/configure.ac b/configure.ac index 517b49722208..7243fd3118e9 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ(2.59) # 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 # the size of one file name in the dist tarfile over the 99-char limit.) -AC_INIT([Protocol Buffers],[3.21.11],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.21.12],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec index 8f1bf8bbcf4d..d74008a1c048 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ Google Protocol Buffers tools Tools for Protocol Buffers - Google's data interchange format. See project site for more info. - 3.21.11 + 3.21.12 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/main/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index 8ebc31e91c16..3c42b9e92aab 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -4,7 +4,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.21.11 + 3.21.12 7.2 Google Inc. diff --git a/java/README.md b/java/README.md index 1b0ac91b5cbc..5df8114b7d7e 100644 --- a/java/README.md +++ b/java/README.md @@ -23,7 +23,7 @@ If you are using Maven, use the following: com.google.protobuf protobuf-java - 3.21.11 + 3.21.12 ``` @@ -37,7 +37,7 @@ protobuf-java-util package: com.google.protobuf protobuf-java-util - 3.21.11 + 3.21.12 ``` @@ -45,7 +45,7 @@ protobuf-java-util package: If you are using Gradle, add the following to your `build.gradle` file's dependencies: ``` - implementation 'com.google.protobuf:protobuf-java:3.21.11' + 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. diff --git a/java/bom/pom.xml b/java/bom/pom.xml index eaec5aaf5505..31816764bf32 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.21.11 + 3.21.12 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 79e75c9a81af..83b7351f7ec9 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.11 + 3.21.12 protobuf-java diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index 18a134c7024b..50dcc8340b34 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.11 + 3.21.12 protobuf-kotlin-lite diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index ab24dda0877c..9cc9ea03233b 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.11 + 3.21.12 protobuf-kotlin diff --git a/java/lite.md b/java/lite.md index 9a6adcb861bb..ad920792f3f9 100644 --- a/java/lite.md +++ b/java/lite.md @@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following: com.google.protobuf protobuf-javalite - 3.21.11 + 3.21.12 ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index e3941186079c..367cd7aa598a 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.11 + 3.21.12 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index 16c6715ec2d9..863d07f86923 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.11 + 3.21.12 pom Protocol Buffers [Parent] diff --git a/java/util/pom.xml b/java/util/pom.xml index 05f7b97c7e24..c13df651c8e0 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.21.11 + 3.21.12 protobuf-java-util diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index 616ab6856661..efbd45eac052 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -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.11" +#define PHP_PROTOBUF_VERSION "3.21.12" // ptr -> PHP object cache. This is a weak map that caches lazily-created // wrapper objects around upb types: diff --git a/protobuf_version.bzl b/protobuf_version.bzl index 20c85778136b..4ac031cb3b04 100644 --- a/protobuf_version.bzl +++ b/protobuf_version.bzl @@ -1,4 +1,4 @@ -PROTOC_VERSION = "21.11" -PROTOBUF_JAVA_VERSION = "3.21.11" -PROTOBUF_PYTHON_VERSION = "4.21.11" -PROTOBUF_PHP_VERSION = "3.21.11" +PROTOC_VERSION = "21.12" +PROTOBUF_JAVA_VERSION = "3.21.12" +PROTOBUF_PYTHON_VERSION = "4.21.12" +PROTOBUF_PHP_VERSION = "3.21.12" diff --git a/protoc-artifacts/pom.xml b/protoc-artifacts/pom.xml index af9b177d380f..9d4c7f24f572 100644 --- a/protoc-artifacts/pom.xml +++ b/protoc-artifacts/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.21.11 + 3.21.12 pom Protobuf Compiler diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index 7c66e4e2074e..e7555ee1010f 100644 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,4 +30,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '4.21.11' +__version__ = '4.21.12' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index dbfb04d7a164..a925fdcd0405 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.21.11" + s.version = "3.21.12" 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" diff --git a/ruby/pom.xml b/ruby/pom.xml index 537a504446fb..68dadacfb0a7 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 3.21.11 + 3.21.12 Protocol Buffer JRuby native extension Protocol Buffers are a way of encoding structured data in an efficient yet @@ -76,7 +76,7 @@ com.google.protobuf protobuf-java-util - 3.21.11 + 3.21.12 org.jruby diff --git a/src/Makefile.am b/src/Makefile.am index c5087f57e34a..f48f7d44df12 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ else PTHREAD_DEF = endif -PROTOBUF_VERSION = 32:11:0 +PROTOBUF_VERSION = 32:12:0 if GCC # Turn on all warnings except for sign comparison (we ignore sign comparison diff --git a/src/google/protobuf/any.pb.h b/src/google/protobuf/any.pb.h index c35eaddaeb12..2c0605267c1a 100644 --- a/src/google/protobuf/any.pb.h +++ b/src/google/protobuf/any.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h index 36f480c83dd8..2c4548920ba3 100644 --- a/src/google/protobuf/api.pb.h +++ b/src/google/protobuf/api.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 0c3c5b4e0ca1..5f3fa52cd1ff 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h index f40e96654310..9ae046ab1114 100644 --- a/src/google/protobuf/descriptor.pb.h +++ b/src/google/protobuf/descriptor.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h index 0794e0af763f..a5272c811485 100644 --- a/src/google/protobuf/duration.pb.h +++ b/src/google/protobuf/duration.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index 1dfbb1d2a055..bcb647863e61 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/field_mask.pb.h b/src/google/protobuf/field_mask.pb.h index 27cbd7fab16e..8f90e4c04fd7 100644 --- a/src/google/protobuf/field_mask.pb.h +++ b/src/google/protobuf/field_mask.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 2680acdbd56f..6c6aa1834b0c 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -178,7 +178,7 @@ #ifdef PROTOBUF_VERSION #error PROTOBUF_VERSION was previously defined #endif -#define PROTOBUF_VERSION 3021011 +#define PROTOBUF_VERSION 3021012 #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined diff --git a/src/google/protobuf/source_context.pb.h b/src/google/protobuf/source_context.pb.h index 833c1e735d39..63e7d113cd3c 100644 --- a/src/google/protobuf/source_context.pb.h +++ b/src/google/protobuf/source_context.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index 57e955c84efb..002aa85dc173 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index c4e6f48fdfc2..0b9fa812dac5 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -82,7 +82,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 3021011 +#define GOOGLE_PROTOBUF_VERSION 3021012 // A suffix string for alpha, beta or rc releases. Empty for stable releases. #define GOOGLE_PROTOBUF_VERSION_SUFFIX "" diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 44c53e97de26..540194bc8e36 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index f152a8d95b7a..cb8105a42370 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/src/google/protobuf/wrappers.pb.h b/src/google/protobuf/wrappers.pb.h index 4270adfafa2f..0f4b8350b2d3 100644 --- a/src/google/protobuf/wrappers.pb.h +++ b/src/google/protobuf/wrappers.pb.h @@ -13,7 +13,7 @@ #error incompatible with your Protocol Buffer headers. Please update #error your headers. #endif -#if 3021011 < PROTOBUF_MIN_PROTOC_VERSION +#if 3021012 < 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. diff --git a/version.json b/version.json index d134b24033c4..fad4094f3987 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "21.x": { - "protoc_version": "21.12-dev", + "protoc_version": "21.12", "lts": false, - "date": "2022-12-08", + "date": "2022-12-12", "languages": { - "cpp": "3.21.12-dev", - "csharp": "3.21.12-dev", - "java": "3.21.12-dev", - "javascript": "3.21.12-dev", - "objectivec": "3.21.12-dev", - "php": "3.21.12-dev", - "python": "4.21.12-dev", - "ruby": "3.21.12-dev" + "cpp": "3.21.12", + "csharp": "3.21.12", + "java": "3.21.12", + "javascript": "3.21.12", + "objectivec": "3.21.12", + "php": "3.21.12", + "python": "4.21.12", + "ruby": "3.21.12" } } } \ No newline at end of file From f4afdc712ee8e8d734516c9d411ed0c0ab608dd9 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 13 Dec 2022 11:23:52 -0800 Subject: [PATCH 03/14] cherry-pick: kokoro git config --- kokoro/release/collect_all_artifacts.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/kokoro/release/collect_all_artifacts.sh b/kokoro/release/collect_all_artifacts.sh index 6e0d1524081d..49249d758f2b 100755 --- a/kokoro/release/collect_all_artifacts.sh +++ b/kokoro/release/collect_all_artifacts.sh @@ -6,6 +6,7 @@ set -ex cd $(dirname $0)/../.. # Initialize any submodules. +git config --global --add safe.directory '*' git submodule update --init --recursive # The directory with all resulting artifacts From d9c9fc74542f1f41286502b2d82d43c036f092ae Mon Sep 17 00:00:00 2001 From: Matt Kulukundis Date: Tue, 13 Dec 2022 17:07:15 -0500 Subject: [PATCH 04/14] Updating changelog --- CHANGES.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index cf6a74db8f2c..5dd6f2ea7c93 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,11 @@ +2022-12-13 version 21.12 (C++/Java/Python/PHP/Objective-C/C#/Ruby) + + Python + * Fix broken enum ranges (#11171) + * Stop requiring extension fields to have a sythetic oneof (#11091) + * Python runtime 4.21.10 not works generated code can not load valid proto. + (#11171) + 2022-12-07 version 21.11 (C++/Java/Python/PHP/Objective-C/C#/Ruby) Python * Add license file to pypi wheels (#10936) From 9de5cdda66789debd24557a9fc6fb847af99c13a Mon Sep 17 00:00:00 2001 From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com> Date: Thu, 15 Dec 2022 10:02:46 -0800 Subject: [PATCH 05/14] Point python setup to zlib after mac update (#11315) * Manually install zlib after mac update * Point pyenv at homebrew's zlib --- kokoro/macos/prepare_build_macos_rc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc index 7a150c79fbf2..d9677e966b43 100755 --- a/kokoro/macos/prepare_build_macos_rc +++ b/kokoro/macos/prepare_build_macos_rc @@ -26,7 +26,6 @@ export CXX=g++ ## # Install Python 2 by default - eval "$(pyenv init -)" pyenv install -v -s 2.7.18 && pyenv global 2.7.18 @@ -34,6 +33,9 @@ pyenv install -v -s 2.7.18 && pyenv global 2.7.18 # Install Tox if [[ "${KOKORO_INSTALL_TOX:-}" == "yes" ]] ; then + # pyenv needs to be directed towards its dependencies. + CFLAGS="-I$(brew --prefix zlib)/include" \ + LDFLAGS="-L$(brew --prefix zlib)/lib" \ pyenv install -v -s 3.7.13 pyenv global 3.7.13 sudo python -m pip install --upgrade pip 'tox==3.27.1' tox-pyenv From 4d991033c365f3a145dd2164a5a71f67bf995af9 Mon Sep 17 00:00:00 2001 From: Matt Kulukundis Date: Fri, 16 Dec 2022 12:22:20 -0500 Subject: [PATCH 06/14] Update version.json to: 21.13-dev --- version.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/version.json b/version.json index fad4094f3987..27f5e4899026 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "21.x": { - "protoc_version": "21.12", + "protoc_version": "21.13-dev", "lts": false, - "date": "2022-12-12", + "date": "2022-12-16", "languages": { - "cpp": "3.21.12", - "csharp": "3.21.12", - "java": "3.21.12", - "javascript": "3.21.12", - "objectivec": "3.21.12", - "php": "3.21.12", - "python": "4.21.12", - "ruby": "3.21.12" + "cpp": "3.21.13-dev", + "csharp": "3.21.13-dev", + "java": "3.21.13-dev", + "javascript": "3.21.13-dev", + "objectivec": "3.21.13-dev", + "php": "3.21.13-dev", + "python": "4.21.13-dev", + "ruby": "3.21.13-dev" } } } \ No newline at end of file From a677d9033f00e16adf172611b99071f99e1fd782 Mon Sep 17 00:00:00 2001 From: Jie Luo Date: Thu, 22 Dec 2022 12:59:55 -0800 Subject: [PATCH 07/14] Add use_bazel.sh 5.1.1 to ruby/python build (#11389) pin Bazel version to an older stable one (5.1.1) --- kokoro/release/python/macos/build_artifacts.sh | 3 +++ kokoro/release/python/macos/continuous.cfg | 2 ++ kokoro/release/python/macos/presubmit.cfg | 2 ++ kokoro/release/python/macos/release.cfg | 2 ++ kokoro/release/ruby/macos/build_artifacts.sh | 5 ++++- kokoro/release/ruby/macos/continuous.cfg | 2 ++ kokoro/release/ruby/macos/presubmit.cfg | 2 ++ kokoro/release/ruby/macos/release.cfg | 2 ++ 8 files changed, 19 insertions(+), 1 deletion(-) diff --git a/kokoro/release/python/macos/build_artifacts.sh b/kokoro/release/python/macos/build_artifacts.sh index d79d2f6b40d2..15ac5dc8934d 100755 --- a/kokoro/release/python/macos/build_artifacts.sh +++ b/kokoro/release/python/macos/build_artifacts.sh @@ -8,6 +8,9 @@ brew uninstall -f protobuf # change to repo root pushd $(dirname $0)/../../../.. +chmod ugo+x ${KOKORO_GFILE_DIR}/use_bazel.sh +${KOKORO_GFILE_DIR}/use_bazel.sh 5.1.1 + # Create stage dir ORIGINAL_DIR=`pwd` pushd .. diff --git a/kokoro/release/python/macos/continuous.cfg b/kokoro/release/python/macos/continuous.cfg index 85cf81b507f4..95f32358e0a4 100644 --- a/kokoro/release/python/macos/continuous.cfg +++ b/kokoro/release/python/macos/continuous.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" diff --git a/kokoro/release/python/macos/presubmit.cfg b/kokoro/release/python/macos/presubmit.cfg index 85cf81b507f4..95f32358e0a4 100644 --- a/kokoro/release/python/macos/presubmit.cfg +++ b/kokoro/release/python/macos/presubmit.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" diff --git a/kokoro/release/python/macos/release.cfg b/kokoro/release/python/macos/release.cfg index 85cf81b507f4..95f32358e0a4 100644 --- a/kokoro/release/python/macos/release.cfg +++ b/kokoro/release/python/macos/release.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" diff --git a/kokoro/release/ruby/macos/build_artifacts.sh b/kokoro/release/ruby/macos/build_artifacts.sh index a109d45b6166..2d3424b07643 100755 --- a/kokoro/release/ruby/macos/build_artifacts.sh +++ b/kokoro/release/ruby/macos/build_artifacts.sh @@ -1,10 +1,13 @@ #!/bin/bash set -ex - + # change to repo root cd $(dirname $0)/../../../.. +chmod ugo+x ${KOKORO_GFILE_DIR}/use_bazel.sh +${KOKORO_GFILE_DIR}/use_bazel.sh 5.1.1 + # all artifacts come here mkdir artifacts export ARTIFACT_DIR=$(pwd)/artifacts diff --git a/kokoro/release/ruby/macos/continuous.cfg b/kokoro/release/ruby/macos/continuous.cfg index cb1c08bb8827..6b285cd3d9a0 100644 --- a/kokoro/release/ruby/macos/continuous.cfg +++ b/kokoro/release/ruby/macos/continuous.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" diff --git a/kokoro/release/ruby/macos/presubmit.cfg b/kokoro/release/ruby/macos/presubmit.cfg index cb1c08bb8827..6b285cd3d9a0 100644 --- a/kokoro/release/ruby/macos/presubmit.cfg +++ b/kokoro/release/ruby/macos/presubmit.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" diff --git a/kokoro/release/ruby/macos/release.cfg b/kokoro/release/ruby/macos/release.cfg index cb1c08bb8827..6b285cd3d9a0 100644 --- a/kokoro/release/ruby/macos/release.cfg +++ b/kokoro/release/ruby/macos/release.cfg @@ -6,3 +6,5 @@ action { regex: "github/protobuf/artifacts/**" } } + +gfile_resources: "/google_src/files/head/depot/google3/devtools/kokoro/vanadium/linux_scripts/usr/local/bin/use_bazel.sh" From fd2b04619b36017f740c4ca5dba587ef45cefa7c Mon Sep 17 00:00:00 2001 From: deannagarcia <69992229+deannagarcia@users.noreply.github.com> Date: Tue, 27 Dec 2022 13:51:05 -0800 Subject: [PATCH 08/14] Pin ruby bundler The newest bundler has EOL'd ruby 2.5, so we must pin to an older version. --- kokoro/release/ruby/macos/ruby/ruby_build_environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh index 29066427f228..41d37226cc5e 100755 --- a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh +++ b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh @@ -21,7 +21,7 @@ set -e # rvm commands are very verbose time rvm install 2.5.0 rvm use 2.5.0 gem install rake-compiler --no-document -gem install bundler --no-document +gem install bundler -v 2.3.26 --no-document time rvm install 3.1.0 rvm use 3.1.0 gem install rake-compiler --no-document From 4d107081f2ee428063923c0aeca032d47e8967b1 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Tue, 27 Dec 2022 23:13:53 +0000 Subject: [PATCH 09/14] Pin bundler in travis test --- ruby/travis-test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruby/travis-test.sh b/ruby/travis-test.sh index f7fa8155ec56..141211b32f3d 100755 --- a/ruby/travis-test.sh +++ b/ruby/travis-test.sh @@ -13,7 +13,8 @@ test_version() { "rvm install $version && rvm use $version && rvm get head && \ which ruby && \ git clean -f && \ - gem install --no-document bundler && bundle && \ + gem install --no-document bundler -v 2.3.26 && \ # Pin to bundler with ruby 2.5 + bundle && \ rake test && \ rake gc_test && \ cd ../conformance && make test_jruby && \ From 5e6d1fe3957bb5451b5838430d2e3c77d7646a0a Mon Sep 17 00:00:00 2001 From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com> Date: Tue, 24 Jan 2023 10:15:31 -0800 Subject: [PATCH 10/14] Clean up deprecation message for WKT (#11636) --- BUILD.bazel | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 0f6e41e3abdc..cf277589d105 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -158,8 +158,8 @@ cc_library( # DEPRECATED: Prefer :well_known_type_protos for the Well-Known Types # (https://developers.google.com/protocol-buffers/docs/reference/google.protobuf) -# or :descriptor_proto(_srcs) for descriptor.proto (source), or -# :compiler_plugin_proto for compiler/plugin.proto. +# or :descriptor_proto for descriptor.proto, or :compiler_plugin_proto for +# compiler/plugin.proto. filegroup( name = "well_known_protos", srcs = [ @@ -167,7 +167,8 @@ filegroup( "src/google/protobuf/descriptor.proto", ":well_known_type_protos", ], - deprecation = "Prefer :well_known_type_protos instead.", + deprecation = "Prefer :well_known_type_protos, :compiler_plugin_proto, " + + "and :descriptor_proto instead.", visibility = ["//visibility:public"], ) From cd7f3bd478ca5c0e101109a2f2cc712ce6a7c992 Mon Sep 17 00:00:00 2001 From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com> Date: Wed, 25 Jan 2023 08:33:53 -0800 Subject: [PATCH 11/14] Adding targets for bootstrap proto srcs (#11657) --- BUILD.bazel | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index cf277589d105..663cd3194902 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -158,13 +158,13 @@ cc_library( # DEPRECATED: Prefer :well_known_type_protos for the Well-Known Types # (https://developers.google.com/protocol-buffers/docs/reference/google.protobuf) -# or :descriptor_proto for descriptor.proto, or :compiler_plugin_proto for -# compiler/plugin.proto. +# or :descriptor_proto_srcs for descriptor.proto, or :compiler_plugin_proto_srcs +# for compiler/plugin.proto. filegroup( name = "well_known_protos", srcs = [ - "src/google/protobuf/compiler/plugin.proto", - "src/google/protobuf/descriptor.proto", + ":compiler_plugin_proto_srcs", + ":descriptor_proto_srcs", ":well_known_type_protos", ], deprecation = "Prefer :well_known_type_protos, :compiler_plugin_proto, " + @@ -192,12 +192,24 @@ filegroup( filegroup( name = "built_in_runtime_protos", srcs = [ - "src/google/protobuf/compiler/plugin.proto", - "src/google/protobuf/descriptor.proto", + ":descriptor_proto_srcs", + ":compiler_plugin_proto_srcs", ], visibility = ["//:__subpackages__"], ) +filegroup( + name = "descriptor_proto_srcs", + srcs = ["src/google/protobuf/descriptor.proto"], + visibility = ["//visibility:public"], +) + +filegroup( + name = "compiler_plugin_proto_srcs", + srcs = ["src/google/protobuf/compiler/plugin.proto"], + visibility = ["//visibility:public"], +) + exports_files( srcs = [ "src/google/protobuf/any.proto", @@ -343,7 +355,7 @@ proto_library( proto_library( name = "compiler_plugin_proto", - srcs = ["src/google/protobuf/compiler/plugin.proto"], + srcs = [":compiler_plugin_proto_srcs"], strip_import_prefix = "src", visibility = ["//visibility:public"], deps = ["//:descriptor_proto"], @@ -351,7 +363,7 @@ proto_library( proto_library( name = "descriptor_proto", - srcs = ["src/google/protobuf/descriptor.proto"], + srcs = [":descriptor_proto_srcs"], strip_import_prefix = "src", visibility = ["//visibility:public"], ) From 8e6b5d5303fcdebcd0f1a0859d54f47bc631ea30 Mon Sep 17 00:00:00 2001 From: Jerry Berg <107155935+googleberg@users.noreply.github.com> Date: Fri, 24 Feb 2023 10:03:10 -0700 Subject: [PATCH 12/14] Java fixes for 21.x (#12036) * Fix mutability bug in Java proto lite: sub-messages inside of oneofs were not being set as immutable. This would allow code to get a builder for a sub-message and modify the original (supposedly immutable) copy. PiperOrigin-RevId: 511598810 * Add casts to make protobuf compatible with Java 1.8 runtime. Fix for: https://github.com/protocolbuffers/protobuf/issues/11393 PiperOrigin-RevId: 511807920 * Update Makefile.am --------- Co-authored-by: Protobuf Team Bot --- Makefile.am | 1 + java/core/BUILD.bazel | 1 + .../com/google/protobuf/AllocatedBuffer.java | 2 +- .../com/google/protobuf/BinaryWriter.java | 28 ++++---- .../com/google/protobuf/ByteBufferWriter.java | 2 +- .../google/protobuf/CodedOutputStream.java | 28 ++++---- .../java/com/google/protobuf/Internal.java | 8 ++- .../IterableByteBufferInputStream.java | 4 +- .../google/protobuf/Java8Compatibility.java | 67 +++++++++++++++++++ .../com/google/protobuf/MessageSchema.java | 6 ++ .../com/google/protobuf/NioByteString.java | 11 ++- .../java/com/google/protobuf/TextFormat.java | 2 +- .../main/java/com/google/protobuf/Utf8.java | 10 +-- java/lite/pom.xml | 1 + .../java/com/google/protobuf/LiteTest.java | 24 +++++-- src/google/protobuf/unittest_lite.proto | 1 + 16 files changed, 143 insertions(+), 53 deletions(-) create mode 100644 java/core/src/main/java/com/google/protobuf/Java8Compatibility.java diff --git a/Makefile.am b/Makefile.am index 681cd8c21c91..264842f1c3f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -343,6 +343,7 @@ java_EXTRA_DIST= java/core/src/main/java/com/google/protobuf/Internal.java \ java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \ java/core/src/main/java/com/google/protobuf/IterableByteBufferInputStream.java \ + java/core/src/main/java/com/google/protobuf/Java8Compatibility.java \ java/core/src/main/java/com/google/protobuf/JavaType.java \ java/core/src/main/java/com/google/protobuf/LazyField.java \ java/core/src/main/java/com/google/protobuf/LazyFieldLite.java \ diff --git a/java/core/BUILD.bazel b/java/core/BUILD.bazel index cfd53f42e232..9a0a803621a3 100644 --- a/java/core/BUILD.bazel +++ b/java/core/BUILD.bazel @@ -49,6 +49,7 @@ LITE_SRCS = [ "src/main/java/com/google/protobuf/Internal.java", "src/main/java/com/google/protobuf/InvalidProtocolBufferException.java", "src/main/java/com/google/protobuf/IterableByteBufferInputStream.java", + "src/main/java/com/google/protobuf/Java8Compatibility.java", "src/main/java/com/google/protobuf/JavaType.java", "src/main/java/com/google/protobuf/LazyField.java", "src/main/java/com/google/protobuf/LazyFieldLite.java", diff --git a/java/core/src/main/java/com/google/protobuf/AllocatedBuffer.java b/java/core/src/main/java/com/google/protobuf/AllocatedBuffer.java index 94b09944d1a8..75de57a32ed0 100644 --- a/java/core/src/main/java/com/google/protobuf/AllocatedBuffer.java +++ b/java/core/src/main/java/com/google/protobuf/AllocatedBuffer.java @@ -189,7 +189,7 @@ public int position() { @Override public AllocatedBuffer position(int position) { - buffer.position(position); + Java8Compatibility.position(buffer, position); return this; } diff --git a/java/core/src/main/java/com/google/protobuf/BinaryWriter.java b/java/core/src/main/java/com/google/protobuf/BinaryWriter.java index cf394e337167..e3854bb1e5bc 100644 --- a/java/core/src/main/java/com/google/protobuf/BinaryWriter.java +++ b/java/core/src/main/java/com/google/protobuf/BinaryWriter.java @@ -2019,8 +2019,8 @@ private void nextBuffer(AllocatedBuffer allocatedBuffer) { buffers.addFirst(allocatedBuffer); buffer = nioBuffer; - buffer.limit(buffer.capacity()); - buffer.position(0); + Java8Compatibility.limit(buffer, buffer.capacity()); + Java8Compatibility.position(buffer, 0); // Set byte order to little endian for fast writing of fixed 32/64. buffer.order(ByteOrder.LITTLE_ENDIAN); @@ -2046,7 +2046,7 @@ void finishCurrentBuffer() { if (buffer != null) { totalDoneBytes += bytesWrittenToCurrentBuffer(); // Update the indices on the netty buffer. - buffer.position(pos + 1); + Java8Compatibility.position(buffer, pos + 1); buffer = null; pos = 0; limitMinusOne = 0; @@ -2475,7 +2475,7 @@ public void write(byte[] value, int offset, int length) { } pos -= length; - buffer.position(pos + 1); + Java8Compatibility.position(buffer, pos + 1); buffer.put(value, offset, length); } @@ -2494,7 +2494,7 @@ public void writeLazy(byte[] value, int offset, int length) { } pos -= length; - buffer.position(pos + 1); + Java8Compatibility.position(buffer, pos + 1); buffer.put(value, offset, length); } @@ -2506,7 +2506,7 @@ public void write(ByteBuffer value) { } pos -= length; - buffer.position(pos + 1); + Java8Compatibility.position(buffer, pos + 1); buffer.put(value); } @@ -2526,7 +2526,7 @@ public void writeLazy(ByteBuffer value) { } pos -= length; - buffer.position(pos + 1); + Java8Compatibility.position(buffer, pos + 1); buffer.put(value); } @@ -2576,8 +2576,8 @@ private void nextBuffer(AllocatedBuffer allocatedBuffer) { buffers.addFirst(allocatedBuffer); buffer = nioBuffer; - buffer.limit(buffer.capacity()); - buffer.position(0); + Java8Compatibility.limit(buffer, buffer.capacity()); + Java8Compatibility.position(buffer, 0); bufferOffset = UnsafeUtil.addressOffset(buffer); limitMinusOne = bufferOffset + (buffer.limit() - 1); @@ -2602,7 +2602,7 @@ void finishCurrentBuffer() { if (buffer != null) { totalDoneBytes += bytesWrittenToCurrentBuffer(); // Update the indices on the netty buffer. - buffer.position(bufferPos() + 1); + Java8Compatibility.position(buffer, bufferPos() + 1); buffer = null; pos = 0; limitMinusOne = 0; @@ -3016,7 +3016,7 @@ public void write(byte[] value, int offset, int length) { } pos -= length; - buffer.position(bufferPos() + 1); + Java8Compatibility.position(buffer, bufferPos() + 1); buffer.put(value, offset, length); } @@ -3035,7 +3035,7 @@ public void writeLazy(byte[] value, int offset, int length) { } pos -= length; - buffer.position(bufferPos() + 1); + Java8Compatibility.position(buffer, bufferPos() + 1); buffer.put(value, offset, length); } @@ -3047,7 +3047,7 @@ public void write(ByteBuffer value) { } pos -= length; - buffer.position(bufferPos() + 1); + Java8Compatibility.position(buffer, bufferPos() + 1); buffer.put(value); } @@ -3067,7 +3067,7 @@ public void writeLazy(ByteBuffer value) { } pos -= length; - buffer.position(bufferPos() + 1); + Java8Compatibility.position(buffer, bufferPos() + 1); buffer.put(value); } diff --git a/java/core/src/main/java/com/google/protobuf/ByteBufferWriter.java b/java/core/src/main/java/com/google/protobuf/ByteBufferWriter.java index 2cb3ada67fb6..3970b0ea5b85 100644 --- a/java/core/src/main/java/com/google/protobuf/ByteBufferWriter.java +++ b/java/core/src/main/java/com/google/protobuf/ByteBufferWriter.java @@ -107,7 +107,7 @@ static void write(ByteBuffer buffer, OutputStream output) throws IOException { } } finally { // Restore the initial position. - buffer.position(initialPos); + Java8Compatibility.position(buffer, initialPos); } } diff --git a/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java b/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java index 4ad83099d769..44dd4dc20ebd 100644 --- a/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java +++ b/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java @@ -1271,7 +1271,7 @@ public final void writeRawBytes(final ByteBuffer value) throws IOException { write(value.array(), value.arrayOffset(), value.capacity()); } else { ByteBuffer duplicated = value.duplicate(); - duplicated.clear(); + Java8Compatibility.clear(duplicated); write(duplicated); } } @@ -1522,7 +1522,7 @@ private static final class HeapNioEncoder extends ArrayEncoder { @Override public void flush() { // Update the position on the buffer. - byteBuffer.position(initialPosition + getTotalBytesWritten()); + Java8Compatibility.position(byteBuffer, initialPosition + getTotalBytesWritten()); } } @@ -1684,7 +1684,7 @@ public void writeRawBytes(final ByteBuffer value) throws IOException { write(value.array(), value.arrayOffset(), value.capacity()); } else { ByteBuffer duplicated = value.duplicate(); - duplicated.clear(); + Java8Compatibility.clear(duplicated); write(duplicated); } } @@ -1794,18 +1794,18 @@ public void writeStringNoTag(String value) throws IOException { // Save the current position and increment past the length field. We'll come back // and write the length field after the encoding is complete. final int startOfBytes = buffer.position() + minLengthVarIntSize; - buffer.position(startOfBytes); + Java8Compatibility.position(buffer, startOfBytes); // Encode the string. encode(value); // Now go back to the beginning and write the length. int endOfBytes = buffer.position(); - buffer.position(startPos); + Java8Compatibility.position(buffer, startPos); writeUInt32NoTag(endOfBytes - startOfBytes); // Reposition the buffer past the written data. - buffer.position(endOfBytes); + Java8Compatibility.position(buffer, endOfBytes); } else { final int length = Utf8.encodedLength(value); writeUInt32NoTag(length); @@ -1813,7 +1813,7 @@ public void writeStringNoTag(String value) throws IOException { } } catch (UnpairedSurrogateException e) { // Roll back the change and convert to an IOException. - buffer.position(startPos); + Java8Compatibility.position(buffer, startPos); // TODO(nathanmittler): We should throw an IOException here instead. inefficientWriteStringNoTag(value, e); @@ -1826,7 +1826,7 @@ public void writeStringNoTag(String value) throws IOException { @Override public void flush() { // Update the position of the original buffer. - originalBuffer.position(buffer.position()); + Java8Compatibility.position(originalBuffer, buffer.position()); } @Override @@ -2014,7 +2014,7 @@ public void writeRawBytes(ByteBuffer value) throws IOException { write(value.array(), value.arrayOffset(), value.capacity()); } else { ByteBuffer duplicated = value.duplicate(); - duplicated.clear(); + Java8Compatibility.clear(duplicated); write(duplicated); } } @@ -2150,7 +2150,7 @@ public void writeStringNoTag(String value) throws IOException { // Save the current position and increment past the length field. We'll come back // and write the length field after the encoding is complete. int stringStart = bufferPos(position) + minLengthVarIntSize; - buffer.position(stringStart); + Java8Compatibility.position(buffer, stringStart); // Encode the string. Utf8.encodeUtf8(value, buffer); @@ -2187,7 +2187,7 @@ public void writeStringNoTag(String value) throws IOException { @Override public void flush() { // Update the position of the original buffer. - originalBuffer.position(bufferPos(position)); + Java8Compatibility.position(originalBuffer, bufferPos(position)); } @Override @@ -2201,7 +2201,7 @@ public int getTotalBytesWritten() { } private void repositionBuffer(long pos) { - buffer.position(bufferPos(pos)); + Java8Compatibility.position(buffer, bufferPos(pos)); } private int bufferPos(long pos) { @@ -2478,7 +2478,7 @@ public void writeRawBytes(final ByteBuffer value) throws IOException { write(value.array(), value.arrayOffset(), value.capacity()); } else { ByteBuffer duplicated = value.duplicate(); - duplicated.clear(); + Java8Compatibility.clear(duplicated); write(duplicated); } } @@ -2792,7 +2792,7 @@ public void writeRawBytes(final ByteBuffer value) throws IOException { write(value.array(), value.arrayOffset(), value.capacity()); } else { ByteBuffer duplicated = value.duplicate(); - duplicated.clear(); + Java8Compatibility.clear(duplicated); write(duplicated); } } diff --git a/java/core/src/main/java/com/google/protobuf/Internal.java b/java/core/src/main/java/com/google/protobuf/Internal.java index b6bbcb160d3f..6e4490e2545d 100644 --- a/java/core/src/main/java/com/google/protobuf/Internal.java +++ b/java/core/src/main/java/com/google/protobuf/Internal.java @@ -313,7 +313,11 @@ public static boolean equalsByteBuffer(ByteBuffer a, ByteBuffer b) { } // ByteBuffer.equals() will only compare the remaining bytes, but we want to // compare all the content. - return a.duplicate().clear().equals(b.duplicate().clear()); + ByteBuffer aDuplicate = a.duplicate(); + Java8Compatibility.clear(aDuplicate); + ByteBuffer bDuplicate = b.duplicate(); + Java8Compatibility.clear(bDuplicate); + return aDuplicate.equals(bDuplicate); } /** Helper method for implementing {@link Message#equals(Object)} for bytes field. */ @@ -353,7 +357,7 @@ public static int hashCodeByteBuffer(ByteBuffer bytes) { bytes.capacity() > DEFAULT_BUFFER_SIZE ? DEFAULT_BUFFER_SIZE : bytes.capacity(); final byte[] buffer = new byte[bufferSize]; final ByteBuffer duplicated = bytes.duplicate(); - duplicated.clear(); + Java8Compatibility.clear(duplicated); int h = bytes.capacity(); while (duplicated.remaining() > 0) { final int length = diff --git a/java/core/src/main/java/com/google/protobuf/IterableByteBufferInputStream.java b/java/core/src/main/java/com/google/protobuf/IterableByteBufferInputStream.java index 713e80646931..1e571cfbbb54 100644 --- a/java/core/src/main/java/com/google/protobuf/IterableByteBufferInputStream.java +++ b/java/core/src/main/java/com/google/protobuf/IterableByteBufferInputStream.java @@ -140,9 +140,9 @@ public int read(byte[] output, int offset, int length) throws IOException { updateCurrentByteBufferPos(length); } else { int prevPos = currentByteBuffer.position(); - currentByteBuffer.position(currentByteBufferPos); + Java8Compatibility.position(currentByteBuffer, currentByteBufferPos); currentByteBuffer.get(output, offset, length); - currentByteBuffer.position(prevPos); + Java8Compatibility.position(currentByteBuffer, prevPos); updateCurrentByteBufferPos(length); } return length; diff --git a/java/core/src/main/java/com/google/protobuf/Java8Compatibility.java b/java/core/src/main/java/com/google/protobuf/Java8Compatibility.java new file mode 100644 index 000000000000..ef181c2ae55b --- /dev/null +++ b/java/core/src/main/java/com/google/protobuf/Java8Compatibility.java @@ -0,0 +1,67 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2008 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package com.google.protobuf; + +import java.nio.Buffer; + +/** + * Wrappers around {@link Buffer} methods that are covariantly overridden in Java 9+. See + * https://github.com/protocolbuffers/protobuf/issues/11393 + * + *

TODO(b/270454719) remove when Java 8 support is no longer needed. + */ +final class Java8Compatibility { + static void clear(Buffer b) { + b.clear(); + } + + static void flip(Buffer b) { + b.flip(); + } + + static void limit(Buffer b, int limit) { + b.limit(limit); + } + + static void mark(Buffer b) { + b.mark(); + } + + static void position(Buffer b, int position) { + b.position(position); + } + + static void reset(Buffer b) { + b.reset(); + } + + private Java8Compatibility() {} +} diff --git a/java/core/src/main/java/com/google/protobuf/MessageSchema.java b/java/core/src/main/java/com/google/protobuf/MessageSchema.java index 084d687d1a69..ae5dddc53bb2 100644 --- a/java/core/src/main/java/com/google/protobuf/MessageSchema.java +++ b/java/core/src/main/java/com/google/protobuf/MessageSchema.java @@ -5510,6 +5510,12 @@ public void makeImmutable(T message) { getMessageFieldSchema(pos).makeImmutable(UNSAFE.getObject(message, offset)); } break; + case 60: // ONEOF_MESSAGE + case 68: // ONEOF_GROUP + if (isOneofPresent(message, numberAt(pos), pos)) { + getMessageFieldSchema(pos).makeImmutable(UNSAFE.getObject(message, offset)); + } + break; case 18: // DOUBLE_LIST: case 19: // FLOAT_LIST: case 20: // INT64_LIST: diff --git a/java/core/src/main/java/com/google/protobuf/NioByteString.java b/java/core/src/main/java/com/google/protobuf/NioByteString.java index 1e594ff878c5..f625edafb9ef 100644 --- a/java/core/src/main/java/com/google/protobuf/NioByteString.java +++ b/java/core/src/main/java/com/google/protobuf/NioByteString.java @@ -37,7 +37,6 @@ import java.io.InvalidObjectException; import java.io.ObjectInputStream; import java.io.OutputStream; -import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.InvalidMarkException; @@ -110,7 +109,7 @@ public ByteString substring(int beginIndex, int endIndex) { protected void copyToInternal( byte[] target, int sourceOffset, int targetOffset, int numberToCopy) { ByteBuffer slice = buffer.slice(); - ((Buffer) slice).position(sourceOffset); + Java8Compatibility.position(slice, sourceOffset); slice.get(target, targetOffset, numberToCopy); } @@ -224,7 +223,7 @@ public InputStream newInput() { @Override public void mark(int readlimit) { - buf.mark(); + Java8Compatibility.mark(buf); } @Override @@ -235,7 +234,7 @@ public boolean markSupported() { @Override public void reset() throws IOException { try { - buf.reset(); + Java8Compatibility.reset(buf); } catch (InvalidMarkException e) { throw new IOException(e); } @@ -286,8 +285,8 @@ private ByteBuffer slice(int beginIndex, int endIndex) { } ByteBuffer slice = buffer.slice(); - ((Buffer) slice).position(beginIndex - buffer.position()); - ((Buffer) slice).limit(endIndex - buffer.position()); + Java8Compatibility.position(slice, beginIndex - buffer.position()); + Java8Compatibility.limit(slice, endIndex - buffer.position()); return slice; } } diff --git a/java/core/src/main/java/com/google/protobuf/TextFormat.java b/java/core/src/main/java/com/google/protobuf/TextFormat.java index a8af84506b75..1fb4452a3f0e 100644 --- a/java/core/src/main/java/com/google/protobuf/TextFormat.java +++ b/java/core/src/main/java/com/google/protobuf/TextFormat.java @@ -1717,7 +1717,7 @@ private static StringBuilder toStringBuilder(final Readable input) throws IOExce if (n == -1) { break; } - buffer.flip(); + Java8Compatibility.flip(buffer); text.append(buffer, 0, n); } return text; diff --git a/java/core/src/main/java/com/google/protobuf/Utf8.java b/java/core/src/main/java/com/google/protobuf/Utf8.java index c74497cd816a..7c6823d91ffa 100644 --- a/java/core/src/main/java/com/google/protobuf/Utf8.java +++ b/java/core/src/main/java/com/google/protobuf/Utf8.java @@ -770,7 +770,7 @@ final void encodeUtf8(CharSequence in, ByteBuffer out) { if (out.hasArray()) { final int offset = out.arrayOffset(); int endIndex = Utf8.encode(in, out.array(), offset + out.position(), out.remaining()); - out.position(endIndex - offset); + Java8Compatibility.position(out, endIndex - offset); } else if (out.isDirect()) { encodeUtf8Direct(in, out); } else { @@ -801,7 +801,7 @@ final void encodeUtf8Default(CharSequence in, ByteBuffer out) { } if (inIx == inLength) { // Successfully encoded the entire string. - out.position(outIx + inIx); + Java8Compatibility.position(out, outIx + inIx); return; } @@ -844,7 +844,7 @@ final void encodeUtf8Default(CharSequence in, ByteBuffer out) { } // Successfully encoded the entire string. - out.position(outIx); + Java8Compatibility.position(out, outIx); } catch (IndexOutOfBoundsException e) { // TODO(nathanmittler): Consider making the API throw IndexOutOfBoundsException instead. @@ -1545,7 +1545,7 @@ void encodeUtf8Direct(CharSequence in, ByteBuffer out) { } if (inIx == inLimit) { // We're done, it was ASCII encoded. - out.position((int) (outIx - address)); + Java8Compatibility.position(out, (int) (outIx - address)); return; } @@ -1585,7 +1585,7 @@ void encodeUtf8Direct(CharSequence in, ByteBuffer out) { } // All bytes have been encoded. - out.position((int) (outIx - address)); + Java8Compatibility.position(out, (int) (outIx - address)); } /** diff --git a/java/lite/pom.xml b/java/lite/pom.xml index 367cd7aa598a..8791e4ad190c 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -125,6 +125,7 @@ Internal.java InvalidProtocolBufferException.java IterableByteBufferInputStream.java + Java8Compatibility.java JavaType.java LazyField.java LazyFieldLite.java diff --git a/java/lite/src/test/java/com/google/protobuf/LiteTest.java b/java/lite/src/test/java/com/google/protobuf/LiteTest.java index 801303b34466..3b2285fcf2d7 100644 --- a/java/lite/src/test/java/com/google/protobuf/LiteTest.java +++ b/java/lite/src/test/java/com/google/protobuf/LiteTest.java @@ -189,6 +189,18 @@ public void testAddAll() { } } + @Test + public void testParsedOneofSubMessageIsImmutable() throws InvalidProtocolBufferException { + TestAllTypesLite message = + TestAllTypesLite.parseFrom( + TestAllTypesLite.newBuilder() + .setOneofNestedMessage(NestedMessage.newBuilder().addDd(1234).build()) + .build() + .toByteArray()); + IntArrayList subList = (IntArrayList) message.getOneofNestedMessage().getDdList(); + assertThat(subList.isModifiable()).isFalse(); + } + @Test public void testMemoization() throws Exception { GeneratedMessageLite message = TestUtilLite.getAllLiteExtensionsSet(); @@ -2349,8 +2361,7 @@ public void testEqualsAndHashCodeWithUnknownFields() throws InvalidProtocolBuffe Foo fooWithOnlyValue = Foo.newBuilder().setValue(1).build(); Foo fooWithValueAndExtension = - fooWithOnlyValue - .toBuilder() + fooWithOnlyValue.toBuilder() .setValue(1) .setExtension(Bar.fooExt, Bar.newBuilder().setName("name").build()) .build(); @@ -2366,8 +2377,7 @@ public void testEqualsAndHashCodeWithExtensions() throws InvalidProtocolBufferEx Foo fooWithOnlyValue = Foo.newBuilder().setValue(1).build(); Foo fooWithValueAndExtension = - fooWithOnlyValue - .toBuilder() + fooWithOnlyValue.toBuilder() .setValue(1) .setExtension(Bar.fooExt, Bar.newBuilder().setName("name").build()) .build(); @@ -2499,9 +2509,9 @@ public void testParseFromByteBufferThrows_extensions() { assertWithMessage("expected exception").fail(); } catch (InvalidProtocolBufferException expected) { assertThat( - TestAllExtensionsLite.newBuilder() - .setExtension(UnittestLite.optionalInt32ExtensionLite, 123) - .build()) + TestAllExtensionsLite.newBuilder() + .setExtension(UnittestLite.optionalInt32ExtensionLite, 123) + .build()) .isEqualTo(expected.getUnfinishedMessage()); } } diff --git a/src/google/protobuf/unittest_lite.proto b/src/google/protobuf/unittest_lite.proto index 010d4a9c0b21..e2730c64196d 100644 --- a/src/google/protobuf/unittest_lite.proto +++ b/src/google/protobuf/unittest_lite.proto @@ -47,6 +47,7 @@ message TestAllTypesLite { message NestedMessage { optional int32 bb = 1; optional int64 cc = 2; + repeated int32 dd = 3 [packed = true]; } message NestedMessage2 { From 5a9dbd9a4edc159e8a159f0d4ca63410007267e0 Mon Sep 17 00:00:00 2001 From: Matt Kulukundis Date: Mon, 10 Apr 2023 10:28:59 -0400 Subject: [PATCH 13/14] Backport various warning supressions from 22.x to 21.x Change made manually, since the various changes were spread over several commits and the cherry pick was not clean. --- src/google/protobuf/port_def.inc | 38 +++++++++++++++++++++++++++--- src/google/protobuf/port_undef.inc | 4 ++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 6c6aa1834b0c..37567f90bc95 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -879,13 +879,45 @@ #undef DEBUG #endif // defined(__clang__) || PROTOBUF_GNUC_MIN(3, 0) || defined(_MSC_VER) -#if PROTOBUF_GNUC_MIN(3, 0) +// Protobuf does not support building with a number of warnings that are noisy +// (and of variable quality across compiler versions) or impossible to implement +// effectively but which people turn on anyways. +#ifdef __clang__ +#pragma clang diagnostic push +// -Wshorten-64-to-32 is a typical pain where we diff pointers. +// char* p = strchr(s, '\n'); +// return p ? p - s : -1; +#pragma clang diagnostic ignored "-Wshorten-64-to-32" +// Turn on -Wdeprecated-enum-enum-conversion. This deprecation comes in C++20 +// via http://wg21.link/p1120r0. +#pragma clang diagnostic error "-Wdeprecated-enum-enum-conversion" +// This error has been generally flaky, but we need to disable it specifically +// to fix https://github.com/protocolbuffers/protobuf/issues/12313 +#pragma clang diagnostic ignored "-Wunused-parameter" +#endif +#ifdef __GNUC__ +#pragma GCC diagnostic push +// Some of the warnings below only exist in some GCC versions; those version +// ranges are poorly documented. +#pragma GCC diagnostic ignored "-Wpragmas" // GCC does not allow disabling diagnostics within an expression: // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60875, so we disable this one // globally even though it's only used for PROTOBUF_FIELD_OFFSET. -#pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Winvalid-offsetof" -#endif +// Some versions of GCC seem to think that +// [this] { Foo(); } +// leaves `this` unused, even though `Foo();` is a member function of the +// captured `this`. +// https://bugzilla.mozilla.org/show_bug.cgi?id=1373625 +#pragma GCC diagnostic ignored "-Wunused-lambda-capture" +// -Wsign-conversion causes a lot of warnings on mostly code like: +// int index = ... +// int value = vec[index]; +#pragma GCC diagnostic ignored "-Wsign-conversion" +// This error has been generally flaky, but we need to disable it specifically +// to fix https://github.com/protocolbuffers/protobuf/issues/12313 +#pragma GCC diagnostic ignored "-Wunused-parameter" +#endif // __GNUC__ // Silence some MSVC warnings in all our code. #ifdef _MSC_VER diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc index e880fa5c5912..407b748e816b 100644 --- a/src/google/protobuf/port_undef.inc +++ b/src/google/protobuf/port_undef.inc @@ -154,6 +154,10 @@ #pragma GCC diagnostic pop #endif +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + // Pop the warning(push) from port_def.inc #ifdef _MSC_VER #pragma warning(pop) From 418dcd66745c440fd59fe94c33adfc242ef18aab Mon Sep 17 00:00:00 2001 From: zhangskz Date: Tue, 15 Aug 2023 16:52:27 -0400 Subject: [PATCH 14/14] Update collect_all_artifacts.sh to remove C# Google.Protobuf.Tools nuget build (#13554) CI shows this part of legacy release infrastructure is no longer working as expected due to failing keyserver request. C# has already exited support window for 21.x so we are removing this artifact from releases on this line. --- kokoro/release/collect_all_artifacts.sh | 37 ------------------------- 1 file changed, 37 deletions(-) diff --git a/kokoro/release/collect_all_artifacts.sh b/kokoro/release/collect_all_artifacts.sh index 49249d758f2b..8b38b6d995e7 100755 --- a/kokoro/release/collect_all_artifacts.sh +++ b/kokoro/release/collect_all_artifacts.sh @@ -24,40 +24,3 @@ ls -R ${INPUT_ARTIFACTS_DIR} # TODO(jtattermusch): the directory layout of the artifact builds is pretty messy, # so will be the output artifacts of this job. cp -r ${INPUT_ARTIFACTS_DIR}/* artifacts - -# ==================================== -# Build Google.Protobuf.Tools C# nuget -# The reason it's being done in this script is that we need access to protoc binaries -# built on multiple platform (the build is performed by the "build artifact" step) -# and adding and extra chained build just for building the Google.Protobuf.Tools -# nuget seems like an overkill. -cd csharp -mkdir -p protoc/windows_x86 -mkdir -p protoc/windows_x64 -cp ${INPUT_ARTIFACTS_DIR}/build32/Release/protoc.exe protoc/windows_x86/protoc.exe -cp ${INPUT_ARTIFACTS_DIR}/build64/Release/protoc.exe protoc/windows_x64/protoc.exe - -mkdir -p protoc/linux_x86 -mkdir -p protoc/linux_x64 -# Because of maven unrelated reasonse the linux protoc binaries have a dummy .exe extension. -# For the Google.Protobuf.Tools nuget, we don't want that exception, so we just remove it. -cp ${INPUT_ARTIFACTS_DIR}/protoc-artifacts/target/linux/x86_32/protoc.exe protoc/linux_x86/protoc -cp ${INPUT_ARTIFACTS_DIR}/protoc-artifacts/target/linux/x86_64/protoc.exe protoc/linux_x64/protoc - -mkdir -p protoc/macosx_x64 -cp ${INPUT_ARTIFACTS_DIR}/build64/src/protoc protoc/macosx_x64/protoc - -# Install nuget (will also install mono) -# TODO(jtattermusch): use "mono:5.14" docker image instead so we don't have to apt-get install -sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list -# NVidia has stopped publishing Cuda packages for Ubuntu 16.04, so we need to -# delete this file to allow the apt update to run successfully. -sudo rm -f /etc/apt/sources.list.d/cuda.list -sudo apt update -sudo apt-get install -y nuget - -nuget pack Google.Protobuf.Tools.nuspec - -# Copy the nupkg to the output artifacts -cp Google.Protobuf.Tools.*.nupkg ../artifacts