Commit Graph

609 Commits

Author SHA1 Message Date
Adam Cozzette
7c40b2df1f
Update protobuf version (#9167) 2021-10-28 14:07:53 -07:00
Adam Cozzette
c7dfd0d6b9
Align dependency handling with Bazel best practices (#9165)
This commit removes the use of bind() since that function goes against
Bazel best practices:
https://docs.bazel.build/versions/main/external.html#repository-rules-1
The bind() function basically maps a dependency into //external, but
there is no good reason to do this. By mapping dependencies into
//external and relying on this in our own BUILD files, we're forcing
projects that depend on us to do the same. The one bind() call that I
did leave in place was //:python_headers. This one seems to be doing
something complicated I don't fully understand, and I don't want to risk
breaking it.

This change also moves our list of required Maven artifacts into a
constant in protobuf_deps.bzl. This way, projects that depend on us can
refer to this list when they invoke maven_install() and automatically
pull in all the necesary dependencies.

This fixes #9132.
2021-10-28 10:34:54 -07:00
Adam Cozzette
17b30e9647
Update protobuf version (#9119) 2021-10-20 10:14:02 -07:00
Adam Cozzette
3f3e6f47c6
Update version to 3.19.0-rc2 and fix changelog about Java 7 (#9116)
* Update protobuf version

* Update CHANGES.txt to reflect that we're not yet dropping Java 7
2021-10-19 09:01:57 -07:00
Adam Cozzette
519340d662
Update protobuf version (#9106) 2021-10-15 14:33:06 -07:00
Elliotte Rusty Harold
c69b90cb06
deps: update maven-antrun-plugin
fixes #8704
2021-10-13 11:32:48 +00:00
Elliotte Rusty Harold
21873ae54a
Merge pull request #7853 from belugabehr/CopyList
Use ArrayList copy constructor
2021-10-13 11:13:06 +00:00
Adam Cozzette
3e1967e10b
Merge pull request #9090 from acozzette/sync-stage
Integrate from Piper for C++, Java, and Python
2021-10-12 16:37:01 -07:00
Adam Cozzette
9aa1adc60c Removed unused references to easymock_classextension 2021-10-12 15:43:34 -07:00
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
1f66b1b032 Sync from Piper @402594188
PROTOBUF_SYNC_PIPER
2021-10-12 10:19:10 -07: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
Adam Cozzette
3afc828309 Sync from Piper @401883098
PROTOBUF_SYNC_PIPER
2021-10-08 16:45:26 -07: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
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
Joshua Haberman
82deebfa7a Added new Java Lite files to BUILD/pom.xml. 2021-09-28 22:25:19 +00:00
Josh Haberman
129b3e8a98 Merge branch 'master' into sync-stage 2021-09-28 15:28:48 +00:00
Joshua Haberman
567efd4c3e
Merge pull request #9026 from haberman/merge-release
Merge 3.18.x release branch to master
2021-09-27 17:55:39 -07:00
Joshua Haberman
2128ce074f Merge branch '3.18.x' into merge-release 2021-09-27 15:29:06 -07:00
Josh Haberman
624d29d833 Sync from Piper @399250367
PROTOBUF_SYNC_PIPER
2021-09-27 19:18:41 +00:00
Elliotte Rusty Harold
a93074e546
deps: add j2objc annotations (#9005)
* deps: add j2objc annotations

@pzd this will be needed on the next sync with google3
2021-09-22 12:41:03 +00:00
Elliotte Rusty Harold
06cfc9a0e6
docs: 3.18.0 is released 2021-09-20 16:17:31 -04:00
zhangskz
0fe47f3971
Merge branch 'master' into sync-stage 2021-09-13 15:21:57 -07:00
Sandy Zhang
e56c930d39 Fix map_test.proto package name 2021-09-13 22:18:07 +00:00
Elliotte Rusty Harold
5f55fe1d6b
enforce android API level 14 (#8971)
* enforce android API level 14
Add animal-sniffer plugin to check for android compatibility

* Revert "Merge pull request #7855 from belugabehr/ObjectsRequireNonNull"

This reverts commit a3e5587447, reversing
changes made to f79f956b74.
2021-09-13 15:49:00 -04:00
Paul Yang
12fb2b7450
Update protobuf version (#8973)
* Update protobuf version

* Update php notes
2021-09-13 12:34:03 -07:00
Sandy Zhang
6dd2176354 Sync from Piper @396393195
PROTOBUF_SYNC_PIPER
2021-09-13 17:56:05 +00:00
Sandy Zhang
215dd1335b Sync from Piper @395989630
PROTOBUF_SYNC_PIPER
2021-09-10 20:04:52 +00:00
Joshua Haberman
b6d1e05d55 Removed google-internal annotation. 2021-09-09 10:06:21 -07:00
Joshua Haberman
4a81770b7f Reverted package change in test proto. 2021-09-09 10:01:41 -07:00
Joshua Haberman
018e2e7751 Merge tag 'refs/tags/sync-piper' into sync-stage
# Conflicts:
#	src/google/protobuf/descriptor.pb.cc
#	src/google/protobuf/duration.pb.cc
#	src/google/protobuf/timestamp.pb.cc
#	src/google/protobuf/type.pb.cc
#	src/google/protobuf/wrappers.pb.cc
2021-09-09 08:23:12 -07:00
Joshua Haberman
e5c570bb57 Sync from Piper @395706834
PROTOBUF_SYNC_PIPER
2021-09-09 08:21:42 -07:00
Derek Perez
0bab8e808e Addresses duplicates identified in #8925 (#8939)
* Addresses duplicates identified in #8925

java_export aliases the rule name to the full maven_project_jar which consolidates all deps into a merged jar. This is not what we want for Bazel users.

* Update :util to match
2021-08-31 12:19:03 -07:00
Derek Perez
2937b2ca63
Addresses duplicates identified in #8925 (#8939)
* Addresses duplicates identified in #8925

java_export aliases the rule name to the full maven_project_jar which consolidates all deps into a merged jar. This is not what we want for Bazel users.

* Update :util to match
2021-08-31 12:14:11 -07:00
Elliotte Rusty Harold
a3e5587447
Merge pull request #7855 from belugabehr/ObjectsRequireNonNull
Standardize NPE checks on JDK Objects utility
2021-08-29 12:43:27 +00:00
Bo Yang
d8f55782b0 Update protobuf version 2021-08-27 14:39:58 -07:00
Elliotte Rusty Harold
8cf990fc9f
Updtae version to 3.17.3 (#8889) 2021-08-26 09:12:56 -07:00
Adam Cozzette
f78fefc1ff Sync from Piper @392954264
PROTOBUF_SYNC_PIPER
2021-08-25 12:32:02 -07:00
Adam Cozzette
4eed0dab5a Sync from Piper @392076391
PROTOBUF_SYNC_PIPER
2021-08-20 15:05:53 -07:00
Paul Yang
7cbc08615f
Update protobuf version (#8887) 2021-08-18 17:20:20 -07:00
Bo Yang
04fc93f4b5 Merge tag 'refs/tags/sync-piper' into sync-stage 2021-08-18 09:25:50 -07:00
Bo Yang
509aee4b8b Sync from Piper @391414001
PROTOBUF_SYNC_PIPER
2021-08-17 17:26:34 -07:00
Adam Cozzette
0773db2124 Fix Kotlin tests 2021-08-06 09:59:14 -07:00
Adam Cozzette
6cee7c604e Temporarily disable ExtensionRegistryFactoryTest 2021-08-04 14:34:53 -07:00
Adam Cozzette
d46abc1e7e Update BUILD and cmake files and add some missing Java dependencies 2021-08-03 13:44:26 -07:00