Commit Graph

8842 Commits

Author SHA1 Message Date
Adam Cozzette
454f0cccaa Add jsr305 dependency for Bazel 2021-10-12 15:37:40 -07:00
Chris Povirk
0da2ca5a17
Add jsr305 to protobuf-util deps. (#9059)
This prepares for a change (internal CL 399474184, to be mirrored out to GitHub) to add a few such annotations in FieldMaskUtil and JsonFormat.

(Technically, this PR is probably not "necessary" because protobuf-util already depends transitively on jsr305. But it's better hygiene to depend on it directly, and the direct dependency could protect against problems if protobuf-util drops some of its other deps -- or if those deps drop their own deps on jsr305.)
2021-10-12 13:11:17 -07:00
Adam Cozzette
7f79a416ff Update the file lists with ./update_file_lists.sh 2021-10-12 11:49:50 -07:00
Adam Cozzette
68c17dcde8 Tweak syntax of casting function to void
GCC 4.9 seems to be unable to handle (void) syntax with a function, but
it is OK with a static_cast to void.
2021-10-12 11:12:39 -07:00
Adam Cozzette
99612d0885 Update CHANGES.txt 2021-10-12 10:21:22 -07:00
Adam Cozzette
4ffb31e906 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-10-12 10:19:11 -07:00
Adam Cozzette
1f66b1b032 Sync from Piper @402594188
PROTOBUF_SYNC_PIPER
2021-10-12 10:19:10 -07:00
Adam Cozzette
9488e2f8eb
Update cmake file lists (#9038)
I ran ./update_file_lists.sh to update these files.
2021-10-12 10:08:05 -07:00
Jason Lunn
cbe2eadd5b
Merge pull request #9087 from JasonLunn/jruby_kokoro_test_fix
Install core rather than util
2021-10-11 20:35:24 -04:00
Dietmar Scheidl
3bdcc1266b
Fix build on AIX and SunOS (#8373) (#9065)
* fix includes for AIX and SunOS
2021-10-11 13:46:54 -07:00
mgabris
1b22582bc0
Fix unused variable warnings in extension_set.h (#9073) 2021-10-11 13:39:14 -07:00
Jason Lunn
2ccc5df358 Install core rather than util 2021-10-11 19:10:09 +00:00
Elliotte Rusty Harold
b7928164dc
Merge pull request #9066 from elharo/testscope
EasyMock should have scope test
2021-10-11 19:07:41 +00:00
Elliotte Rusty Harold
9650e9fe8f
update to 3.18.1 (#9057)
* update to 3.18.1
2021-10-10 11:11:21 +00:00
Jimmy Yuen Ho Wong
ae4fd1e24b
Fix cl deprecation warning (#9046) 2021-10-09 11:54:15 -07:00
johanmoe
15c63ad850
Fix build error with MinGW (#9077)
Fixes:
  * zero_copy_stream_impl.cc uses F_GETFL when build with MinGW,
    which isn't defined under Windows.
2021-10-09 11:45:56 -07:00
NexusNull
5142e362bc
Update README.md (#9078)
remove dollar sign for easier copying
2021-10-09 11:42:59 -07:00
Alexey Solodkiy
fd5202b6cd
Add twirp to RPC Implementations list (#9085) 2021-10-09 11:39:18 -07:00
Adam Cozzette
3afc828309 Sync from Piper @401883098
PROTOBUF_SYNC_PIPER
2021-10-08 16:45:26 -07:00
Jason Lunn
ad717db556
Merge pull request #9082 from JasonLunn/jruby_add_test_targets
Add JRuby test targets for 9.2.x and 9.3.x.
2021-10-08 09:01:46 -04:00
Jason Lunn
b79a2f242c Add JRuby test targets for JRuby 9.2.x and 9.3.x.
Standardize on JRuby 9.2.19.0 for building and for testing the 9.2.x branch.
2021-10-07 18:56:14 -04:00
Jason Lunn
728878e98f Add JRuby test targets for JRuby 9.2.x and 9.3.x.
Standardize on JRuby 9.2.19.0 for building and for testing the 9.2.x branch.
2021-10-07 18:45:38 -04:00
Jason Lunn
9e49f0f46b
Merge pull request #9081 from JasonLunn/jruby_update_ruby_docker
Update the base image from jessie to stretch (for parity with the Java).
2021-10-07 21:16:18 +00:00
Jason Lunn
eee60cec13 Update the base image from jessie to stretch (for parity with the Java).
Add Maven and OpenJDK 8 and add JRuby 9.2.x and 9.3.x.

Replace keys.gnupg.net with keyserver.ubuntu.com as the GPG keyserver since the former no longer exists.
2021-10-07 20:28:20 +00:00
Jason Lunn
b7cc13068d
Merge pull request #9071 from JasonLunn/jruby_explicit_java_dependency
Create an explicit build dependency from JRuby on Java
2021-10-07 13:50:44 +00:00
Jason Lunn
803a8cb9c7
Merge pull request #9074 from elharo/elharo-patch-1
remove dependency on Jackson
2021-10-07 00:01:55 +00:00
Jason Lunn
0d3f95d7ae Narrow the scope of the install 2021-10-06 17:27:43 -04:00
Elliotte Rusty Harold
174d95c1a7
remove dependency on Jackson 2021-10-06 21:02:51 +00:00
Jason Lunn
2ed8173481 Bug fix for oracle7 regression 2021-10-06 16:40:09 -04:00
Jason Lunn
ddd7f46a7d Create an explicit build dependency from JRuby on Java.
Should prevent future flakiness if unreleased JRuby features are dependent on unreleased Java features by populating the local Maven repository with the artifacts needed when running `tests.sh jruby`.
2021-10-06 13:06:27 -04:00
Jason Lunn
7400f4b342
Merge pull request #9070 from JasonLunn/jruby-version-bump-3.18.1
Bump JRuby to 3.18.1
2021-10-06 16:11:21 +00:00
Jason Lunn
7051d82fa9
Bump to 3.18.1 2021-10-06 11:18:11 -04:00
Elliotte Rusty Harold
72fa7269d9
EasyMock should have scope test 2021-10-06 11:25:25 +00:00
Adam Cozzette
0613ca8284
Merge pull request #9061 from acozzette/merge-3.18.x
Merge 3.18.x into master
2021-10-05 17:08:16 -07:00
Elliotte Rusty Harold
1e88936fce
Stop using EasyMock classextension (#9008)
* get rid of classextension and update EasyMock
2021-10-05 21:49:01 +00:00
Adam Cozzette
2a75e8ca58 Merge branch '3.18.x' into merge-3.18.x 2021-10-05 14:04:13 -07:00
deannagarcia
6f99bfc8c6
Merge pull request #9060 from protocolbuffers/toolchain
Changing toolchain names
2021-10-05 12:19:38 -07:00
Jason Lunn
d546ec75ef
Merge pull request #9047 from JasonLunn/jruby_test_fixes_redux
Adopt pure ruby DSL implementation for JRuby
2021-10-05 18:13:27 +00:00
Deanna Garcia
a793c7f72a Fixing builds 2021-10-05 17:49:50 +00:00
Adam Cozzette
0dab03ba7b
Update protobuf version to 3.18.1 (#9051)
* Update protobuf version

* Update PHP release notes in package.xml
2021-10-04 17:43:33 -07:00
deannagarcia
ec494a07f4
Merge pull request #9052 from protocolbuffers/toolchain
Change include messages to match docker
2021-10-04 15:23:16 -07:00
Deanna Garcia
95fdfd771d Change include messages to match docker 2021-10-04 21:23:59 +00:00
Adam Cozzette
40f6669c46
Update changelog for 3.18.1 (#9050) 2021-10-04 13:56:35 -07:00
Jason Lunn
05ddf82f20 Remove blank line 2021-10-04 17:04:03 +00:00
Jason Lunn
793c66ddf0 Include JRuby's pom.xml file when updating version numbers 2021-10-04 17:00:17 +00:00
Jason Lunn
f88c8ef11a Remove vestigial function that makes a dated claim that Ruby doesn't support proto2 2021-10-04 15:46:14 +00:00
Jason Lunn
e3ba5ec615 Add trailing backslashes at end of line consistently 2021-10-04 15:45:26 +00:00
Jason Lunn
f5ef2892b4 Add an explicit RUBYLIB path to fix a load error under JRuby 2021-10-04 15:44:38 +00:00
Jason Lunn
b5687819a6 Fix a test regression observed after branch update 2021-10-04 15:43:21 +00:00
Jason Lunn
a09c8e1c79 Fix logic to decouple from the order of fields.keySet 2021-10-04 13:57:47 +00:00