[Issue 75] Solve commons-codec conflict on Android

rmistry · rmistry · commit bf9e13ed7b28 · 2012-03-29T10:30:45.000-07:00
http://codereview.appspot.com/5955047/
diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml
@@ -59,6 +59,27 @@
               <goal>run</goal>
             </goals>
           </execution>
+          <!-- Remove extraneous files from the jarjar'ed Apache Commons Codec
+               Library. -->
+          <execution>
+            <id>scrub</id>
+            <phase>install</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <jar destfile="target/scrubbed.jar" filesetmanifest="merge">
+                  <zipfileset src="target/google-http-client-${project.version}.jar">
+                    <exclude name="**/org/apache/commons/codec/language/bm/*.txt"/>
+                    <exclude name="META-INF/*.txt"/>
+                    <exclude name="META-INF/maven/**"/>
+                  </zipfileset>
+                </jar>
+                <copy file="target/scrubbed.jar" tofile="target/google-http-client-${project.version}.jar"/>
+              </target>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
diff --git a/pom.xml b/pom.xml
@@ -194,6 +194,7 @@
           <version>2.3.1</version>
           <configuration>
             <archive>
+              <addMavenDescriptor>false</addMavenDescriptor>
               <manifest>
                 <addClasspath>true</addClasspath>
                 <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
