aboutsummaryrefslogtreecommitdiffhomepage
path: root/java/core
Commit message (Collapse)AuthorAge
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|
* Remove redundant `the` in comments.Gravatar Dongjoon Hyun2016-02-03
|
* Restore the license for Internal.javaGravatar Jisi Liu2016-01-29
|
* Uncomment the test, which was commented out during integrationGravatar Jisi Liu2016-01-29
|
* Integrate from google internal.Gravatar Jisi Liu2016-01-29
| | | | | 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.Gravatar Jisi Liu2016-01-28
| | | | | | | | | 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)Gravatar Joshua Humphries2016-01-15
|
* throw IOException instead of InvalidProtocolBufferException when appropriateGravatar Joshua Humphries2016-01-15
|
* Restructuring protobuf to multiple modulesGravatar nmittler2016-01-13
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.