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
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
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
Bo Yang
509aee4b8b
Sync from Piper @391414001
...
PROTOBUF_SYNC_PIPER
2021-08-17 17:26:34 -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
Adam Cozzette
5d03f8c8a5
Merge tag 'refs/tags/sync-piper' into sync-stage
2021-08-03 12:25:42 -07:00
Adam Cozzette
562fc946c7
Sync from Piper @388508285
...
PROTOBUF_SYNC_PIPER
2021-08-03 11:58:05 -07:00
Derek Perez
c684434ecb
creating a single target to rollup maven artifacts ( #8776 )
2021-06-28 14:38:25 -07:00
deannagarcia
611a08ee00
Merge pull request #8752 from deannagarcia/rulesJvmExternal
...
Create java_export targets
2021-06-25 13:49:30 -07:00
Derek Perez
9276968326
Detect Windows vs Non-Windows execution context in tests. ( #8767 )
2021-06-25 12:55:11 -07:00
Derek Perez
2ea5c9951c
Fix for WIndows Bazel CI ( #8761 )
2021-06-24 10:58:39 -07:00
Derek Perez
91bbdc90e3
Ensure testdata text always uses \n newlines. ( #8756 )
2021-06-22 11:48:33 -07:00
Deanna Garcia
96cffb3ac3
Removing dependencies and renaming bazel version file
2021-06-21 23:03:51 +00:00
Deanna Garcia
89a9f459e9
Changing BUILD files and adding pom templates
2021-06-21 22:28:17 +00:00
deannagarcia
ab229be611
Merge pull request #8709 from protocolbuffers/3.17.x
...
Merge 3.17.x into master
2021-06-09 11:57:34 -04:00
Stanislav Kashirin
37b18c5f12
Remove unnecessary allocation during String field emptiness checks ( #7526 )
2021-06-08 16:48:00 -04:00
Deanna Garcia
367851d124
Update protobuf version
2021-06-04 21:21:39 +00:00
Paul Yang
548e01324e
Merge pull request #8689 from deannagarcia/merge3.17.2
...
Merge 3.17.x into master
2021-06-03 10:39:39 -07:00
Paul Yang
bd42fcc7a3
Merge pull request #8652 from haberman/sync-stage
...
Integrate from Piper for C++, Java, and Python
2021-06-01 15:20:53 -07:00
Deanna Garcia
5b8208ecea
Update protobuf version
2021-05-25 19:36:05 +00:00
Joshua Haberman
9521803d40
Sync from Piper @375548932
...
PROTOBUF_SYNC_PIPER
2021-05-24 13:49:39 -07:00
Adam Cozzette
52784ced2f
Update protobuf version ( #8633 )
2021-05-19 16:43:44 -07:00
Deanna Garcia
380e352b0b
Sync from Piper @373820256
...
PROTOBUF_SYNC_PIPER
2021-05-14 17:50:31 +00:00
Adam Cozzette
652d99a8ee
Update protobuf version ( #8606 )
2021-05-12 16:20:18 -07:00
Adam Cozzette
f807c02226
Update protobuf version to 3.17.0-rc2 ( #8586 )
...
* Update protobuf version
* Updated Kotlin versions and updated script to handle them
2021-05-10 15:31:35 -07:00
Adam Cozzette
7025f37cde
Update protobuf version ( #8575 )
2021-05-07 09:51:15 -07:00
Joshua Haberman
f5fd897c1d
Sync from Piper @371422642
...
PROTOBUF_SYNC_PIPER
2021-04-30 16:12:50 -07:00
Joshua Haberman
ce560630bf
Sync from Piper @368734211
...
PROTOBUF_SYNC_PIPER
2021-04-15 15:53:17 -07:00
Adam Cozzette
5679811239
Merge branch '3.15.x' into merge-3-15-x
2021-04-08 10:54:02 -07:00
Adam Cozzette
436bd7880e
Updated version to 3.15.8 ( #8463 )
...
* Update protobuf version
* Updated CHANGES.txt and package.xml for 3.15.8
2021-04-07 15:38:38 -07:00
Adam Cozzette
87aa9adb86
Merge branch 'master' into 3.15.x
2021-04-02 14:55:02 -07:00
Adam Cozzette
878be3569e
Update protobuf version
2021-04-02 11:06:56 -07:00
Derek Perez
4008d229aa
Sync from Piper @366297034
...
PROTOBUF_SYNC_PIPER
2021-04-01 18:49:52 +00:00
Joshua Haberman
4a6dc34d3a
Sync from Piper @365872496
...
PROTOBUF_SYNC_PIPER
2021-03-30 12:37:31 -07:00
Joshua Haberman
96307d28f6
Sync from Piper @364389596
...
PROTOBUF_SYNC_PIPER
2021-03-22 13:05:55 -07:00
Joshua Haberman
77334e39a7
Merge tag 'refs/tags/sync-piper' into sync-stage
2021-03-22 13:05:55 -07:00
Adam Cozzette
9db84d08fb
Merge branch '3.15.x' into merge-3-15-x
2021-03-12 15:05:10 -08:00
Adam Cozzette
6aa539bf01
Update protobuf version
2021-03-10 14:53:26 -08:00
Adam Cozzette
673971834c
Merge branch 'master' into 3.15.x
2021-03-04 17:53:03 -08:00
Adam Cozzette
4fff47a418
Update protobuf version
2021-03-04 13:35:04 -08:00
Adam Cozzette
541b1735a8
Merge branch 'master' into 3.15.x-202103031418
2021-03-03 15:01:11 -08:00
Adam Cozzette
fd8aabf32d
Update protobuf version
2021-03-03 11:37:48 -08:00
Joshua Haberman
f645c7ed07
Fixed spelling errors surfaced by CodeSpell.
2021-02-26 10:54:13 -08:00
Joshua Haberman
9df42757f9
Sync from Piper @359788468
...
PROTOBUF_SYNC_PIPER
2021-02-26 10:37:37 -08:00