From 6f4b34a0616f3970239b0ce9f4adeb8bfedef40a Mon Sep 17 00:00:00 2001
From: teo_sarca <devnull@localhost>
Date: Wed, 18 Feb 2009 13:17:30 +0000
Subject: [PATCH] BF [ 2605888 ] CreatePOfromRequisition creates more PO than
 needed
 https://sourceforge.net/tracker/index.php?func=detail&aid=2605888&group_id=176962&atid=879332

Fix build failed introduced in rev. 8521
Reason: I used org.apache.commons.collections.keyvalue.MultiKey class which is in commons-collections API but not included in C/STools.jar, just in JasperReportsTools.jar
Action: now C/STools.jar include commons-collections-3.1.jar. I removed from JasperReportsTools.jar
---
 JasperReports/build.xml | 4 ----
 tools/build.xml         | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/JasperReports/build.xml b/JasperReports/build.xml
index 88fd0bc16b..2c7abe5c3f 100644
--- a/JasperReports/build.xml
+++ b/JasperReports/build.xml
@@ -65,7 +65,6 @@
 	      <pathelement path="../lib/oracle.jar"/>
 		  <pathelement path="../JasperReportsTools/lib/jasperreports-3.0.0.jar"/>
 	      <pathelement path="../JasperReportsTools/lib/commons-digester-1.7.jar"/>
-	      <pathelement path="../tools/lib/commons-collections-3.1.jar"/>
 	      <pathelement path="../tools/lib/commons-logging.jar"/>
 	      <pathelement path="../JasperReportsTools/lib/commons-beanutils-1.7.jar"/>      	
       	  <pathelement path="../tools/lib/xercesImpl.jar"/>
@@ -136,9 +135,6 @@
   	  <zipfileset src="../JasperReportsTools/lib/commons-digester-1.7.jar" >
 		<patternset refid="manifest.exclude"/>
 	  </zipfileset>
-  	  <zipfileset src="../tools/lib/commons-collections-3.1.jar" >
-		<patternset refid="manifest.exclude"/>
-	  </zipfileset>
   	  <zipfileset src="../tools/lib/commons-logging.jar" >
 		<patternset refid="manifest.exclude"/>
 	  </zipfileset>
diff --git a/tools/build.xml b/tools/build.xml
index 97e9db43dd..5dfd731334 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -282,6 +282,10 @@
 				<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}" />
 				<attribute name="Implementation-URL" value="http://www.adempiere.org" />
 			</manifest>
+			<!-- Commons -->
+			<zipfileset src="lib/commons-collections-3.1.jar">
+				<patternset refid="manifest.exclude" />
+			</zipfileset>
 		</jar>
 
 	</target>
@@ -420,6 +424,10 @@
 				<attribute name="Implementation-Vendor" value="${env.ADEMPIERE_VENDOR}" />
 				<attribute name="Implementation-URL" value="http://www.adempiere.org" />
 			</manifest>
+			<!-- Commons -->
+			<zipfileset src="lib/commons-collections-3.1.jar">
+				<patternset refid="manifest.exclude" />
+			</zipfileset>
 		</jar>
 
 	</target>