Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix java compatibilty tests. | Feng Xiao | 2016-10-10 | 1 | -350/+1 |
| | | | | Change-Id: I3ff47358e66965cab34736eed2a477ae29f02f61 | ||||
* | Fix bugs for internal integration. | Bo Yang | 2016-10-10 | 6 | -1583/+0 |
| | |||||
* | Bump version number to 3.1.0-alpha-1. | Bo Yang | 2016-10-10 | 4 | -4/+4 |
| | |||||
* | Integrate internal changes | Bo Yang | 2016-10-10 | 72 | -1703/+6458 |
| | |||||
* | Fix gson dependency. | Bo Yang | 2016-09-21 | 1 | -1/+1 |
| | | | | gson 2.3 has internal bug that it doesn't work with some versions of maven. | ||||
* | Fix erroneous comment regarding String.substring | Patrick Strawderman | 2016-09-16 | 1 | -3/+3 |
| | | | Since Java 7, Strings produced with String.substring do not share byte arrays. | ||||
* | Merge remote-tracking branch 'origin/3.0.x' into merge | Jisi Liu | 2016-09-14 | 3 | -3/+3 |
|\ | |||||
| * | Bump version number to 3.0.2 | Jisi Liu | 2016-09-02 | 3 | -3/+3 |
| | | |||||
| * | Use 64-bit protoc binaries in compatibility tests. | Feng Xiao | 2016-08-31 | 1 | -5/+5 |
| | | | | | | | | | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81 | ||||
* | | Allow the JsonFormat.Parser to ignore unknown fields | Dave Protasowski | 2016-09-08 | 2 | -6/+38 |
| | | | | | | | | The default behaviour of throwing an exception remains | ||||
* | | Use 64-bit protoc binaries in compatibility tests. | Feng Xiao | 2016-08-01 | 1 | -5/+5 |
|/ | | | | | | | Turns out travis doesn't have the library dependencies to run a 32-bit binary. Change-Id: I5fadbcade2eb71c1e9ce21d90fa9459797df0e81 | ||||
* | Bump version number for GA | Jisi Liu | 2016-07-25 | 4 | -4/+4 |
| | |||||
* | Update compatibility tests as well. | Feng Xiao | 2016-07-19 | 3 | -347/+8 |
| | | | | Change-Id: I991396ac6e51e32f3ab1daa501d625f34c3ecb04 | ||||
* | Versioning Java GeneratedMessage. | Feng Xiao | 2016-07-19 | 4 | -347/+2718 |
| | | | | Change-Id: Ib2bb5042deaabdf452d5be2ad1ce40d739ad8d1b | ||||
* | Include javadoc/source in Java release packages. | Feng Xiao | 2016-07-18 | 6 | -16/+42 |
| | | | | | | Also fixed javadoc errors. [ci skip] | ||||
* | Remove Java deterministic API. | Feng Xiao | 2016-07-18 | 1 | -1/+1 |
| | | | | Change-Id: I43f7e04a53d1445dfa86db310bdb18ceb446398c | ||||
* | Fix compatiblity issues. | Feng Xiao | 2016-07-14 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently some public API methods are defined in GenreatedMessage.java and they have a generric return type: class GeneratedMessage { class Builder<BuilderType extends Builder<BuilderType>> { public BuilderType setField(...); public BuilderType setExtension(...); } } With these definitions, the compiled byte code of a callsite will have a direct reference to GeneratedMessage. For example: fooBuilder.setField(...); becomes: ##: invokevirtual // Method Builder.setField:(...)LGeneratedMessage.Builder ##: checkcast // class Builder This will prevent us from updating generated classes to subclass a different versioned GeneratedMessageV3 class in the future (we can't do it in a binary compatible way). This change addresses the problem by overriding these methods directly in the generated class: class Foo { class Builder extends GeneratedMessage.Builder<Builder> { public Builder setField(...) { return super.setField(...); } } } After this, fooBuilder.setField(...) will be compiled to: ##: invokevirtual // Method Builder.setField:(...)LFoo.Builder The callsites will no longer reference GeneratedMessage directly and we can change Foo to subclass GeneratedMessageV3 without breaking binary compatiblity. The downside of this change is: 1. It increases generated code size (though it saves some instructions on the callsites). 2. We can never stop generating these overrides because doing that will break binary compatibility. Change-Id: I879afbbc1325a66324a51565e017143489b06e97 | ||||
* | Merge pull request #1781 from xfxyjwf/update_version | Feng Xiao | 2016-07-14 | 4 | -4/+4 |
|\ | | | | | Update version number to 3.0.0-beta-4 | ||||
| * | Update version number to 3.0.0-beta-4 | Feng Xiao | 2016-07-13 | 4 | -4/+4 |
| | | |||||
* | | Exclude Java lite module from parent pom.xml | Feng Xiao | 2016-07-13 | 1 | -1/+1 |
|/ | |||||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 6 | -18/+143 |
| | |||||
* | Fix spelling in strings and comments | Otto Kekäläinen | 2016-07-03 | 6 | -29/+29 |
| | |||||
* | added minified JSON formatting functionality with test | chezRong | 2016-07-01 | 2 | -26/+159 |
| | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 58 | -3184/+7118 |
| | | | | This includes all internal changes from around May 20 to now. | ||||
* | Describe platform requirements for the compatibility tests. | Feng Xiao | 2016-05-20 | 1 | -0/+4 |
| | |||||
* | Add compatiblity tests against v2.5.0 | Feng Xiao | 2016-05-17 | 78 | -0/+19517 |
| | |||||
* | Merge pull request #1542 from google/beta-3 | Jisi Liu | 2016-05-16 | 4 | -4/+4 |
|\ | | | | | Merge Beta 3 release branch into master | ||||
| * | Update version numbers for other languages | Jisi Liu | 2016-05-10 | 3 | -3/+3 |
| | | |||||
| * | Update version numbers for beta3 | Jisi Liu | 2016-05-10 | 1 | -1/+1 |
| | | |||||
* | | Add compatibility notice for Java. | Feng Xiao | 2016-05-11 | 1 | -30/+55 |
|/ | |||||
* | Remove accidentally restored deleted files. | Jisi Liu | 2016-05-06 | 6 | -1492/+0 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-28 | 1 | -0/+2 |
|\ | |||||
| * | Added serialVersionUID to ExtendableMessage. | Jakub Kukul | 2016-04-22 | 1 | -0/+2 |
| | | |||||
* | | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 72 | -2094/+7518 |
|/ | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-03-30 | 1 | -4/+3 |
|\ | |||||
| * | Allow custom URLs for Any in JsonFormat | Pradeep Gollakota | 2016-03-18 | 1 | -4/+3 |
| | | | | | | | | | | | | - Using custom URL for types in Any will no longer throw an InvalidProtocolBufferException in JsonFormat - Fixes #1128 | ||||
* | | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 67 | -1981/+5575 |
|/ | |||||
* | 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 |
| |