[jboss-cvs] JBossAS SVN: r111382 - in projects/jboss-jca/trunk: doc/userguide/en-US/modules and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2011-05-16 10:55:00 -0400 (Mon, 16 May 2011)
New Revision: 111382

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/doc/userguide/en-US/modules/preface.xml
Log:
[JBJCA-571] Use deploy-file version 2.6

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2011-05-16 13:18:18 UTC (rev 111381)
+++ projects/jboss-jca/trunk/build.xml	2011-05-16 14:55:00 UTC (rev 111382)
@@ -1117,9 +1117,7 @@
     <attribute name="extension"/>
     <sequential>
       <concat destfile="${target.dir}/@{file}" append="true" force="true" eol="unix">
-mvn deploy:deploy-file -Dfile=$PWD/@{artifact}.@{extension} -DpomFile=@{artifact}.xml $REPOSITORY
-mvn deploy:deploy-file -Dfile=$PWD/@{artifact}-sources.jar -DgeneratePom=false -DgroupId=org.jboss.${name} -DartifactId=@{artifact} -Dversion=$VERSION -Dclassifier=sources -Dpackaging=jar $REPOSITORY
-mvn deploy:deploy-file -Dfile=$PWD/@{artifact}-javadoc.jar -DgeneratePom=false -DgroupId=org.jboss.${name} -DartifactId=@{artifact} -Dversion=$VERSION -Dclassifier=javadoc -Dpackaging=jar $REPOSITORY
+mvn org.apache.maven.plugins:maven-deploy-plugin:2.6:deploy-file -Dfile=$PWD/@{artifact}.@{extension} -DpomFile=@{artifact}.xml -Dsources=$PWD/@{artifact}-sources.jar -Djavadoc=$PWD/@{artifact}-javadoc.jar $REPOSITORY
 </concat>
     </sequential>
   </macrodef>
@@ -1130,9 +1128,7 @@
     <attribute name="extension"/>
     <sequential>
       <concat destfile="${target.dir}/@{file}" append="true" force="true" eol="unix">
-mvn deploy:deploy-file -Dfile=$PWD/@{artifact}.@{extension} -DpomFile=@{artifact}.xml -DuniqueVersion=false $REPOSITORY 
-mvn deploy:deploy-file -Dfile=$PWD/@{artifact}-sources.jar -DgeneratePom=false -DgroupId=org.jboss.${name} -DartifactId=@{artifact} -Dversion=$VERSION -Dclassifier=sources -Dpackaging=jar -DuniqueVersion=false $REPOSITORY
-mvn deploy:deploy-file -Dfile=$PWD/@{artifact}-javadoc.jar -DgeneratePom=false -DgroupId=org.jboss.${name} -DartifactId=@{artifact} -Dversion=$VERSION -Dclassifier=javadoc -Dpackaging=jar -DuniqueVersion=false $REPOSITORY
+mvn org.apache.maven.plugins:maven-deploy-plugin:2.6:deploy-file -Dfile=$PWD/@{artifact}.@{extension} -DpomFile=@{artifact}.xml -Dsources=$PWD/@{artifact}-sources.jar -Djavadoc=$PWD/@{artifact}-javadoc.jar $REPOSITORY
 </concat>
     </sequential>
   </macrodef>
@@ -1143,9 +1139,7 @@
     <attribute name="extension"/>
     <sequential>
       <concat destfile="${target.dir}/@{file}" append="true" force="true" eol="unix">
-mvn install:install-file -Dfile=$PWD/@{artifact}.@{extension} -DpomFile=@{artifact}.xml -DuniqueVersion=false $REPOSITORY -Dversion=$VERSION
-mvn install:install-file -Dfile=$PWD/@{artifact}-sources.jar -DgeneratePom=false -DgroupId=org.jboss.${name} -DartifactId=@{artifact} -Dversion=$VERSION -Dclassifier=sources -Dpackaging=jar -DuniqueVersion=false $REPOSITORY
-mvn install:install-file -Dfile=$PWD/@{artifact}-javadoc.jar -DgeneratePom=false -DgroupId=org.jboss.${name} -DartifactId=@{artifact} -Dversion=$VERSION -Dclassifier=javadoc -Dpackaging=jar -DuniqueVersion=false $REPOSITORY
+mvn install:install-file -Dfile=$PWD/@{artifact}.@{extension} -DpomFile=@{artifact}.xml -Dsources=$PWD/@{artifact}-sources.jar -Djavadoc=$PWD/@{artifact}-javadoc.jar $REPOSITORY
 </concat>
     </sequential>
   </macrodef>

Modified: projects/jboss-jca/trunk/doc/userguide/en-US/modules/preface.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/modules/preface.xml	2011-05-16 13:18:18 UTC (rev 111381)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/preface.xml	2011-05-16 14:55:00 UTC (rev 111382)
@@ -44,7 +44,7 @@
     <title>Thanks to</title>
 
     <para>
-      Dimitris Andreadis, Adrian Brock, Carlo de Wolf, Bruno Georges, Jason Green, Jonathan Halliday,
+      Dimitris Andreadis, Adrian Brock, Carlo de Wolf, Bruno Georges, Paul Gier, Jason Green, Jonathan Halliday,
       Søren Hilmer, Ales Justin, Vicky Kak,  Aslak Knutsen, Sacha Labourey, Mark Little, Alexey Loubyansky, 
       Patrick MacDonald, Andrig Miller, Andrew Lee Rubinger, Heiko Rupp, Anil Saldhana,  
       Scott Stark, Clebert Suconic, Andy Taylor and Jeremy Whiting.