incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1337452 - in /incubator/lcf/branches/release-0.5-incubating-branch: ./ CHANGES.txt build.xml common-build.xml
Date Sat, 12 May 2012 06:41:32 GMT
Author: kwright
Date: Sat May 12 06:41:31 2012
New Revision: 1337452

URL: http://svn.apache.org/viewvc?rev=1337452&view=rev
Log:
Pull up fix for CONNECTORS-471 from trunk.

Modified:
    incubator/lcf/branches/release-0.5-incubating-branch/   (props changed)
    incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt
    incubator/lcf/branches/release-0.5-incubating-branch/build.xml
    incubator/lcf/branches/release-0.5-incubating-branch/common-build.xml

Propchange: incubator/lcf/branches/release-0.5-incubating-branch/
------------------------------------------------------------------------------
  Merged /incubator/lcf/trunk:r1337350

Modified: incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt?rev=1337452&r1=1337451&r2=1337452&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt (original)
+++ incubator/lcf/branches/release-0.5-incubating-branch/CHANGES.txt Sat May 12 06:41:31 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= Release 0.5.1 =====================
 
+CONNECTORS-471: Replace broken HSQLDB 2.2.8 with a trunk build.
+(Karl Wright)
+
 CONNECTORS-467: Remove outdated taglib directives in web.xml
 (Erlend GarĂ¥sen)
 

Modified: incubator/lcf/branches/release-0.5-incubating-branch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.5-incubating-branch/build.xml?rev=1337452&r1=1337451&r2=1337452&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.5-incubating-branch/build.xml (original)
+++ incubator/lcf/branches/release-0.5-incubating-branch/build.xml Sat May 12 06:41:31 2012
@@ -2744,22 +2744,27 @@ Use Apache Forrest version forrest-0.9-d
     
     <target name="download-hsqldb">
         <mkdir dir="lib"/>
-        <!-- Download and build a jdk-1.5 version of hsqldb 2.2.8 -->
         <mkdir dir="build/download"/>
         <delete dir="build/download/hsqldb"/>
         <antcall target="checkout-source-via-svn">
             <param name="root-dir" value="build/download"/>
-            <param name="svn-url" value="http://hsqldb.svn.sourceforge.net/svnroot/hsqldb/base/tags/2.2.8"/>
+            <param name="svn-url" value="https://hsqldb.svn.sourceforge.net/svnroot/hsqldb/base/trunk"/>
             <param name="dir-name" value="hsqldb"/>
         </antcall>
         <!-- Build it -->
-        <exec dir="build/download/hsqldb/build" executable="cmd" osfamily="windows">
-            <arg line="/c ant.bat hsqldb"/>
-        </exec>
-        <exec dir="build/download/hsqldb/build" executable="ant" osfamily="unix">
-            <arg value="hsqldb" />
-        </exec>
+        <antcall target="build-via-ant">
+            <param name="root-dir" value="build/download/hsqldb/build"/>
+            <param name="target" value="hsqldb"/>
+        </antcall>
         <copy todir="lib" file="build/download/hsqldb/lib/hsqldb.jar"/>
+        <!-- antcall target="download-via-mvn">
+            <param name="project-path" value="org/hsqldb"/>
+            <param name="artifact-version" value="2.2.9-snapshot"/>
+            <param name="target" value="lib"/>
+            <param name="artifact-name" value="hsqldb"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall -->
+        <!-- Build it -->
     </target>
     
     <target name="download-postgresql">

Modified: incubator/lcf/branches/release-0.5-incubating-branch/common-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.5-incubating-branch/common-build.xml?rev=1337452&r1=1337451&r2=1337452&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.5-incubating-branch/common-build.xml (original)
+++ incubator/lcf/branches/release-0.5-incubating-branch/common-build.xml Sat May 12 06:41:31
2012
@@ -54,4 +54,15 @@
         </exec>
     </target>
     
+    <target name="build-via-ant">
+        <exec osfamily="windows" dir="${root-dir}" executable="cmd" failifexecutionfails="true"
failonerror="true">
+            <arg value="/c"/>
+            <arg value="ant.bat"/>
+            <arg value="${target}" />
+        </exec>
+        <exec osfamily="unix" dir="${root-dir}" executable="ant" failifexecutionfails="true"
failonerror="true">
+            <arg value="${target}" />
+        </exec>
+    </target>
+    
 </project>



Mime
View raw message