Author: pete.muir(a)jboss.org Date: 2008-05-16 11:04:01 -0400 (Fri, 16 May 2008) New Revision: 8204 Modified: trunk/build.xml trunk/build/ci.build.xml trunk/build/ci.settings.xml trunk/build/utilities.build.xml Log: Fixes for ci Modified: trunk/build/ci.build.xml =================================================================== --- trunk/build/ci.build.xml 2008-05-16 14:58:43 UTC (rev 8203) +++ trunk/build/ci.build.xml 2008-05-16 15:04:01 UTC (rev 8204) @@ -21,7 +21,7 @@ <deploySnapshotPom pom="${parent.pom}" /> <deploySnapshot pom="${core.pom}" jar="${lib.dir}/jboss-seam.jar" srcjar="${lib.dir}/src/jboss-seam-sources.jar" /> <deploySnapshot pom="${debug.pom}" jar="${lib.dir}/jboss-seam-debug.jar" srcjar="${lib.dir}/src/jboss-seam-debug-sources.jar"/> - <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jbas5-sources.jar"/> + <deploySnapshot pom="${jbas5.pom}" jar="${lib.dir}/interop/jboss-seam-jbas5.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jbas5-sources.jar"/> <deploySnapshot pom="${jul.pom}" jar="${lib.dir}/interop/jboss-seam-jul.jar" srcjar="${lib.dir}/interop/src/jboss-seam-jul-sources.jar"/> <deploySnapshot pom="${wicket.pom}" jar="${lib.dir}/jboss-seam-wicket.jar" srcjar="${lib.dir}/src/jboss-seam-wicket-sources.jar"/> <deploySnapshot pom="${gen.pom}" jar="${lib.dir}/jboss-seam-gen.jar" srcjar="${lib.dir}/src/jboss-seam-gen-sources.jar"/> Modified: trunk/build/ci.settings.xml =================================================================== --- trunk/build/ci.settings.xml 2008-05-16 14:58:43 UTC (rev 8203) +++ trunk/build/ci.settings.xml 2008-05-16 15:04:01 UTC (rev 8204) @@ -49,7 +49,7 @@ <localRepository>/path/to/local/repo</localRepository> --> - <localRepository>${env.WORKSPACE}/m2/repository</localRepository> + <localRepository>/Users/pmuir/tmp/m2/repository</localRepository> <!-- interactiveMode | This will determine whether maven prompts you when it needs input. If set to false, Modified: trunk/build/utilities.build.xml =================================================================== --- trunk/build/utilities.build.xml 2008-05-16 14:58:43 UTC (rev 8203) +++ trunk/build/utilities.build.xml 2008-05-16 15:04:01 UTC (rev 8204) @@ -32,7 +32,7 @@ <attribute name="pom" /> <sequential> <artifact:dependencies pathId=&quot;@{scope}.(a){id}.path&quot; filesetId=&quot;@{scope}.(a){id}.fileset&quot; versionsId=&quot;@{scope}.(a){id}.versions&quot; useScope="@{scope}" settingsFile="${maven.settings.xml}"> - <pom file="@{pom}" /> + <pom file="@{pom}" settingsFile="${maven.settings.xml}" /> </artifact:dependencies> </sequential> </macrodef> @@ -54,7 +54,7 @@ <attribute name="pom" /> <sequential> <artifact:dependencies pathId=&quot;@{scope}.(a){id}.path&quot; filesetId=&quot;@{scope}.(a){id}.fileset&quot; versionsId=&quot;@{scope}.(a){id}.versions&quot; useScope="@{scope}" sourcesFilesetId=&quot;@{scope}.(a){id}.source.fileset&quot; settingsFile="${maven.settings.xml}"> - <pom file="@{pom}" /> + <pom file="@{pom}" settingsFile="${maven.settings.xml}" /> </artifact:dependencies> </sequential> </macrodef> @@ -76,7 +76,7 @@ <element name="args" implicit="true" optional="true" /> <sequential> <artifact:install file="@{jar}" settingsFile="${maven.settings.xml}"> - <pom file="@{pom}" /> + <pom file="@{pom}" settingsFile="${maven.settings.xml}" /> <args /> </artifact:install> </sequential> @@ -90,7 +90,7 @@ <element name="credentials" implicit="true" optional="true" /> <sequential> <artifact:deploy file="@{jar}" uniqueVersion="@{unique}"> - <pom file="@{pom}" /> + <pom file="@{pom}" settingsFile="${maven.settings.xml}" /> <remoteRepository refId="@{repositoryId}"> <credentials /> </remoteRepository> @@ -106,7 +106,7 @@ <element name="credentials" implicit="true" optional="true" /> <sequential> <artifact:deploy file="@{jar}" settingsFile="${maven.settings.xml}"> - <pom file="@{pom}" /> + <pom file="@{pom}" settingsFile="${maven.settings.xml}" /> <remoteRepository refId="@{repositoryId}"> <credentials /> </remoteRepository> @@ -124,7 +124,7 @@ <element name="credentials" implicit="true" optional="true" /> <sequential> <artifact:deploy file="@{jar}" uniqueVersion="@{unique}" settingsFile="${maven.settings.xml}"> - <pom file="@{pom}" /> + <pom file="@{pom}" settingsFile="${maven.settings.xml}" /> <remoteRepository refId="@{repositoryId}"> <credentials /> </remoteRepository> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2008-05-16 14:58:43 UTC (rev 8203) +++ trunk/build.xml 2008-05-16 15:04:01 UTC (rev 8204) @@ -652,13 +652,13 @@ <copy todir="${classes.test.core.dir}"> <fileset dir="${classes.core.dir}" includes="**/*.*" /> </copy> - <artifact:dependencies pathId="remoting.path"> + <inlineDependencies scope="compile" id="remoting"> <dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" /> - </artifact:dependencies> + </inlineDependencies> <path id="test.compile.path"> <path refid="test.core.path" /> <path path="${classes.test.core.dir}" /> - <path refid="remoting.path" /> + <path refid="compile.remoting.path" /> </path> </target>