aboutsummaryrefslogtreecommitdiff
path: root/java/util/src
Commit message (Collapse)AuthorAgeFilesLines
* Down integrate from Google internal.Jisi Liu2016-04-284-9/+71
|
* 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
| | | | | | | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128
* | Integrate google internal changes.Jisi Liu2016-03-305-202/+294
|/
* Restructuring protobuf to multiple modulesnmittler2016-01-131-0/+0
| | | | | | | | | protobuf/java will become a parent pom that will contain two modules: core - contains all of the code for the protobuf-java artifact util - contains all of the code for the protobuf-java-util artifact Also cleaned up various Maven warnings.
* Update version number and fix javadoc errors.Feng Xiao2016-01-061-2/+2
|
* Remove internal options from proto files.Feng Xiao2015-12-141-4/+4
| | | | Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9
* Down-integrate from internal code base.Feng Xiao2015-12-117-193/+649
|
* Merge Java util package to github.Feng Xiao2015-08-259-0/+4534