From 5eb64049e1f53c5b69ec7c9bffc523e30269a42a Mon Sep 17 00:00:00 2001
From: Keghani Kouzoujian <keghani@google.com>
Date: Wed, 11 May 2016 15:52:46 +0200
Subject: [PATCH] Fix indentation in shade plugin config

---
 java/libphonenumber/pom.xml   | 5 +++--
 java/pending_code_changes.txt | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml
index 6c3433385..f8005bf3d 100644
--- a/java/libphonenumber/pom.xml
+++ b/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>
diff --git a/java/pending_code_changes.txt b/java/pending_code_changes.txt
index 8b1378917..6cf47def3 100644
--- a/java/pending_code_changes.txt
+++ b/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.