incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1205961 - in /incubator/lcf/trunk: CHANGES.txt framework/agents/pom.xml framework/pull-agent/pom.xml mvn-bootstrap.bat
Date Thu, 24 Nov 2011 19:10:32 GMT
Author: kwright
Date: Thu Nov 24 19:10:31 2011
New Revision: 1205961

URL: http://svn.apache.org/viewvc?rev=1205961&view=rev
Log:
Part of CONNECTORS-292.  Fix some problems with Maven build, including mvn-bootstrap.bat and
disabling HSQLDBext tests because of a properties.xml conflict.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/framework/agents/pom.xml
    incubator/lcf/trunk/framework/pull-agent/pom.xml
    incubator/lcf/trunk/mvn-bootstrap.bat

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1205961&r1=1205960&r2=1205961&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Thu Nov 24 19:10:31 2011
@@ -3,6 +3,11 @@ $Id$
 
 ======================= 0.4-dev =====================
 
+CONNECTORS-292: Problems with mvn-bootstrap.bat.  Also excluded (hopefully
+temporarily) the HSQLDBext tests from the Maven build, since their properties.xml
+conflict with HSQLDB tests.
+(Luca Stancapiano, Karl Wright)
+
 CONNECTORS-293: Fix the how-to-build-and-deploy documentation to include
 the right version of jcifs.
 (Luca Stancapiano, Karl Wright)

Modified: incubator/lcf/trunk/framework/agents/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/agents/pom.xml?rev=1205961&r1=1205960&r2=1205961&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/agents/pom.xml (original)
+++ incubator/lcf/trunk/framework/agents/pom.xml Thu Nov 24 19:10:31 2011
@@ -48,6 +48,7 @@
         <configuration>
           <excludes>
             <exclude>**/*Postgresql*.java</exclude>
+            <exclude>**/*HSQLDBext*.java</exclude>
           </excludes>
           <forkMode>always</forkMode>
           <workingDirectory>target/test-output</workingDirectory>

Modified: incubator/lcf/trunk/framework/pull-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/pom.xml?rev=1205961&r1=1205960&r2=1205961&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/pull-agent/pom.xml (original)
+++ incubator/lcf/trunk/framework/pull-agent/pom.xml Thu Nov 24 19:10:31 2011
@@ -47,6 +47,7 @@
         <configuration>
           <excludes>
             <exclude>**/*Postgresql*.java</exclude>
+            <exclude>**/*HSQLDBext*.java</exclude>
           </excludes>
           <forkMode>always</forkMode>
           <workingDirectory>target/test-output</workingDirectory>

Modified: incubator/lcf/trunk/mvn-bootstrap.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/mvn-bootstrap.bat?rev=1205961&r1=1205960&r2=1205961&view=diff
==============================================================================
--- incubator/lcf/trunk/mvn-bootstrap.bat (original)
+++ incubator/lcf/trunk/mvn-bootstrap.bat Thu Nov 24 19:10:31 2011
@@ -14,14 +14,14 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF 
 rem See the License for the specific language governing permissions and
 rem limitations under the License.
 
-ant download-dependencies
+cmd /c ant download-dependencies
 
-mvn install:install-file -Dfile=lib/jdbcpool-0.99.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool
-Dversion=0.99 -Dpackaging=jar
-mvn install:install-file -Dfile=lib/hsqldb.jar -DgroupId=org.hsqldb -DartifactId=hsqldb -Dversion=2.2.5.10-27-2011
-Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/jdbcpool-0.99.jar -DgroupId=com.bitmechanic -DartifactId=jdbcpool
-Dversion=0.99 -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/hsqldb.jar -DgroupId=org.hsqldb -DartifactId=hsqldb
-Dversion=2.2.5.10-27-2011 -Dpackaging=jar
 
-mvn install:install-file -Dfile=lib/commons-httpclient-mcf.jar -DgroupId=commons-httpclient
-DartifactId=commons-httpclient-mcf -Dversion=3.1  -Dpackaging=jar
-mvn install:install-file -Dfile=lib/xercesImpl-mcf.jar -DgroupId=xerces -DartifactId=xercesImpl-mcf
-Dversion=2.9.1  -Dpackaging=jar
-mvn install:install-file -Dfile=connectors/jcifs/jcifs/jcifs.jar -DgroupId=org.samba.jcifs
-DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/commons-httpclient-mcf.jar -DgroupId=commons-httpclient
-DartifactId=commons-httpclient-mcf -Dversion=3.1  -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=lib/xercesImpl-mcf.jar -DgroupId=xerces -DartifactId=xercesImpl-mcf
-Dversion=2.9.1  -Dpackaging=jar
+cmd /c mvn install:install-file -Dfile=connectors/jcifs/jcifs/jcifs.jar -DgroupId=org.samba.jcifs
-DartifactId=jcifs -Dversion=1.3.17  -Dpackaging=jar
 
 cmd /c mvn install:install-file -Dfile=lib/chemistry-opencmis-server-inmemory-war.war -DgroupId=org.apache.chemistry.opencmis
-DartifactId=chemistry-opencmis-server-inmemory-war -Dversion=0.5.0 -Dpackaging=war
 



Mime
View raw message