aboutsummaryrefslogtreecommitdiff
path: root/java/util
Commit message (Collapse)AuthorAgeFilesLines
* Use latest maven-compiler-plugin (2.6.0)Christopher Tubbs2016-11-041-5/+17
| | | | | | * Uses build-helper-maven-plugin to add generated sources to the classpath * Fixes an issue building with newer versions of the maven-compiler-plugin (See https://issues.apache.org/jira/browse/MCOMPILER-240)
* Update version number.Bo Yang2016-10-101-1/+1
|
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-10-101-1/+1
|
* Integrate internal changesBo Yang2016-10-106-159/+363
|
* Fix gson dependency.Bo Yang2016-09-211-1/+1
| | | | gson 2.3 has internal bug that it doesn't work with some versions of maven.
* Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-141-1/+1
|\
| * Bump version number to 3.0.2Jisi Liu2016-09-021-1/+1
| |
* | Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-082-6/+38
|/ | | | The default behaviour of throwing an exception remains
* Bump version number for GAJisi Liu2016-07-251-1/+1
|
* Update version number to 3.0.0-beta-4Feng Xiao2016-07-131-1/+1
|
* Integrate from internal code base.Feng Xiao2016-07-132-17/+45
|
* added minified JSON formatting functionality with testchezRong2016-07-012-26/+159
|
* Integrated internal changes from GoogleAdam Cozzette2016-06-2910-1149/+1602
| | | | This includes all internal changes from around May 20 to now.
* Update version numbers for other languagesJisi Liu2016-05-101-1/+1
|
* 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-132-142/+47
| | | | | | | | | 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
|
* Fix Java travis tests.Feng Xiao2015-12-211-3/+3
|
* Make conformance tests build for C++ and Java.Feng Xiao2015-12-161-0/+8
| | | | Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433
* 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
|
* Update version number.Feng Xiao2015-08-261-3/+3
| | | | | Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other languages are updated to v3.0.0-alpha-4.
* Merge Java util package to github.Feng Xiao2015-08-2510-0/+4736