diff options
author | Bo Yang <teboring@google.com> | 2015-05-21 14:28:59 -0700 |
---|---|---|
committer | Bo Yang <teboring@google.com> | 2015-05-21 19:32:02 -0700 |
commit | 5db217305f37a79eeccd70f000088a06ec82fcec (patch) | |
tree | be53dcf0c0b47ef9178ab8a6fa5c1946ee84a28f /java/pom.xml | |
parent | 56095026ccc2f755a6fdb296e30c3ddec8f556a2 (diff) | |
download | protobuf-5db217305f37a79eeccd70f000088a06ec82fcec.tar.gz protobuf-5db217305f37a79eeccd70f000088a06ec82fcec.tar.bz2 protobuf-5db217305f37a79eeccd70f000088a06ec82fcec.zip |
down-integrate internal changes
Diffstat (limited to 'java/pom.xml')
-rw-r--r-- | java/pom.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/java/pom.xml b/java/pom.xml index 3eb7a703..9f270113 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -134,6 +134,7 @@ <arg value="src/test/java/com/google/protobuf/map_for_proto2_lite_test.proto" /> <arg value="src/test/java/com/google/protobuf/map_for_proto2_test.proto" /> <arg value="src/test/java/com/google/protobuf/map_test.proto" /> + <arg value="src/test/java/com/google/protobuf/map_initialization_order_test.proto" /> </exec> </tasks> <testSourceRoot>target/generated-test-sources</testSourceRoot> @@ -227,25 +228,33 @@ <includes> <include>**/AbstractMessageLite.java</include> <include>**/AbstractParser.java</include> + <include>**/AbstractProtobufList.java</include> <include>**/BoundedByteString.java</include> + <include>**/BooleanArrayList.java</include> <include>**/ByteString.java</include> <include>**/CodedInputStream.java</include> <include>**/CodedOutputStream.java</include> + <include>**/DoublerrayList.java</include> <include>**/ExtensionLite.java</include> <include>**/ExtensionRegistryLite.java</include> <include>**/FieldSet.java</include> + <include>**/FloatArrayList.java</include> <include>**/GeneratedMessageLite.java</include> + <include>**/IntArrayList.java</include> <include>**/Internal.java</include> <include>**/InvalidProtocolBufferException.java</include> <include>**/LazyFieldLite.java</include> <include>**/LazyStringArrayList.java</include> <include>**/LazyStringList.java</include> <include>**/LiteralByteString.java</include> + <include>**/LongArrayList.java</include> <include>**/MapEntryLite.java</include> <include>**/MapFieldLite.java</include> <include>**/MessageLite.java</include> <include>**/MessageLiteOrBuilder.java</include> + <include>**/MutabilityOracle.java</include> <include>**/Parser.java</include> + <include>**/ProtobufArrayList.java</include> <include>**/ProtocolStringList.java</include> <include>**/RopeByteString.java</include> <include>**/SmallSortedMap.java</include> @@ -257,8 +266,14 @@ </includes> <testIncludes> <testInclude>**/*Lite.java</testInclude> + <testInclude>**/BooleanArrayListTest.java</testInclude> + <testInclude>**/DoubleArrayListTest.java</testInclude> + <testInclude>**/FloatArrayListTest.java</testInclude> + <testInclude>**/IntArrayListTest.java</testInclude> <testInclude>**/LazyMessageLiteTest.java</testInclude> <testInclude>**/LiteTest.java</testInclude> + <testInclude>**/LongArrayListTest.java</testInclude> + <testInclude>**/ProtobufArrayListTest.java</testInclude> <testInclude>**/UnknownFieldSetLiteTest.java</testInclude> </testIncludes> </configuration> |