aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * down-integrate internal changesBo Yang2015-05-2133-202/+7141
* | Include well-known types in Java runtime.Feng Xiao2015-05-212-0/+94
|/
* Clean up importsTamir Duberstein2015-04-028-27/+16
* Move `UTF_8` to `Internal`Tamir Duberstein2015-04-0214-34/+33
* Skip 3-byte test in CITamir Duberstein2015-04-021-2/+5
* DRY: Use `Charset` statics to eliminate exceptionsTamir Duberstein2015-04-0216-76/+51
* perf: String#getBytes(Charset) vs getBytes(String)Viktor Szathmáry2015-04-027-28/+117
* WhitespaceTamir Duberstein2015-04-0212-86/+86
* rename python README, and fix markdown in java and python respectivelyjesse2015-03-161-1/+7
* Rename README.txt to README.mdJesse Frankley2015-03-161-0/+0
* Merge pull request #225 from google/post-alpha2-integrateJisi Liu2015-03-0327-210/+1011
|\
| * Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-2827-210/+1011
* | Merge "Add a release profile for Java mvn project, which includes source file...Jisi Liu2015-03-041-0/+58
|\ \
| * | Add a release profile for Java mvn project, which includes source file,Jisi Liu2015-03-031-0/+58
* | | Bump the version number to 3.0.0-alpha-3-preJisi Liu2015-03-021-2/+2
| |/ |/|
* | Merge pull request #216 from cnauroth/Parser-JavaDocJisi Liu2015-02-261-2/+2
|\ \ | |/ |/|
| * Correct JavaDoc return value documentation for Parser#parseDelimitedFrom.cnauroth2015-02-231-2/+2
* | Propogate onChange() event when getFooBuilder() is on an oneof messageJisi Liu2015-02-231-1/+13
* | Fix Java maps reflection to call onChange to populate changes to parentJisi Liu2015-02-232-89/+132
* | Update version number to 3.0.0-alpha-2Jisi Liu2015-02-211-2/+2
|/
* Update version number to v3.0.0-preFeng Xiao2014-12-101-2/+2
* Down-integrate from internal code base.Feng Xiao2014-12-092-1/+8
* Remove usage of features not supported in Java 1.6.Feng Xiao2014-12-031-3/+2
* Update version number to v3.0.0-alpha-1Feng Xiao2014-12-031-2/+2
* Explicitly list all Java lite runtime tests (and exclude those dependingFeng Xiao2014-12-021-2/+4
* Merge pull request #102 from fizbin/bytestring_serializableFeng Xiao2014-11-277-1/+90
|\
| * Add tests for other ByteString subclassesDaniel Martin2014-11-272-0/+37
| * Make ByteStrings serializable with java serialization.Daniel Martin2014-11-255-1/+53
* | Make Java TextFormat.printToUnicodeString() escape newlines.Feng Xiao2014-11-252-6/+15
* | Fix javadoc warnings.Feng Xiao2014-11-252-14/+14
|/
* Down-integrate from internal code base.Feng Xiao2014-11-203-22/+26
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-146-17/+49
* Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobu...Feng Xiao2014-11-114-7/+7
|\
| * typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-084-7/+7
* | Down-integrate from internal code base.Feng Xiao2014-11-1056-291/+5365
|/