Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove redundant `the` in comments. | Dongjoon Hyun | 2016-02-03 | 2 | -2/+2 |
| | |||||
* | Restore the license for Internal.java | Jisi Liu | 2016-01-29 | 1 | -1/+29 |
| | |||||
* | Uncomment the test, which was commented out during integration | Jisi Liu | 2016-01-29 | 1 | -185/+184 |
| | |||||
* | Integrate from google internal. | Jisi Liu | 2016-01-29 | 144 | -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 Liu | 2016-01-28 | 141 | -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 Humphries | 2016-01-15 | 1 | -0/+0 |
| | |||||
* | throw IOException instead of InvalidProtocolBufferException when appropriate | Joshua Humphries | 2016-01-15 | 4 | -4/+291 |
| | |||||
* | Restructuring protobuf to multiple modules | nmittler | 2016-01-13 | 146 | -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 Xiao | 2016-01-06 | 1 | -2/+2 |
| | |||||
* | Fix Java travis tests. | Feng Xiao | 2015-12-21 | 2 | -5/+5 |
| | |||||
* | Make conformance tests build for C++ and Java. | Feng Xiao | 2015-12-16 | 1 | -0/+8 |
| | | | | Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433 | ||||
* | Remove internal options from proto files. | Feng Xiao | 2015-12-14 | 1 | -4/+4 |
| | | | | Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9 | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 44 | -854/+2388 |
| | |||||
* | Fix typo in LazyField javadoc | Dave Hughes | 2015-11-24 | 1 | -2/+2 |
| | | | "equals".equals("euqals") == false | ||||
* | include plugin.proto and generated code in protobuf-java | Joshua Humphries | 2015-11-05 | 1 | -0/+2 |
| | |||||
* | Revert unwanted changes. | Jisi Liu | 2015-10-06 | 1 | -3/+3 |
| | |||||
* | Down-integrate from google internal. | Jisi Liu | 2015-10-05 | 9 | -362/+527 |
| | |||||
* | Fix javadoc errors. | Feng Xiao | 2015-08-27 | 4 | -24/+25 |
| | |||||
* | Update version number. | Feng Xiao | 2015-08-26 | 2 | -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 Xiao | 2015-08-25 | 1 | -132/+0 |
| | |||||
* | Merge Java util package to github. | Feng Xiao | 2015-08-25 | 10 | -0/+4736 |
| | |||||
* | Cherry-pick Java utf8 change. | Feng Xiao | 2015-08-24 | 2 | -1/+144 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 | 3 | -0/+135 |
| | |||||
* | Down-integrate from google3. | Feng Xiao | 2015-08-22 | 32 | -247/+882 |
| | |||||
* | Down-integrate from internal branch. | Jisi Liu | 2015-08-21 | 1 | -0/+1 |
| | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | ||||
* | Add distributionManagement explicitly to prevent maven from using | Bo Yang | 2015-05-29 | 1 | -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-4 | Bo Yang | 2015-05-29 | 1 | -1/+1 |
| | |||||
* | Update version number to 3.0.0-alpha-3 | teboring | 2015-05-23 | 1 | -2/+2 |
| | |||||
* | Merge pull request #413 from TeBoring/master | Paul Yang | 2015-05-21 | 33 | -202/+7141 |
|\ | | | | | down-integrate internal changes | ||||
| * | down-integrate internal changes | Bo Yang | 2015-05-21 | 33 | -202/+7141 |
| | | |||||
* | | Include well-known types in Java runtime. | Feng Xiao | 2015-05-21 | 2 | -0/+94 |
|/ | | | | Change-Id: I816fe2fac7fccbcd96dd8510c7c9b5e7996aeadc | ||||
* | Clean up imports | Tamir Duberstein | 2015-04-02 | 8 | -27/+16 |
| | |||||
* | Move `UTF_8` to `Internal` | Tamir Duberstein | 2015-04-02 | 14 | -34/+33 |
| | |||||
* | Skip 3-byte test in CI | Tamir Duberstein | 2015-04-02 | 1 | -2/+5 |
| | |||||
* | DRY: Use `Charset` statics to eliminate exceptions | Tamir Duberstein | 2015-04-02 | 16 | -76/+51 |
| | |||||
* | perf: String#getBytes(Charset) vs getBytes(String) | Viktor Szathmáry | 2015-04-02 | 7 | -28/+117 |
| | |||||
* | Whitespace | Tamir Duberstein | 2015-04-02 | 12 | -86/+86 |
| | |||||
* | rename python README, and fix markdown in java and python respectively | jesse | 2015-03-16 | 1 | -1/+7 |
| | |||||
* | Rename README.txt to README.md | Jesse Frankley | 2015-03-16 | 1 | -0/+0 |
| | |||||
* | Merge pull request #225 from google/post-alpha2-integrate | Jisi Liu | 2015-03-03 | 27 | -210/+1011 |
|\ | | | | | Post alpha2 integrate from google internal for C++ and Java | ||||
| * | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 27 | -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 Liu | 2015-03-04 | 1 | -0/+58 |
|\ \ | | | | | | | | | | file, javadoc packaging and signing." | ||||
| * | | Add a release profile for Java mvn project, which includes source file, | Jisi Liu | 2015-03-03 | 1 | -0/+58 |
| | | | | | | | | | | | | | | | | | | javadoc packaging and signing. Change-Id: I70632f01274b70e6f48dae5f4be15f123eb19a46 | ||||
* | | | Bump the version number to 3.0.0-alpha-3-pre | Jisi Liu | 2015-03-02 | 1 | -2/+2 |
| |/ |/| | | | | | Change-Id: I33479e529b060e4fed532a827a386d3baecc835e | ||||
* | | Merge pull request #216 from cnauroth/Parser-JavaDoc | Jisi Liu | 2015-02-26 | 1 | -2/+2 |
|\ \ | |/ |/| | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom... | ||||
| * | Correct JavaDoc return value documentation for Parser#parseDelimitedFrom. | cnauroth | 2015-02-23 | 1 | -2/+2 |
| | | |||||
* | | Propogate onChange() event when getFooBuilder() is on an oneof message | Jisi Liu | 2015-02-23 | 1 | -1/+13 |
| | | | | | | | | | | | | field. Change-Id: Idb5b53da5accd24038a895aba49b684eeee95814 | ||||
* | | Fix Java maps reflection to call onChange to populate changes to parent | Jisi Liu | 2015-02-23 | 2 | -89/+132 |
| | | | | | | | | | | | | builders. Change-Id: Ibf6ae3c0fe6bc31f74b8018c81a5af461b1c24ea | ||||
* | | Update version number to 3.0.0-alpha-2 | Jisi Liu | 2015-02-21 | 1 | -2/+2 |
|/ | | | | Change-Id: Icecb25db34ae5e6d5142a2d75ca7216ba018abb2 | ||||
* | Update version number to v3.0.0-pre | Feng Xiao | 2014-12-10 | 1 | -2/+2 |
| |