[jboss-cvs] jboss-seam/build ...

[Peter Muir]

  User: pmuir   
  Date: 07/10/05 14:10:26

  Modified:    build     ui.pom.xml ci.build.xml parent.pom.xml
  Removed:     build     wagon.pom.xml
  Log:
  Newer maven-ant-tasks with some bug fixes
  
  Revision  Changes    Path
  1.15      +1 -1      jboss-seam/build/ui.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ui.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/ui.pom.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- ui.pom.xml	4 Oct 2007 17:00:10 -0000	1.14
  +++ ui.pom.xml	5 Oct 2007 18:10:26 -0000	1.15
  @@ -19,7 +19,7 @@
         <plugin>
           <groupId>org.richfaces.cdk</groupId>
           <artifactId>maven-cdk-plugin</artifactId>
  -        <version>3.1.1-CR2</version>
  +        <version>3.1.1-GA</version>
           <executions>
             <execution>
               <phase>generate-sources</phase>
  
  
  
  1.6       +14 -16    jboss-seam/build/ci.build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ci.build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/ci.build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ci.build.xml	29 Sep 2007 18:13:59 -0000	1.5
  +++ ci.build.xml	5 Oct 2007 18:10:26 -0000	1.6
  @@ -8,22 +8,14 @@
   	<property name="seam.dir" value="${basedir}/../" />
   	<import file="common.build.xml" />
   
  -	<property name="snapshots.jboss.org" value="dav:https://snapshots.jboss.org/maven2" />
  +	<artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" />
   
   	<target name="initdav">
   		<artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2" />
   	</target>
   
   	<target name="deploySeamSnapshot" description="Deploy a Seam snapshot to snapshots.jboss.org" depends="initdav, initpoms">
  -		<pomfile name="wagon.pom" value="wagon.pom.xml" />
  -		<maven target="deploy:deploy-file" basedir=".">
  -			<arg line="-f ${wagon.pom}" />
  -			<arg line="-DpomFile=${root.pom}" />
  -			<arg line="-Dfile=${root.pom}" />
  -			<arg line="-Durl=${snapshots.jboss.org}" />
  -			<arg line="-DrepositoryId=snapshots.jboss.org" />
  -			<arg line="-DuniqueVersion=false" />
  -		</maven>
  +		<deploySnapshotPom pom="${root.pom}" />
   		<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"/>
  @@ -46,8 +38,12 @@
   	<target name="snapshot">
   		<build target="cleanall" />
   		<build target="dist" />
  -		<antcall target="deploySeamSnapshot" />
  -		<antcall target="tests" />
  +		<ant target="deploySeamSnapshot" antfile="${ant.file}">
  +			<property name="qualifier" value="-SNAPSHOT"/>
  +		</ant>
  +		<antcall target="tests" antfile="${ant.file}">
  +			<property name="qualifier" value="-SNAPSHOT"/>
  +		</antcall>
   	</target>
   
   	<macrodef name="build">
  @@ -64,8 +60,9 @@
       <macrodef name="deploySnapshotPom">
         <attribute name="pom" />
         <sequential>
  -        <artifact:deploy>
  +        <artifact:deploy uniqueVersion="true">
             <pom file="@{pom}" />
  +          <remoteRepository refid="snapshots.jboss.org" />
           </artifact:deploy>
         </sequential>
       </macrodef>
  @@ -76,9 +73,10 @@
   		<attribute name="jar" />
           <attribute name="srcjar" />
   		<sequential>
  -			<artifact:deploy file="@{jar}">
  +			<artifact:deploy file="@{jar}" uniqueVersion="true">
   				<pom file="@{pom}" />
                   <attach file="@{srcjar}" classifier="sources" />
  +				<remoteRepository refid="snapshots.jboss.org" />
   			</artifact:deploy>
   		</sequential>
   	</macrodef>
  
  
  
  1.4       +0 -8      jboss-seam/build/parent.pom.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: parent.pom.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/parent.pom.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- parent.pom.xml	29 Sep 2007 16:46:55 -0000	1.3
  +++ parent.pom.xml	5 Oct 2007 18:10:26 -0000	1.4
  @@ -22,14 +22,6 @@
       </pluginRepository>
     </pluginRepositories>-->
   
  -  <distributionManagement>
  -    <snapshotRepository>
  -      <id>snapshots.jboss.org</id>
  -      <url>dav:https://snapshots.jboss.org/maven2</url>
  -      <uniqueVersion>true</uniqueVersion>
  -    </snapshotRepository>
  -  </distributionManagement>
  -
     <!-- Uncomment to enable newer version of dependency plugin which has the
     dependency:tree command useful for analyzing the dependency tree of a module
     You'll also need the m2-snapshot repository enabled -->