aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration.
* Undo the Java module change for integration.Jisi Liu2016-01-28141-0/+0
| | | | | | | | | Moving the files to their original location, so that opensource changes can be picked during the internal merge. Those files will be moved into the correct location after merging with internal code. Note: do NOT merge this into master without the other internal down-integration commit.
* 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
| | | | | | | | | 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-212-5/+5
|
* 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-1144-854/+2388
|
* Fix typo in LazyField javadocDave Hughes2015-11-241-2/+2
| | | "equals".equals("euqals") == false
* 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
| | | | | Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other languages are updated to v3.0.0-alpha-4.
* 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
| | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
* Add distributionManagement explicitly to prevent maven from usingBo Yang2015-05-291-0/+10
| | | | | default configuration. In default configuration, maven needs webdav for deployment, which cannot be found in central repository.
* 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 changes
| * down-integrate internal changesBo Yang2015-05-2133-202/+7141
| |
* | Include well-known types in Java runtime.Feng Xiao2015-05-212-0/+94
|/ | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc
* 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
|\ | | | | Post alpha2 integrate from google internal for C++ and Java
| * Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-2827-210/+1011
| | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* | Merge "Add a release profile for Java mvn project, which includes source ↵Jisi Liu2015-03-041-0/+58
|\ \ | | | | | | | | | file, javadoc packaging and signing."
| * | Add a release profile for Java mvn project, which includes source file,Jisi Liu2015-03-031-0/+58
| | | | | | | | | | | | | | | | | | javadoc packaging and signing. Change-Id: I70632f01274b70e6f48dae5f4be15f123eb19a46
* | | Bump the version number to 3.0.0-alpha-3-preJisi Liu2015-03-021-2/+2
| |/ |/| | | | | Change-Id: I33479e529b060e4fed532a827a386d3baecc835e
* | Merge pull request #216 from cnauroth/Parser-JavaDocJisi Liu2015-02-261-2/+2
|\ \ | |/ |/| Correct JavaDoc return value documentation for Parser#parseDelimitedFrom...
| * 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
| | | | | | | | | | | | field. Change-Id: Idb5b53da5accd24038a895aba49b684eeee95814
* | Fix Java maps reflection to call onChange to populate changes to parentJisi Liu2015-02-232-89/+132
| | | | | | | | | | | | builders. Change-Id: Ibf6ae3c0fe6bc31f74b8018c81a5af461b1c24ea
* | Update version number to 3.0.0-alpha-2Jisi Liu2015-02-211-2/+2
|/ | | | Change-Id: Icecb25db34ae5e6d5142a2d75ca7216ba018abb2
* 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
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 08:35:00 +0000