Elliotte Rusty Harold
21873ae54a
Merge pull request #7853 from belugabehr/CopyList
...
Use ArrayList copy constructor
3 years ago
Postmodern
39013ab238
Remove unused rubygems-tasks development dependency ( #8824 )
...
* Cannot find any occurrence of `require 'rubygems/tasks` or `Gem::Tasks` in the source code, so I am confident that this development dependency can safely be removed.
3 years ago
Adam Cozzette
3e1967e10b
Merge pull request #9090 from acozzette/sync-stage
...
Integrate from Piper for C++, Java, and Python
3 years ago
Josh
8171716ae9
Added "object" as a reserved name for PHP ( #8962 )
...
* Added "object" as a reserved name for PHP
* Fixed spacing
3 years ago
Adam Cozzette
9aa1adc60c
Removed unused references to easymock_classextension
3 years ago
Adam Cozzette
454f0cccaa
Add jsr305 dependency for Bazel
3 years ago
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.)
3 years ago
Adam Cozzette
7f79a416ff
Update the file lists with ./update_file_lists.sh
3 years ago
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.
3 years ago
Adam Cozzette
99612d0885
Update CHANGES.txt
3 years ago
Adam Cozzette
4ffb31e906
Merge tag 'refs/tags/sync-piper' into sync-stage
3 years ago
Adam Cozzette
1f66b1b032
Sync from Piper @402594188
...
PROTOBUF_SYNC_PIPER
3 years ago
Adam Cozzette
9488e2f8eb
Update cmake file lists ( #9038 )
...
I ran ./update_file_lists.sh to update these files.
3 years ago
Jason Lunn
cbe2eadd5b
Merge pull request #9087 from JasonLunn/jruby_kokoro_test_fix
...
Install core rather than util
3 years ago
Dietmar Scheidl
3bdcc1266b
Fix build on AIX and SunOS ( #8373 ) ( #9065 )
...
* fix includes for AIX and SunOS
3 years ago
mgabris
1b22582bc0
Fix unused variable warnings in extension_set.h ( #9073 )
3 years ago
Jason Lunn
2ccc5df358
Install core rather than util
3 years ago
Elliotte Rusty Harold
b7928164dc
Merge pull request #9066 from elharo/testscope
...
EasyMock should have scope test
3 years ago
Elliotte Rusty Harold
9650e9fe8f
update to 3.18.1 ( #9057 )
...
* update to 3.18.1
3 years ago
Jimmy Yuen Ho Wong
ae4fd1e24b
Fix cl deprecation warning ( #9046 )
3 years ago
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.
3 years ago
NexusNull
5142e362bc
Update README.md ( #9078 )
...
remove dollar sign for easier copying
3 years ago
Alexey Solodkiy
fd5202b6cd
Add twirp to RPC Implementations list ( #9085 )
3 years ago
Adam Cozzette
3afc828309
Sync from Piper @401883098
...
PROTOBUF_SYNC_PIPER
3 years ago
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.
3 years ago
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.
3 years ago
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.
3 years ago
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).
3 years ago
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.
3 years ago
Jason Lunn
b7cc13068d
Merge pull request #9071 from JasonLunn/jruby_explicit_java_dependency
...
Create an explicit build dependency from JRuby on Java
3 years ago
Jason Lunn
803a8cb9c7
Merge pull request #9074 from elharo/elharo-patch-1
...
remove dependency on Jackson
3 years ago
Jason Lunn
0d3f95d7ae
Narrow the scope of the install
3 years ago
Elliotte Rusty Harold
174d95c1a7
remove dependency on Jackson
3 years ago
Jason Lunn
2ed8173481
Bug fix for oracle7 regression
3 years ago
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`.
3 years ago
Jason Lunn
7400f4b342
Merge pull request #9070 from JasonLunn/jruby-version-bump-3.18.1
...
Bump JRuby to 3.18.1
3 years ago
Jason Lunn
7051d82fa9
Bump to 3.18.1
3 years ago
Elliotte Rusty Harold
72fa7269d9
EasyMock should have scope test
3 years ago
Adam Cozzette
0613ca8284
Merge pull request #9061 from acozzette/merge-3.18.x
...
Merge 3.18.x into master
3 years ago
Elliotte Rusty Harold
1e88936fce
Stop using EasyMock classextension ( #9008 )
...
* get rid of classextension and update EasyMock
3 years ago
Adam Cozzette
2a75e8ca58
Merge branch '3.18.x' into merge-3.18.x
3 years ago
deannagarcia
6f99bfc8c6
Merge pull request #9060 from protocolbuffers/toolchain
...
Changing toolchain names
3 years ago
Jason Lunn
d546ec75ef
Merge pull request #9047 from JasonLunn/jruby_test_fixes_redux
...
Adopt pure ruby DSL implementation for JRuby
3 years ago
Deanna Garcia
a793c7f72a
Fixing builds
3 years ago
Adam Cozzette
0dab03ba7b
Update protobuf version to 3.18.1 ( #9051 )
...
* Update protobuf version
* Update PHP release notes in package.xml
3 years ago
deannagarcia
ec494a07f4
Merge pull request #9052 from protocolbuffers/toolchain
...
Change include messages to match docker
3 years ago
Deanna Garcia
95fdfd771d
Change include messages to match docker
3 years ago
Adam Cozzette
40f6669c46
Update changelog for 3.18.1 ( #9050 )
3 years ago
Jason Lunn
05ddf82f20
Remove blank line
3 years ago
Jason Lunn
793c66ddf0
Include JRuby's pom.xml file when updating version numbers
3 years ago