aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Expand)AuthorAgeFilesLines
* Fix lint warnings in the javalite branch.Jisi Liu2017-03-094-0/+9
* Bump lite version 3.0.1Jisi Liu2016-07-281-0/+1
* Include javadoc/source in Java release packages.Feng Xiao2016-07-286-16/+42
* Update maven to call the plugin to generate javalite code.Jisi Liu2016-07-282-1/+3
* update javalite versions.Jisi Liu2016-07-282-2/+2
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-036-29/+29
* added minified JSON formatting functionality with testchezRong2016-07-012-26/+159
* Integrated internal changes from GoogleAdam Cozzette2016-06-2958-3184/+7118
* Describe platform requirements for the compatibility tests.Feng Xiao2016-05-201-0/+4
* Add compatiblity tests against v2.5.0Feng Xiao2016-05-1778-0/+19517
* Merge pull request #1542 from google/beta-3Jisi Liu2016-05-164-4/+4
|\
| * Update version numbers for other languagesJisi Liu2016-05-103-3/+3
| * Update version numbers for beta3Jisi Liu2016-05-101-1/+1
* | Add compatibility notice for Java.Feng Xiao2016-05-111-30/+55
|/
* Remove accidentally restored deleted files.Jisi Liu2016-05-066-1492/+0
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-281-0/+2
|\
| * Added serialVersionUID to ExtendableMessage.Jakub Kukul2016-04-221-0/+2
* | Down integrate from Google internal.Jisi Liu2016-04-2872-2094/+7518
|/
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-301-4/+3
|\
| * Allow custom URLs for Any in JsonFormatPradeep Gollakota2016-03-181-4/+3
* | Integrate google internal changes.Jisi Liu2016-03-3067-1981/+5575
|/
* Remove redundant `the` in comments.Dongjoon Hyun2016-02-032-2/+2
* Restore the license for Internal.javaJisi Liu2016-01-291-1/+29
* Uncomment the test, which was commented out during integrationJisi Liu2016-01-291-185/+184
* Integrate from google internal.Jisi Liu2016-01-29144-741/+660
* Undo the Java module change for integration.Jisi Liu2016-01-28141-0/+0
* move test file (was in wrong place after rebasing on java module refactor)Joshua Humphries2016-01-151-0/+0
* throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-154-4/+291
* Restructuring protobuf to multiple modulesnmittler2016-01-13146-432/+516
* Update version number and fix javadoc errors.Feng Xiao2016-01-061-2/+2
* Fix Java travis tests.Feng Xiao2015-12-212-5/+5
* Make conformance tests build for C++ and Java.Feng Xiao2015-12-161-0/+8
* Remove internal options from proto files.Feng Xiao2015-12-141-4/+4
* Down-integrate from internal code base.Feng Xiao2015-12-1144-854/+2388
* Fix typo in LazyField javadocDave Hughes2015-11-241-2/+2
* include plugin.proto and generated code in protobuf-javaJoshua Humphries2015-11-051-0/+2
* Revert unwanted changes.Jisi Liu2015-10-061-3/+3
* Down-integrate from google internal.Jisi Liu2015-10-059-362/+527
* Fix javadoc errors.Feng Xiao2015-08-274-24/+25
* Update version number.Feng Xiao2015-08-262-5/+5
* Delete incorrectly placed test file.Feng Xiao2015-08-251-132/+0
* Merge Java util package to github.Feng Xiao2015-08-2510-0/+4736
* Cherry-pick Java utf8 change.Feng Xiao2015-08-242-1/+144
* Down-integrate from internal code base.Feng Xiao2015-08-233-0/+135
* Down-integrate from google3.Feng Xiao2015-08-2232-247/+882
* Down-integrate from internal branch.Jisi Liu2015-08-211-0/+1
* Add distributionManagement explicitly to prevent maven from usingBo Yang2015-05-291-0/+10
* Update version number to 3.0.0-alpha-4Bo Yang2015-05-291-1/+1
* Update version number to 3.0.0-alpha-3teboring2015-05-231-2/+2
* Merge pull request #413 from TeBoring/masterPaul Yang2015-05-2133-202/+7141
|\
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 01:03:16 +0000