Jisi Liu
cf14183bcd
Down integrate from Google internal.
2016-04-28 14:34:59 -07:00
Jisi Liu
0de06f54bc
Merge branch 'master' of github.com:google/protobuf
2016-03-30 11:43:44 -07:00
Jisi Liu
3b3c8abb96
Integrate google internal changes.
2016-03-30 11:39:59 -07:00
Pradeep Gollakota
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
2016-03-18 23:06:14 -07:00
nmittler
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.
2016-01-13 08:15:15 -08:00
Feng Xiao
7d075a44c1
Update version number and fix javadoc errors.
2016-01-06 15:47:41 -08:00
Feng Xiao
af81dcfc2c
Fix Java travis tests.
2015-12-21 03:25:59 -08:00
Feng Xiao
a0cecfd31a
Make conformance tests build for C++ and Java.
...
Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433
2015-12-16 13:38:10 -08:00
Feng Xiao
13e1279d86
Remove internal options from proto files.
...
Change-Id: I3daf32cb93dfe0fca38f8b48615ccfc307f748e9
2015-12-14 15:54:26 -08:00
Feng Xiao
e841bac4fc
Down-integrate from internal code base.
2015-12-11 17:10:28 -08:00
Feng Xiao
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.
2015-08-26 15:11:43 -07:00
Feng Xiao
fbb3ef28c9
Merge Java util package to github.
2015-08-25 14:32:09 -07:00
