Fix regression that renamed the same proto in 2 different classes dur…

…ing shading...
GoogleCloudPlatform · Nov 9, 2024 · 0db04e3 · 0db04e3
1 parent 7c1cfc9
commit 0db04e3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml
@@ -54,10 +54,6 @@
                   <pattern>com.google.apphosting.datastore.proto2api.DatastoreV3Pb</pattern>
                   <shadedPattern>com.google.apphosting.api.proto2api.DatastorePb</shadedPattern>
                 </relocation>
-                <relocation>
-                  <pattern>com.google.apphosting.datastore.proto2api.DatastoreV3Pb</pattern>
-                  <shadedPattern>com.google.apphosting.api.DatastorePb</shadedPattern>
-                </relocation>
                 <relocation>
                   <!-- Apache commons codec is repackaged via one of the 'android' dependencies                       into com.google.api.client.repackaged. -->
                   <pattern>com.google.api.client.repackaged.org.apache.commons.codec</pattern>

diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml
@@ -71,10 +71,6 @@
               <createSourcesJar>true</createSourcesJar>
               <shadeSourcesContent>true</shadeSourcesContent>
               <relocations>
-                <relocation>
-                  <pattern>com.google.apphosting.datastore.proto2api.DatastoreV3Pb</pattern>
-                  <shadedPattern>com.google.apphosting.api.DatastorePb</shadedPattern>
-                </relocation>
                 <relocation>
                   <pattern>com.google.apphosting.datastore.proto2api.DatastoreV3Pb</pattern>
                   <shadedPattern>com.google.apphosting.api.proto2api.DatastorePb</shadedPattern>