Paul Yang
12fb2b7450
Update protobuf version ( #8973 )
...
* Update protobuf version
* Update php notes
2021-09-13 12:34:03 -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
Bo Yang
d8f55782b0
Update protobuf version
2021-08-27 14:39:58 -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
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
Damon Cai
a420f23d4c
Remove JvmField annotations from Kotlin private properties ( #8804 ) ( #8811 )
2021-07-13 15:25:00 -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
1f1ed9c62f
Changing one more instance of VERSION
2021-06-21 23:07:29 +00: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
Derek Perez
9d9d8ee18d
Removing deprecated TimeUtil class. ( #8749 )
2021-06-18 12:30:27 -07:00
deannagarcia
09588d44b0
Update pom.xml
2021-06-10 11:20:28 -04: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
Deanna Garcia
0717715ae9
Removing more from the pom
2021-06-04 21:14:15 +00:00
Deanna Garcia
5330d0d5da
Updating pom files
2021-06-04 20:47:49 +00:00
deannagarcia
f5a0e3988b
Merge branch 'master' into 3.17.x
2021-06-04 17:22:24 +00:00
Elliotte Rusty Harold
7a374d4a2f
deps: update to Guava 30.1.1 ( #8521 )
...
@eklitzke
2021-06-03 10:40:17 -07: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
Deanna Garcia
50a317556a
Fixing merge conflict
2021-06-02 22:31:51 +00:00
Deanna Garcia
506f2273d1
Merging 3.17.x branch into master
2021-06-02 22:29:40 +00:00
Deanna Garcia
7090f7ab55
Adding dokka to main pom
2021-06-01 23:04:16 +00: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
Adam Cozzette
d2f6d9b721
Merge pull request #8650 from acozzette/merge-3.17.x
...
Merge 3.17.x into master
2021-05-27 08:05:54 -07:00
Deanna Garcia
5b8208ecea
Update protobuf version
2021-05-25 19:36:05 +00:00
Deanna Garcia
021329b7e7
resolving conflicts
2021-05-25 17:27:07 +00:00
Joshua Haberman
a8d8eb17df
Merge tag 'refs/tags/sync-piper' into sync-stage
2021-05-24 13:49:40 -07:00
Joshua Haberman
9521803d40
Sync from Piper @375548932
...
PROTOBUF_SYNC_PIPER
2021-05-24 13:49:39 -07:00
Adam Cozzette
b506c31de0
Merge branch '3.17.x' into merge-3.17.x
2021-05-24 12:24:38 -07:00
Adam Cozzette
52784ced2f
Update protobuf version ( #8633 )
2021-05-19 16:43:44 -07:00
deannagarcia
d1098000ce
Merge branch 'master' into sync-stage
2021-05-18 13:48:32 -07:00
Dennis Shao
3b5f123537
Update pom.xml
2021-05-17 16:57:04 -05:00
Dennis Shao
ecbdbbaaf0
Merge branch 'master' into kotlin-gen-docs
2021-05-17 16:52:39 -05:00
Dennis Shao
31d3098af6
Update pom.xml
...
Add plugin to generate Kotlin docs
2021-05-17 16:51:42 -05:00
David L. Jones
24935638ea
Revert "Merge branch 'kotlin' into master" ( #8622 )
...
This reverts commit 716621a222f0da89d8b6
2021-05-17 14:26:10 -07:00
Dennis Shao
716621a222
Merge branch 'kotlin' into master
2021-05-17 15:58:53 -05:00
Dennis Shao
45aca8d7a0
Update pom.xml for kotlin doc generateor
2021-05-17 20:56:02 +00:00
Deanna Garcia
6da55b2d6b
Add changes to CHANGES.txt
2021-05-14 22:20:48 +00:00
Deanna Garcia
f66dea481d
Merge tag 'refs/tags/sync-piper' into sync-stage
...
# Conflicts:
# java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
# src/google/protobuf/repeated_field_unittest.cc
2021-05-14 21:56:03 +00:00
