aboutsummaryrefslogtreecommitdiffhomepage
path: root/java
Commit message (Expand)AuthorAge
* Merge pull request #2394 from cwelton/formattingGravatar Feng Xiao2016-12-08
|\
| * oneOf fix for JsonFormat includingDefaultValueFieldsGravatar Caleb Welton2016-12-05
* | Change CodedInputStream#DEFAULT_SIZE_LIMIT from 64MB toGravatar Michael Stack2016-12-01
* | Merge branch 'master' into down-integrate-with-msvc-fixGravatar Adam Cozzette2016-11-17
|\|
* | Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
| * #2356 : fix ExceptionInInitializerError on IBM J9Gravatar Time2016-11-11
| * Use latest maven-compiler-plugin (2.6.0)Gravatar Christopher Tubbs2016-11-04
| * Hacking ByteBufferWriter to work with GAEGravatar nmittler2016-10-20
|/
* Update version number.Gravatar Bo Yang2016-10-10
* Update version number.Gravatar Feng Xiao2016-10-10
* Fix java compatibilty tests.Gravatar Feng Xiao2016-10-10
* Fix bugs for internal integration.Gravatar Bo Yang2016-10-10
* Bump version number to 3.1.0-alpha-1.Gravatar Bo Yang2016-10-10
* Integrate internal changesGravatar Bo Yang2016-10-10
* Fix gson dependency.Gravatar Bo Yang2016-09-21
* Fix erroneous comment regarding String.substringGravatar Patrick Strawderman2016-09-16
* Merge remote-tracking branch 'origin/3.0.x' into mergeGravatar Jisi Liu2016-09-14
|\
* | Allow the JsonFormat.Parser to ignore unknown fieldsGravatar Dave Protasowski2016-09-08
| * Bump version number to 3.0.2Gravatar Jisi Liu2016-09-02
| * Use 64-bit protoc binaries in compatibility tests.Gravatar Feng Xiao2016-08-31
* | Use 64-bit protoc binaries in compatibility tests.Gravatar Feng Xiao2016-08-01
|/
* Bump version number for GAGravatar Jisi Liu2016-07-25
* Update compatibility tests as well.Gravatar Feng Xiao2016-07-19
* Versioning Java GeneratedMessage.Gravatar Feng Xiao2016-07-19
* Include javadoc/source in Java release packages.Gravatar Feng Xiao2016-07-18
* Remove Java deterministic API.Gravatar Feng Xiao2016-07-18
* Fix compatiblity issues.Gravatar Feng Xiao2016-07-14
* Merge pull request #1781 from xfxyjwf/update_versionGravatar Feng Xiao2016-07-14
|\
* | Exclude Java lite module from parent pom.xmlGravatar Feng Xiao2016-07-13
| * Update version number to 3.0.0-beta-4Gravatar Feng Xiao2016-07-13
|/
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
* Fix spelling in strings and commentsGravatar Otto Kekäläinen2016-07-03
* added minified JSON formatting functionality with testGravatar chezRong2016-07-01
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
* Describe platform requirements for the compatibility tests.Gravatar Feng Xiao2016-05-20
* Add compatiblity tests against v2.5.0Gravatar Feng Xiao2016-05-17
* Merge pull request #1542 from google/beta-3Gravatar Jisi Liu2016-05-16
|\
* | Add compatibility notice for Java.Gravatar Feng Xiao2016-05-11
| * Update version numbers for other languagesGravatar Jisi Liu2016-05-10
| * Update version numbers for beta3Gravatar Jisi Liu2016-05-10
|/
* Remove accidentally restored deleted files.Gravatar Jisi Liu2016-05-06
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-28
|\
* | Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
| * Added serialVersionUID to ExtendableMessage.Gravatar Jakub Kukul2016-04-22
|/
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-03-30
|\
* | Integrate google internal changes.Gravatar Jisi Liu2016-03-30
| * Allow custom URLs for Any in JsonFormatGravatar Pradeep Gollakota2016-03-18
|/
* Remove redundant `the` in comments.Gravatar Dongjoon Hyun2016-02-03
* Restore the license for Internal.javaGravatar Jisi Liu2016-01-29
* Uncomment the test, which was commented out during integrationGravatar Jisi Liu2016-01-29