[seam-commits] Seam SVN: r8207 - in branches/Seam_2_0: build and 1 other directory.

[seam-commits at lists.jboss.org]

Author: jbalunas at redhat.com
Date: 2008-05-16 13:31:05 -0400 (Fri, 16 May 2008)
New Revision: 8207

Modified:
   branches/Seam_2_0/build.xml
   branches/Seam_2_0/build/ci.build.xml
   branches/Seam_2_0/build/utilities.build.xml
Log:
Back port of changes to fix hudson/maven build issues.

Modified: branches/Seam_2_0/build/ci.build.xml
===================================================================
--- branches/Seam_2_0/build/ci.build.xml	2008-05-16 16:19:49 UTC (rev 8206)
+++ branches/Seam_2_0/build/ci.build.xml	2008-05-16 17:31:05 UTC (rev 8207)
@@ -79,8 +79,8 @@
 	</target>
 	
 	<target name="deployDocumentation" depends="initdav, initpoms">
-		<artifact:deploy uniqueVersion="false" file="${docs.pom}">
-			<pom file="${docs.pom}" />
+		<artifact:deploy uniqueVersion="false" file="${docs.pom}" settingsFile="${maven.settings.xml}">
+			<pom file="${docs.pom}" settingsFile="${maven.settings.xml}"/>
 			<remoteRepository refId="snapshots.jboss.org" />
 			<attach file="${doc.ref.dir}/target/docbook/publish/en-US/pdf/seam_reference.pdf" classifier="pdf" type="pdf" />
 		</artifact:deploy>
@@ -105,8 +105,8 @@
     <macrodef name="deploySnapshotPom">
         <attribute name="pom" />
         <sequential>
-            <artifact:deploy uniqueVersion="true">
-                <pom file="@{pom}" />
+            <artifact:deploy uniqueVersion="true" settingsFile="${maven.settings.xml}">
+                <pom file="@{pom}" settingsFile="${maven.settings.xml}"/>
                 <remoteRepository refid="snapshots.jboss.org" />
             </artifact:deploy>
         </sequential>
@@ -117,8 +117,8 @@
 		<attribute name="jar" />
         <attribute name="srcjar" />
 		<sequential>
-			<artifact:deploy file="@{jar}" uniqueVersion="true">
-				<pom file="@{pom}" />
+			<artifact:deploy file="@{jar}" uniqueVersion="true" settingsFile="${maven.settings.xml}">
+				<pom file="@{pom}" settingsFile="${maven.settings.xml}" />
                 <attach file="@{srcjar}" classifier="sources" />
 				<remoteRepository refid="snapshots.jboss.org" />
 			</artifact:deploy>

Modified: branches/Seam_2_0/build/utilities.build.xml
===================================================================
--- branches/Seam_2_0/build/utilities.build.xml	2008-05-16 16:19:49 UTC (rev 8206)
+++ branches/Seam_2_0/build/utilities.build.xml	2008-05-16 17:31:05 UTC (rev 8207)
@@ -32,11 +32,11 @@
 		<attribute name="pom" />
 		<sequential>
 			<artifact:dependencies pathId="@{scope}.@{id}.path" filesetId="@{scope}.@{id}.fileset" versionsId="@{scope}.@{id}.versions" useScope="@{scope}" settingsFile="${maven.settings.xml}">
-				<pom file="@{pom}" />
+				<pom file="@{pom}" settingsFile="${maven.settings.xml}" />
 			</artifact:dependencies>
 		</sequential>
 	</macrodef>
-
+	
 	<macrodef name="inlineDependencies">
 		<attribute name="id" />
 		<attribute name="scope" />
@@ -54,18 +54,18 @@
 		<attribute name="pom" />
 		<sequential>
 			<artifact:dependencies pathId="@{scope}.@{id}.path" filesetId="@{scope}.@{id}.fileset" versionsId="@{scope}.@{id}.versions" useScope="@{scope}" sourcesFilesetId="@{scope}.@{id}.source.fileset" settingsFile="${maven.settings.xml}">
-				<pom file="@{pom}" />
+				<pom file="@{pom}" settingsFile="${maven.settings.xml}" />
 			</artifact:dependencies>
 		</sequential>
 	</macrodef>
-
+	
 	<macrodef name="install">
 		<attribute name="pom" default="" />
 		<attribute name="jar" default="" />
 		<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>
@@ -79,7 +79,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>
@@ -94,8 +94,8 @@
 		<attribute name="repositoryId" default="" />
 		<element name="credentials" implicit="true" optional="true" />
 		<sequential>
-			<artifact:deploy file="@{jar}">
-				<pom file="@{pom}" />
+			<artifact:deploy file="@{jar}" settingsFile="${maven.settings.xml}">
+				<pom file="@{pom}" settingsFile="${maven.settings.xml}" />
 				<remoteRepository refId="@{repositoryId}">
 					<credentials />
 				</remoteRepository>
@@ -112,8 +112,8 @@
 		<attribute name="repositoryId" default="" />
 		<element name="credentials" implicit="true" optional="true" />
 		<sequential>
-			<artifact:deploy file="@{jar}" uniqueVersion="@{unique}">
-				<pom file="@{pom}" />
+			<artifact:deploy file="@{jar}" uniqueVersion="@{unique}" settingsFile="${maven.settings.xml}">
+				<pom file="@{pom}" settingsFile="${maven.settings.xml}" />
 				<remoteRepository refId="@{repositoryId}">
 					<credentials />
 				</remoteRepository>

Modified: branches/Seam_2_0/build.xml
===================================================================
--- branches/Seam_2_0/build.xml	2008-05-16 16:19:49 UTC (rev 8206)
+++ branches/Seam_2_0/build.xml	2008-05-16 17:31:05 UTC (rev 8207)
@@ -615,13 +615,13 @@
 		<copy todir="${classes.test.core.dir}">
 			<fileset dir="${classes.core.dir}" includes="**/*.*" />
 		</copy>
-		<artifact:dependencies pathId="remoting.path">
-			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
-		</artifact:dependencies>
+	    <inlineDependencies scope="compile" id="remoting">
+	       <dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
+	    </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>