Re: [Cruisecontrol-checkins] SF.net SVN: cruisecontrol:[4638] trunk/cruisecontrol/build.xml

Dan - would you mind testing these latest changes?  I seem to recall you were running CruiseControl locally, or maybe just testing it locally, in such a way that depended on all of the .jar files being present in a single directory.  I want to make sure this didn't break anything for you.


-----Original Message-----
From: [email protected]
Sent: Friday, January 17, 2014 15:59
To: [email protected]
Subject: [Cruisecontrol-checkins] SF.net SVN: cruisecontrol:[4638] trunk/cruisecontrol/build.xml

Revision: 4638
          http://sourceforge.net/p/cruisecontrol/code/4638
Author:   sl4mmy
Date:     2014-01-17 21:59:52 +0000 (Fri, 17 Jan 2014)
Log Message:
-----------
Copy XPP and XStream into binary release zip

Make sure we explicitly copy both jars into the binary release zip because
they live in the shared lib/ directory.  This temporarily means there will
be duplicate copies in both the source tree as well as cruisecontrol.jar and
dashboard.war.  I plan on fixing that soon, but in the meantime this is
necessary for upgrading XStream to work with JDK 7.

Modified Paths:
--------------
    trunk/cruisecontrol/build.xml

Modified: trunk/cruisecontrol/build.xml
===================================================================
--- trunk/cruisecontrol/build.xml	2014-01-17 21:26:28 UTC (rev 4637)
+++ trunk/cruisecontrol/build.xml	2014-01-17 21:59:52 UTC (rev 4638)
@@ -155,6 +155,8 @@
             <zipfileset dir="lib/aspirin/v0.8.3" includes="aspirin.jar" prefix="${cc.bin.zip.prefix}/lib"/>
             <zipfileset dir="lib/commons-pool/v1.5.4" includes="commons-pool-1.5.4.jar" prefix="${cc.bin.zip.prefix}/lib"/>
             <zipfileset dir="lib/dnsjava/v2.0.8" includes="dnsjava-2.0.8.jar" prefix="${cc.bin.zip.prefix}/lib"/>
+            <zipfileset dir="lib/xpp3/v1.1.4c" includes="xpp3-1.1.4c.jar" prefix="${cc.bin.zip.prefix}/lib"/>
+            <zipfileset dir="lib/xstream/v1.4.6" includes="xstream-1.4.6.jar" prefix="${cc.bin.zip.prefix}/lib"/>
         </zip>
     </target>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Cruisecontrol-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/cruisecontrol-checkins



------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk