| Index: third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto
|
| diff --git a/third_party/protobuf/java/util/src/test/java/com/google/protobuf/util/json_test.proto b/third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto
|
| similarity index 77%
|
| rename from third_party/protobuf/java/util/src/test/java/com/google/protobuf/util/json_test.proto
|
| rename to third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto
|
| index 509c1d69743bfa7afabf63427d84e4af7425e145..686edc422183d34d3a67130d112fa76d9bf6588e 100644
|
| --- a/third_party/protobuf/java/util/src/test/java/com/google/protobuf/util/json_test.proto
|
| +++ b/third_party/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto
|
| @@ -28,6 +28,36 @@
|
| // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +// Protocol Buffers - Google's data interchange format
|
| +// Copyright 2008 Google Inc. All rights reserved.
|
| +// https://developers.google.com/protocol-buffers/
|
| +//
|
| +// Redistribution and use in source and binary forms, with or without
|
| +// modification, are permitted provided that the following conditions are
|
| +// met:
|
| +//
|
| +// * Redistributions of source code must retain the above copyright
|
| +// notice, this list of conditions and the following disclaimer.
|
| +// * Redistributions in binary form must reproduce the above
|
| +// copyright notice, this list of conditions and the following disclaimer
|
| +// in the documentation and/or other materials provided with the
|
| +// distribution.
|
| +// * Neither the name of Google Inc. nor the names of its
|
| +// contributors may be used to endorse or promote products derived from
|
| +// this software without specific prior written permission.
|
| +//
|
| +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
| +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| +
|
| syntax = "proto3";
|
|
|
| package json_test;
|
| @@ -159,6 +189,7 @@ message TestFieldMask {
|
| message TestStruct {
|
| google.protobuf.Struct struct_value = 1;
|
| google.protobuf.Value value = 2;
|
| + google.protobuf.ListValue list_value = 3;
|
| }
|
|
|
| message TestAny {
|
|
|