[jboss-cvs] JBossAS SVN: r107649 - in projects/jboss-jca/trunk: common and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 17 15:51:14 EDT 2010
Author: jesper.pedersen
Date: 2010-08-17 15:51:14 -0400 (Tue, 17 Aug 2010)
New Revision: 107649
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/common/build.xml
projects/jboss-jca/trunk/ivy.xml
Log:
Use uniqueVersion=false for snapshot releases
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-08-17 19:16:24 UTC (rev 107648)
+++ projects/jboss-jca/trunk/build.xml 2010-08-17 19:51:14 UTC (rev 107649)
@@ -923,6 +923,18 @@
</sequential>
</macrodef>
+ <macrodef name="snapshot-deploy-file">
+ <attribute name="file"/>
+ <attribute name="artifact"/>
+ <sequential>
+ <concat destfile="${target.dir}/@{file}" append="true" force="true" eol="unix">
+mvn deploy:deploy-file -Dfile=$PWD/${name}-@{artifact}.jar -DpomFile=${name}-@{artifact}.xml -DuniqueVersion=false $REPOSITORY
+mvn deploy:deploy-file -Dfile=$PWD/${name}-@{artifact}-sources.jar -DgeneratePom=false -DgroupId=org.jboss.${name} -DartifactId=${name}-@{artifact} -Dversion=$VERSION -Dclassifier=sources -Dpackaging=jar -DuniqueVersion=false $REPOSITORY
+mvn deploy:deploy-file -Dfile=$PWD/${name}-@{artifact}-javadoc.jar -DgeneratePom=false -DgroupId=org.jboss.${name} -DartifactId=${name}-@{artifact} -Dversion=$VERSION -Dclassifier=javadoc -Dpackaging=jar -DuniqueVersion=false $REPOSITORY
+</concat>
+ </sequential>
+ </macrodef>
+
<target name="nexus" depends="clean,artifacts">
<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"
conf="${name}-codegenerator,${name}-common-api,${name}-common-impl,${name}-core-api,${name}-core-impl,${name}-core-spi,${name}-deployers-fungal,${name}-embedded,${name}-embedded-arquillian,${name}-spec-api,${name}-validator,${name}-validator-ant,${name}-validator-cli"
@@ -951,12 +963,13 @@
conf="${name}-codegenerator"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-codegenerator.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-codegenerator" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="codegenerator"/>
- <deploy-file file="snapshot.sh" artifact="codegenerator"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="codegenerator"/>
<!-- ironjacamar-common-api -->
<delete file="${target.dir}/${name}-common-api.xml"/>
@@ -964,12 +977,13 @@
conf="${name}-common-api"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-common-api.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-common-api" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="common-api"/>
- <deploy-file file="snapshot.sh" artifact="common-api"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="common-api"/>
<!-- ironjacamar-common-impl -->
<delete file="${target.dir}/${name}-common-impl.xml"/>
@@ -977,13 +991,14 @@
conf="${name}-common-impl"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-common-impl.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-common-impl" scope="runtime"/>
<dependency artifact="${name}-spec-api" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="common-impl"/>
- <deploy-file file="snapshot.sh" artifact="common-impl"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="common-impl"/>
<!-- ironjacamar-core-api -->
<delete file="${target.dir}/${name}-core-api.xml"/>
@@ -991,14 +1006,15 @@
conf="${name}-core-api"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-core-api.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-core-api" scope="runtime"/>
<dependency artifact="${name}-core-spi" scope="runtime"/>
<dependency artifact="${name}-spec-api" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="core-api"/>
- <deploy-file file="snapshot.sh" artifact="core-api"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="core-api"/>
<!-- ironjacamar-core-impl -->
<delete file="${target.dir}/${name}-core-impl.xml"/>
@@ -1006,7 +1022,8 @@
conf="${name}-core-impl"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-core-impl.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-core-impl" scope="runtime"/>
<dependency artifact="${name}-common-impl" scope="runtime"/>
<dependency artifact="${name}-core-api" scope="runtime"/>
@@ -1015,7 +1032,7 @@
</ivy:makepom>
<deploy-file file="release.sh" artifact="core-impl"/>
- <deploy-file file="snapshot.sh" artifact="core-impl"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="core-impl"/>
<!-- ironjacamar-core-spi -->
<delete file="${target.dir}/${name}-core-spi.xml"/>
@@ -1023,12 +1040,13 @@
conf="${name}-core-spi"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-core-spi.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-core-spi" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="core-spi"/>
- <deploy-file file="snapshot.sh" artifact="core-spi"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="core-spi"/>
<!-- ironjacamar-deployers-fungal -->
<delete file="${target.dir}/${name}-deployers-fungal.xml"/>
@@ -1036,7 +1054,8 @@
conf="${name}-deployers-fungal"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-deployers-fungal.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-deployers-fungal" scope="runtime"/>
<dependency artifact="${name}-common-impl" scope="runtime"/>
<dependency artifact="${name}-core-api" scope="runtime"/>
@@ -1047,7 +1066,7 @@
</ivy:makepom>
<deploy-file file="release.sh" artifact="deployers-fungal"/>
- <deploy-file file="snapshot.sh" artifact="deployers-fungal"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="deployers-fungal"/>
<!-- ironjacamar-embedded -->
<delete file="${target.dir}/${name}-embedded.xml"/>
@@ -1055,12 +1074,13 @@
conf="${name}-embedded"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-embedded.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-embedded" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="embedded"/>
- <deploy-file file="snapshot.sh" artifact="embedded"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="embedded"/>
<!-- ironjacamar-embedded-arquillian -->
<delete file="${target.dir}/${name}-embedded-arquillian.xml"/>
@@ -1068,13 +1088,14 @@
conf="${name}-embedded-arquillian"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-embedded-arquillian.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-embedded-arquillian" scope="runtime"/>
<dependency artifact="${name}-embedded" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="embedded-arquillian"/>
- <deploy-file file="snapshot.sh" artifact="embedded-arquillian"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="embedded-arquillian"/>
<!-- ironjacamar-spec-api -->
<delete file="${target.dir}/${name}-spec-api.xml"/>
@@ -1082,12 +1103,13 @@
conf="${name}-spec-api"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-spec-api.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-spec-api" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="spec-api"/>
- <deploy-file file="snapshot.sh" artifact="spec-api"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="spec-api"/>
<!-- ironjacamar-validator -->
<delete file="${target.dir}/${name}-validator.xml"/>
@@ -1095,14 +1117,15 @@
conf="${name}-validator"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-validator.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-validator" scope="runtime"/>
<dependency artifact="${name}-common-impl" scope="runtime"/>
<dependency artifact="${name}-spec-api" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="validator"/>
- <deploy-file file="snapshot.sh" artifact="validator"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="validator"/>
<!-- ironjacamar-validator-ant -->
<delete file="${target.dir}/${name}-validator-ant.xml"/>
@@ -1110,13 +1133,14 @@
conf="${name}-validator-ant"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-validator-ant.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-validator-ant" scope="runtime"/>
<dependency artifact="${name}-validator" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="validator-ant"/>
- <deploy-file file="snapshot.sh" artifact="validator-ant"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="validator-ant"/>
<!-- ironjacamar-validator-cli -->
<delete file="${target.dir}/${name}-validator-cli.xml"/>
@@ -1124,13 +1148,14 @@
conf="${name}-validator-cli"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-validator-cli.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-validator-cli" scope="runtime"/>
<dependency artifact="${name}-validator" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="validator-cli"/>
- <deploy-file file="snapshot.sh" artifact="validator-cli"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="validator-cli"/>
<!-- ironjacamar-validator-maven -->
<delete file="${target.dir}/${name}-validator-maven.xml"/>
@@ -1138,13 +1163,14 @@
conf="${name}-validator-maven"
ivyfile="${basedir}/ivy.xml"
pomfile="${target.dir}/${name}-validator-maven.xml"
- headerFile="${tools.dir}/mvn/HEADER">
+ headerFile="${tools.dir}/mvn/HEADER"
+ printIvyInfo="false">
<mapping conf="${name}-validator-maven" scope="runtime"/>
<dependency artifact="${name}-validator" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="validator-maven"/>
- <deploy-file file="snapshot.sh" artifact="validator-maven"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="validator-maven"/>
<chmod file="${target.dir}/release.sh" perm="755"/>
<chmod file="${target.dir}/snapshot.sh" perm="755"/>
Modified: projects/jboss-jca/trunk/common/build.xml
===================================================================
--- projects/jboss-jca/trunk/common/build.xml 2010-08-17 19:16:24 UTC (rev 107648)
+++ projects/jboss-jca/trunk/common/build.xml 2010-08-17 19:51:14 UTC (rev 107649)
@@ -256,7 +256,7 @@
</jar>
<mkdir dir="${build.common.dir}/docs"/>
-<!--
+
<mkdir dir="${build.common.dir}/docs/api"/>
<javadoc destdir="${build.common.dir}/docs/api"
doclet="org.jboss.apiviz.APIviz"
@@ -294,7 +294,6 @@
<attribute name="Implementation-Vendor-Id" value="org.jboss"/>
</manifest>
</jar>
--->
<mkdir dir="${build.common.dir}/docs/impl"/>
<javadoc destdir="${build.common.dir}/docs/impl"
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-08-17 19:16:24 UTC (rev 107648)
+++ projects/jboss-jca/trunk/ivy.xml 2010-08-17 19:51:14 UTC (rev 107649)
@@ -28,6 +28,9 @@
revision="${version}">
<license name="lgpl" url="http://repository.jboss.org/licenses/lgpl.txt"/>
<repository name="jboss" url="http://repository.jboss.org"/>
+ <description homepage="http://www.jboss.org/ironjacamar">
+ The IronJacamar project implements the Java EE Connector Architecture 1.6 specification
+ </description>
</info>
<configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default;tools->default;ironjacamar-codegenerator->default;ironjacamar-common-api->default;ironjacamar-common-impl->default;ironjacamar-core-api->default;ironjacamar-core-impl->default;ironjacamar-core-spi->default;ironjacamar-deployers-fungal->default;ironjacamar-embedded->default;ironjacamar-embedded-arquillian->default;ironjacamar-spec-api->default;ironjacamar-validator->default;ironjacamar-validator-ant->default;ironjacamar-validator-cli->default;ironjacamar-validator-maven->default">
@@ -56,20 +59,20 @@
</configurations>
<publications>
- <artifact name="ironjacamar-codegenerator" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-common-api" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-common-impl" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-core-api" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-core-impl" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-core-spi" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-deployers-fungal" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-embedded-arquillian" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-embedded" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-spec-api" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-validator" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-validator-cli" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-validator-ant" type="jar" url="http://repository.jboss.org"/>
- <artifact name="ironjacamar-validator-maven" type="jar" url="http://repository.jboss.org"/>
+ <artifact name="ironjacamar-codegenerator" type="jar"/>
+ <artifact name="ironjacamar-common-api" type="jar"/>
+ <artifact name="ironjacamar-common-impl" type="jar"/>
+ <artifact name="ironjacamar-core-api" type="jar"/>
+ <artifact name="ironjacamar-core-impl" type="jar"/>
+ <artifact name="ironjacamar-core-spi" type="jar"/>
+ <artifact name="ironjacamar-deployers-fungal" type="jar"/>
+ <artifact name="ironjacamar-embedded-arquillian" type="jar"/>
+ <artifact name="ironjacamar-embedded" type="jar"/>
+ <artifact name="ironjacamar-spec-api" type="jar"/>
+ <artifact name="ironjacamar-validator" type="jar"/>
+ <artifact name="ironjacamar-validator-cli" type="jar"/>
+ <artifact name="ironjacamar-validator-ant" type="jar"/>
+ <artifact name="ironjacamar-validator-maven" type="jar"/>
</publications>
<dependencies>
More information about the jboss-cvs-commits
mailing list