Commit Graph

9312 Commits

Author SHA1 Message Date
Joshua Haberman
a2a0c3c118 Fixed some mis-merged files. 2022-04-22 17:18:36 +00:00
Joshua Haberman
f80137c46d Merge branch 'main' into merge-to-main 2022-04-22 02:44:36 +00:00
Joshua Haberman
21027a27c4
Merge pull request #9832 from haberman/php-dist
Fixed PHP release script.
2022-04-22 01:00:40 +00:00
Joshua Haberman
e81c678e7d
Merge pull request #9831 from haberman/sync-stage
Integrate from Piper for C++, Java, and Python
2022-04-22 00:55:55 +00:00
David L. Jones
83303ba906
Update rules_pkg to version 0.7.0. (#9833)
Notably, bazelbuild/rules_pkg 0.6.0 added the ability for `pkg_filegroup`s to depend on other `pkg_filegroup`s.
2022-04-21 17:38:03 -07:00
Joshua Haberman
634a5681b8 Fixed PHP release script.
Previously it was releasing content from main/master, not the
release branch!

I fixed this by not checking out a separate copy of protobuf.
Also updated the composer.json so we don't need to rewrite it with
sed.
2022-04-21 23:38:04 +00:00
Joshua Haberman
08b39f4274 Merge tag 'refs/tags/sync-piper' into sync-stage 2022-04-21 23:11:28 +00:00
Joshua Haberman
9bd67b6aac Sync from Piper @443506199
PROTOBUF_SYNC_PIPER
2022-04-21 23:11:27 +00:00
Joshua Haberman
e4da73fab7 Updated CHANGES.txt. 2022-04-21 21:27:14 +00:00
Joshua Haberman
87edf7b558 Sync from Piper @443477877
PROTOBUF_SYNC_PIPER
2022-04-21 21:22:55 +00:00
Joshua Haberman
dcfeaf712b Merge tag 'refs/tags/sync-piper' into sync-stage 2022-04-21 21:22:55 +00:00
Jonathan Ringer
c80808ce1d
Fix cmake install targets (#9822)
* Avoid exporting build tree targets to installation directory

`export(TARGETS ...)` is meant to allow for build trees to be found
from other projects, however, writing the file to an installation
directory causes buildtree paths to be hardcoded in the installed
protobuf-targets.cmake

* Install protobuf-targets.cmake from target, not build tree

This allows for installation prefixes to match the intended
installation directories, instead of being copied from
the build tree.
2022-04-20 18:38:43 -07:00
Joshua Haberman
616a7ef54d
Updated CHANGES.txt for 3.20.1 (#9826)
* Update protobuf version

* Updated Makefile.am for composer.json move.

* Updated CHANGES.txt for 3.20.1.

* Fixed spelling.
2022-04-20 17:05:48 -07:00
David L. Jones
46710cabc4
Move rules_pkg targets into //pkg, and add experimental C++ library rules (#9823)
This change moves the `pkg_*` rules into the `//pkg` package, which cleans up the root package.

It also adds an experimental `cc_dist_library` rule, which is similar to Bazel's `cc_import` rule. The goal of `cc_dist_library` is to produce output libraries from several targets. For example, splitting `//:protobuf` into multiple targets means that `bazel-bin/libprotobuf.a` won't contain all of the objects. The `cc_dist_library` creates a single library from several different `cc_library` targets. This may be useful for future packaging targets.
2022-04-20 16:26:44 -07:00
Joshua Haberman
296c1fdaff
Update protobuf version (#9820)
* Update protobuf version

* Updated Makefile.am for composer.json move.
2022-04-20 16:00:42 -07:00
Brent Shaffer
6387f95aa9
fix: move composer.json out of root to avoid confusion (#9819)
* move composer.json out of root to avoid confusion

* fix: update php deployed json
2022-04-20 14:51:11 -07:00
Joshua Haberman
653de45a21
Disable the aarch64 build on macOS because it is broken. (#9816)
See https://github.com/protocolbuffers/protobuf/issues/9804 for details.
2022-04-20 14:32:52 -07:00
mkruskal-google
f7b9886f9d
Fix Abseil dependency in windows protoc kokoro build (#9814)
* Adding submodule update to windows protoc build which uses CMake 3.10.1
2022-04-20 13:50:13 -04:00
Neakxs
654c25352e
Apply registration for protoc-gen-authz extension (#9807) 2022-04-19 13:41:58 -07:00
Jason Lunn
3a477b1952
Improve range handling logic of RepeatedField (#9799)
Add support for negative start or ends and exclusive ends.

Includes regression tests contributed mostly by @lucthev. Fixes #9751.
2022-04-19 10:46:01 -04:00
Brent Shaffer
81e5139679
fix: phpdoc for repeatedfield (#9783)
* fix-phpdoc-for-protobuf-repeatedfield

* fix: offsetSet should accept null
2022-04-18 16:14:56 -07:00
なつき
d2fd441953
Do not use range based UTF-8 validation in truffleruby (#9769) 2022-04-18 16:12:20 -07:00
Brent Shaffer
9ba808b798
fix: phpdoc syntax for repeatedfield parameters (#9784) 2022-04-18 16:07:02 -07:00
Elliotte Rusty Harold
cc8ae4c154
Add JDK 17 target (#9802)
* add JDK 17 target
2022-04-18 19:54:42 +00:00
Elliotte Rusty Harold
46ae74c55c
Remove LAST_RELEASED variable we haven't been updating (#9803)
* Remove LAST_RELEASED variable we haven't been updating
2022-04-18 19:22:22 +00:00
Elliotte Rusty Harold
b27bf8b437
LAST_RELEASED=3.20.0 (#9741)
@acozzette We might want to add this to the release process since it seems this hasn't been updated for quite a while.
2022-04-18 17:52:12 +00:00
Elliotte Rusty Harold
bbc4f8dff8
add JDK 8 target (#9743) 2022-04-18 12:47:56 -04:00
mkruskal-google
e9246cd789
Update CMake configuration to add a dependency on Abseil (#9793)
* Proof of concept for CMake Abseil dependency

* Hooked up Abseil linking

* Adding test binaries

* Reverting absl::string view use added for testing.  This will still be broken for automake and bazel

* Adding new cmake config to dist list

* Whitespace fixes and an attempt at fix for Windows Python Release (CMake version < 3.13)

* Hook up LTS to windows cmake

* Fix 'git cd' typo

* Adding clarifying comment for fix

* Adding abseil dependency to protobuf-lite too

* Update submodules instead of cloning abseil-cpp

* Adding explicit pointer to abseil root directory

Co-authored-by: Jason Lunn <jason.lunn@gmail.com>
Co-authored-by: Jorg Brown <jorg.brown@gmail.com>
2022-04-17 22:28:01 -04:00
Joshua Haberman
6f99f12a6b
Merge pull request #9790 from dlj-NaN/sync-stage
Integrate from Piper for C++, Java, and Python
2022-04-15 11:30:44 -07:00
Yibo Cai
bba2fca119
Move private utf8 helpers to anonymous namespace (#9791)
This trivial change hints compiler to inline the utf8 helpers and
generate code with better performance.

Tested on skylake, with clang-12 and gcc-9.3. Observed about 10%
improvement from `google_message1_proto3_serialize` benchmark,
with default ./configure parameters. Similar improvement on arm.
2022-04-15 11:25:17 -07:00
David L. Jones
13f646f026 Update CHANGES.txt. 2022-04-14 17:39:00 -07:00
David L. Jones
9e09343a49 Sync from Piper @441896533
PROTOBUF_SYNC_PIPER
2022-04-14 17:36:14 -07:00
David L. Jones
119f7d7dab Merge tag 'refs/tags/sync-piper' into sync-stage 2022-04-14 17:36:14 -07:00
zhangskz
acd24bcd8d
Add disallowment of setting numpy singleton arrays and multi-dimensio… (#9788)
* Add breaking change (disallow setting numpy singleton arrays and multi-dimensional arrays to fields/repeated fields) and fix to CHANGES.txt, which was missed in a previous git sync.
2022-04-14 13:59:40 -04:00
Jon Skeet
82d04fabd9 Remove unnecessary console output from test 2022-04-14 16:14:27 +01:00
Brent Shaffer
eb27c201f1
fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)
* fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility

* typo fix - readme > readonly
2022-04-12 15:48:14 -07:00
Matt Fowles Kulukundis
8077ac24b7
Merge pull request #9777 from noahdietz/master-to-main
Replace master with main in URLs & docs
2022-04-12 13:54:12 -04:00
noahdietz
5abf802bc2 Replace master with main in URLs & docs 2022-04-12 10:25:08 -07:00
Elliotte Rusty Harold
a85bbad379
deps: update Guava to 31.1 (#9757)
@mrkruskal
2022-04-08 18:43:11 +00:00
Adam Cozzette
9bf0aca7db
Update protobuf_deps.bzl to add a dependency on Abseil (#9752)
This is the most recent Abseil LTS branch, from November 2021. We do not
yet use Abseil for anything, but this change will make it possible to
start using it in Bazel when we're ready.
2022-04-08 09:12:05 -07:00
Vasiliy Tolstov
7ffe9402db
Add micro Registered Extension Number (#9767)
unistack-org/micro (microservices framework) uses protoc-gen-go-micro generator that has extension support for additional framework related options.

It is currently not using any registered extension number, so i want to stabilise this and i think that this is a good thing.

See here for an example of the extenstion in action.

Co-authored-by: Adam Cozzette <acozzette@google.com>
2022-04-08 09:11:27 -07:00
Jeff Sawatzky
e3b00bb58a
Add Google Gnostic Registered Extension Number (#9754)
google/gnostic's protoc-gen-openapi generator has extension support for additional openapi options.
It is [currently using `1042`](https://github.com/google/gnostic/blob/master/openapiv3/annotations.proto) which is registered with grpc-gateway's protoc-gen-openapiv2 extension which probably isn't a good thing.
See [here](https://github.com/google/gnostic/blob/master/cmd/protoc-gen-openapi/examples/tests/openapiv3annotations/message.proto) for an example of the extenstion in action.
2022-04-08 09:08:38 -07:00
Elliotte Rusty Harold
26d11fdba2 -Dsurefire.failIfNoSpecifiedTests=false (#9761)
@mrkruskal

(cherry picked from commit 88eb7550a6)
2022-04-07 17:05:12 -07:00
mkruskal-google
85aa87cbc9
Merge 3.20.1-rc1 into main (#9760)
* Fix NPE during encoding and add regression test for issue 9507.

(cherry picked from commit 58e320a732)

* Implement `respond_to?` in RubyMessage (#9677)

All synthetic methods implemented by `method_missing` are now supported by `respond_to?`.

Fixes issue #9202.

* Fix null pointer exceptions exposed by new regression tests.
* Fix clear_ on oneofs so that it is safe to call repeatedly and so that respond_to? does not depend on whether the oneof is currently cleared.
* Code cleanup: reenable more tests on JRuby.
* Align JRuby behavior with CRuby by throwing a RuntimeError when attempting to assign to a oneof.

(cherry picked from commit 8e7f936696)

* Update protobuf version

* Merge pull request #9727 from mlocati/build-packaged-php-extension

Fix building packaged PHP extension

(cherry picked from commit 7f9901c5f6)

* Update protobuf version

* Update changelogs for 3.20.1-rc1

Co-authored-by: Jason Lunn <jason.lunn@gmail.com>
Co-authored-by: Jorg Brown <jorg.brown@gmail.com>
2022-04-07 18:33:58 -04:00
Elliotte Rusty Harold
88eb7550a6
-Dsurefire.failIfNoSpecifiedTests=false (#9761)
@mrkruskal
2022-04-07 22:10:09 +00:00
Elliotte Rusty Harold
044cb7fd45 -DfailIfNoSpecifiedTests=false (#9753)
@jtattermusch @mkruskal-google

(cherry picked from commit 55177c3574)
2022-04-07 08:37:31 -07:00
Elliotte Rusty Harold
55177c3574
-DfailIfNoSpecifiedTests=false (#9753)
@jtattermusch @mkruskal-google
2022-04-07 14:02:57 +00:00
deannagarcia
061dead753
Merge pull request #9750 from protocolbuffers/pythonBuilds
Add k8 toolchain
2022-04-06 16:33:24 -07:00
Jason Lunn
05df37d35c
Merge pull request #9722 from lucthev/main
[Ruby] Fix RepeatedField#last, #first inconsistencies
2022-04-06 17:37:22 -04:00
Luc Thevenard
d54cafb7c8 Avoid negative indexes for JRuby 2022-04-06 15:49:08 -04:00