d64a2d9941
Integrated internal changes from Google
...
This includes all internal changes from around May 20 to now.
9 years ago
5dea2017db
Update version numbers for other languages
9 years ago
cf14183bcd
Down integrate from Google internal.
9 years ago
3b3c8abb96
Integrate google internal changes.
9 years ago
4d98369f6d
Allow custom URLs for Any in JsonFormat
...
- Using custom URL for types in Any will no longer throw an
InvalidProtocolBufferException in JsonFormat
- Fixes #1128
9 years ago
5221dcbe47
Integrate from google internal.
...
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
9 years ago
cb3f428810
Undo the Java module change for integration.
...
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.
9 years ago
49efe9d7db
Restructuring protobuf to multiple modules
...
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.
9 years ago
7d075a44c1
Update version number and fix javadoc errors.
9 years ago
af81dcfc2c
Fix Java travis tests.
9 years ago
a0cecfd31a
Make conformance tests build for C++ and Java.
...
Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433
9 years ago
13e1279d86
Remove internal options from proto files.
...
Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9
9 years ago
e841bac4fc
Down-integrate from internal code base.
9 years ago
479a90b4dd
Revert unwanted changes.
9 years ago
46e8ff63cb
Down-integrate from google internal.
9 years ago
ffe9215140
Update version number.
...
Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other
languages are updated to v3.0.0-alpha-4.
9 years ago
fbb3ef28c9
Merge Java util package to github.
9 years ago
Adam Cozzette
Jisi Liu
Pradeep Gollakota
nmittler
Feng Xiao