Merge pull request #828 from couchbase/feature/issue_1173

Fixed Java Core 1173 - Zip file contains duplicated jar and aar files

Author: Hideki Itakura

release/assembly.xml

@@ -7,21 +7,16 @@
     </formats>
     <files>
         <file>
-            <source> ${ZIP_HOME}/LICENSE.TXT     </source>
+            <source> ${ZIP_HOME}/LICENSE.TXT </source>
             <outputDirectory>/</outputDirectory>
             <filtered>false</filtered>
         </file>
-                                 <!-- locally built  -->
+        <!-- locally built  -->
         <file>
             <source> ${ZIP_HOME}/${JAR_JAVA_CORE} </source>
             <outputDirectory>/</outputDirectory>
             <filtered>false</filtered>
         </file>
-        <file>
-            <source> ${ZIP_HOME}/${JAR_AND_CLASS} </source>
-            <outputDirectory>/</outputDirectory>
-            <filtered>false</filtered>
-        </file>
         <file>
             <source> ${ZIP_HOME}/${AND_CLASS_AAR} </source>
             <outputDirectory>/</outputDirectory>
@@ -37,27 +32,6 @@
             <outputDirectory>/</outputDirectory>
             <filtered>false</filtered>
         </file>
-
-        <file>
-            <source> ${ZIP_HOME}/${POM_JAVA_CORE} </source>
-            <outputDirectory>/</outputDirectory>
-            <filtered>false</filtered>
-        </file>
-        <file>
-            <source> ${ZIP_HOME}/${POM_AND_CLASS} </source>
-            <outputDirectory>/</outputDirectory>
-            <filtered>false</filtered>
-        </file>
-        <file>
-            <source> ${ZIP_HOME}/${POM_JA_SCRIPT} </source>
-            <outputDirectory>/</outputDirectory>
-            <filtered>false</filtered>
-        </file>
-        <file>
-            <source> ${ZIP_HOME}/${POM_JLISTENER} </source>
-            <outputDirectory>/</outputDirectory>
-            <filtered>false</filtered>
-        </file>
         <file>
             <source> ${ZIP_HOME}/couchbase-lite-android-forestdb-${REVISION}.aar</source>
             <outputDirectory>/</outputDirectory>
@@ -78,13 +52,7 @@
             <outputDirectory>/</outputDirectory>
             <filtered>false</filtered>
         </file>
-
-        <file>
-            <source> ${ZIP_HOME}/${JAR_COLLATORS} </source>
-            <outputDirectory>/</outputDirectory>
-            <filtered>false</filtered>
-        </file>
-                                 <!-- third-party    -->
+        <!-- third-party    -->
         <file>
             <source> ${ZIP_HOME}/rhino-${rhino.version}.jar                </source>
             <outputDirectory>/</outputDirectory>