From 5ec38746a16e3e3bcd6b130742ac636979803c79 Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Mon, 14 Nov 2016 19:50:39 +0000
Subject: [PATCH] Fix missing directory 'maven' in source release packages,
 adjust the related test-Ant-script to call 'assemble' instead of 'jar' to
 catch something like this in the future. Also exclude some more intermediate
 files/directories from the source package.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1769684 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                     | 9 ++++++++-
 src/integrationtest/build.xml | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 80f11a3e5..6a189f602 100644
--- a/build.xml
+++ b/build.xml
@@ -1958,8 +1958,11 @@ under the License.
             <mappedresources cache="true">
                 <fileset dir="." excludes="build/**,
                       dist*/**,
-                      maven/**,
                       lib/**,
+                      bin/**,
+                      out/**,
+                      sonar/**/target/**,
+                      sonar/*/src/**,
                       compile-lib/**,
                       ooxml-lib/**,
                       scripts/**,
@@ -1970,6 +1973,10 @@ under the License.
                       *.lnk,
                       *.rdf,
                       *.swp,
+                      *.launch,
+                      *.log,
+                      .gradle/**,
+                      .idea/**,
                       .settings/**,
                       .classpath,
                       .settings/**,
diff --git a/src/integrationtest/build.xml b/src/integrationtest/build.xml
index 8409e5354..6af90e77b 100644
--- a/src/integrationtest/build.xml
+++ b/src/integrationtest/build.xml
@@ -77,7 +77,7 @@ Before running this, you should execute the "assemble" target in the main build.
 
         <!-- finally call Ant on the extracted source to check if we can build the packages -->
         <echo message="Building in temporary dir ${dirversion}/"/>
-        <ant dir="${dirversion}" target="jar" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/>
+        <ant dir="${dirversion}" target="assemble" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/>
     </target>
 
     <target name="runCompileTest" depends="init" description="Verify that we can compile most examples without including excelant or scratchpad jars">