Merge pull request #1108 from googlei18n/shade-plugin-alignment

Fix indentation in shade plugin config

java/libphonenumber/pom.xml

@@ -51,8 +51,9 @@
               <relocations>
                 <relocation>
                   <pattern>com.google.protobuf</pattern>
-                  <shadedPattern>com.google.i18n.phonenumbers.repackaged.com.google.protobuf
-</shadedPattern>
+                  <shadedPattern>
+                    com.google.i18n.phonenumbers.repackaged.com.google.protobuf
+                  </shadedPattern>
                 </relocation>
               </relocations>
             </configuration>

java/pending_code_changes.txt

@@ -1 +1,5 @@
-
+Maven changes:
+ - Repackage protobuf runtime dependency to prevent conflicts with clients'
+   protobuf dependencies. Backwards-compatible, so no changes needed for clients
+   who could use the previous release, but enables those with their own protobuf
+   dependencies to use this and future releases without workarounds.