From 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Mon, 10 Nov 2014 17:34:54 -0800
Subject: Down-integrate from internal code base.

---
 java/pom.xml | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

(limited to 'java/pom.xml')

diff --git a/java/pom.xml b/java/pom.xml
index 1e3baa3c..a2bd1d1e 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -130,6 +130,10 @@
                   <arg value="../src/google/protobuf/unittest_lite_imports_nonlite.proto" />
                   <arg value="../src/google/protobuf/unittest_enormous_descriptor.proto" />
                   <arg value="../src/google/protobuf/unittest_no_generic_services.proto" />
+                  <arg value="src/test/java/com/google/protobuf/field_presence_test.proto" />
+                  <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" />
                 </exec>
               </tasks>
               <testSourceRoot>target/generated-test-sources</testSourceRoot>
@@ -164,34 +168,37 @@
             <configuration>
               <includes>
                 <include>**/AbstractMessageLite.java</include>
+                <include>**/AbstractParser.java</include>
+                <include>**/BoundedByteString.java</include>
                 <include>**/ByteString.java</include>
                 <include>**/CodedInputStream.java</include>
                 <include>**/CodedOutputStream.java</include>
+                <include>**/ExtensionLite.java</include>
                 <include>**/ExtensionRegistryLite.java</include>
                 <include>**/FieldSet.java</include>
                 <include>**/GeneratedMessageLite.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>**/MapEntryLite.java</include>
+                <include>**/MapFieldLite.java</include>
                 <include>**/MessageLite.java</include>
                 <include>**/MessageLiteOrBuilder.java</include>
+                <include>**/Parser.java</include>
+                <include>**/ProtocolStringList.java</include>
+                <include>**/RopeByteString.java</include>
                 <include>**/SmallSortedMap.java</include>
                 <include>**/UninitializedMessageException.java</include>
+                <include>**/UnknownFieldSetLite.java</include>
                 <include>**/UnmodifiableLazyStringList.java</include>
-                <include>**/WireFormat.java</include>
-                <include>**/Parser.java</include>
-                <include>**/AbstractParser.java</include>
-                <include>**/BoundedByteString.java</include>
-                <include>**/LiteralByteString.java</include>
-                <include>**/RopeByteString.java</include>
                 <include>**/Utf8.java</include>
-                <include>**/LazyField.java</include>
-                <include>**/LazyFieldLite.java</include>
-                <include>**/ProtocolStringList.java</include>
+                <include>**/WireFormat.java</include>
               </includes>
               <testIncludes>
-                <testInclude>**/LiteTest.java</testInclude>
+                <testInclude>**/**LiteTest.java</testInclude>
                 <testInclude>**/*Lite.java</testInclude>
               </testIncludes>
             </configuration>
@@ -200,7 +207,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <includes>
-                <include>**/LiteTest.java</include>
+                <include>**/**LiteTest.java</include>
               </includes>
             </configuration>
           </plugin>
-- 
cgit v1.2.3