Author: pete.muir(a)jboss.org Date: 2008-01-21 20:52:52 -0500 (Mon, 21 Jan 2008) New Revision: 7171 Modified: trunk/build/common.build.xml trunk/build/embedded/build.xml trunk/build/embedded/hibernate-all.pom.xml trunk/build/embedded/jboss-embedded-all.pom.xml trunk/build/embedded/jboss-embedded.pom.xml trunk/build/embedded/shaded/hibernate-all.pom.xml trunk/build/embedded/shaded/jboss-embedded-all.pom.xml trunk/build/embedded/shaded/jboss-embedded.pom.xml trunk/build/embedded/shaded/thirdparty-all.pom.xml trunk/build/embedded/thirdparty-all.pom.xml trunk/build/root.pom.xml Log: JBSEAM-2349 - upgrade to embedded beta3 Modified: trunk/build/common.build.xml =================================================================== --- trunk/build/common.build.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/common.build.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -19,7 +19,7 @@ <property name="lib.dir" value="${seam.dir}/lib" /> <property name="endorsed.dir" value="${tmp.dir}/endorsed" /> - <property name="embedded.version" value="beta3-SNAPSHOT" /> + <property name="embedded.version" value="beta3" /> <import file="${build.dir}/utilities.build.xml" /> Modified: trunk/build/embedded/build.xml =================================================================== --- trunk/build/embedded/build.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/embedded/build.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -14,6 +14,7 @@ <property name="shaded.embedded.jars.dir" value="${tmp.dir}/embedded"/> <property name="embedded.jars.dir" value="${embedded.dir}/output/lib/embedded-jboss/lib" /> + <property name="embedded.dist.zip" value="${embedded.dir}/embedded-jboss-${embedded.version}.zip" /> <artifact:remoteRepository id="snapshots.jboss.org" url="dav:https://snapshots.jboss.org/maven2" /> <artifact:remoteRepository id="offline.repository.jboss.org" url="file:///${offline.repository.jboss.org}" /> @@ -78,5 +79,17 @@ <authentication username="${username}" password="${password}" /> </deploy> </target> + + <target name="deployEmbeddedRelease" depends="initdav, shadeEmbedded"> + <echo>Using Jars from ${embedded.jars.dir}</echo> + <deploy pom="${embedded.poms.dir}/shaded/jboss-embedded.pom.xml" jar="${shaded.embedded.jars.dir}/jboss-embedded.jar" repositoryId="offline.repository.jboss.org" unique="false"/> + <deploy pom="${embedded.poms.dir}/shaded/jboss-embedded-all.pom.xml" jar="${shaded.embedded.jars.dir}/jboss-embedded-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/> + <deploy pom="${embedded.poms.dir}/shaded/hibernate-all.pom.xml" jar="${shaded.embedded.jars.dir}/hibernate-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/> + <deploy pom="${embedded.poms.dir}/shaded/thirdparty-all.pom.xml" jar="${shaded.embedded.jars.dir}/thirdparty-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/> + <deployWithAttachment pom="${embedded.poms.dir}/jboss-embedded.pom.xml" jar="${embedded.jars.dir}/jboss-embedded.jar" repositoryId="offline.repository.jboss.org" attachment="${embedded.dist.zip}" unique="false"/> + <deploy pom="${embedded.poms.dir}/jboss-embedded-all.pom.xml" jar="${embedded.jars.dir}/jboss-embedded-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/> + <deploy pom="${embedded.poms.dir}/hibernate-all.pom.xml" jar="${embedded.jars.dir}/hibernate-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/> + <deploy pom="${embedded.poms.dir}/thirdparty-all.pom.xml" jar="${embedded.jars.dir}/thirdparty-all.jar" repositoryId="offline.repository.jboss.org" unique="false"/> + </target> </project> \ No newline at end of file Modified: trunk/build/embedded/hibernate-all.pom.xml =================================================================== --- trunk/build/embedded/hibernate-all.pom.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/embedded/hibernate-all.pom.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>hibernate-all</artifactId> - <version>beta3-SNAPSHOT</version> + <version>beta3</version> <description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations)</description> </project> Modified: trunk/build/embedded/jboss-embedded-all.pom.xml =================================================================== --- trunk/build/embedded/jboss-embedded-all.pom.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/embedded/jboss-embedded-all.pom.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>jboss-embedded-all</artifactId> - <version>beta3-SNAPSHOT</version> + <version>beta3</version> <description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description> Modified: trunk/build/embedded/jboss-embedded.pom.xml =================================================================== --- trunk/build/embedded/jboss-embedded.pom.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/embedded/jboss-embedded.pom.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>jboss-embedded</artifactId> - <version>beta3-SNAPSHOT</version> + <version>beta3</version> <description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all.</description> <dependencies> Modified: trunk/build/embedded/shaded/hibernate-all.pom.xml =================================================================== --- trunk/build/embedded/shaded/hibernate-all.pom.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/embedded/shaded/hibernate-all.pom.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>hibernate-all</artifactId> - <version>beta3-SNAPSHOT</version> + <version>beta3</version> <description>The hibernate-all.jar distributed with JBoss Embedded. This contains Hibernate for running in an EJB3 enviroment (Hibernate, Hibernate Annotations, Hibernate EntityManager, Hibernate Validator, Hibernate Commons Annotations) and Hibernate Search (specific to this seam version of hibernate-all)</description> </project> Modified: trunk/build/embedded/shaded/jboss-embedded-all.pom.xml =================================================================== --- trunk/build/embedded/shaded/jboss-embedded-all.pom.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/embedded/shaded/jboss-embedded-all.pom.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-all</artifactId> - <version>beta3-SNAPSHOT</version> + <version>beta3</version> <description>The jboss-embedded-all.jar distributed with JBoss Embedded. This contains all depdencies from JBoss AS that originate in JBoss. This jar has has the org.jboss.embedded packages split out.</description> Modified: trunk/build/embedded/shaded/jboss-embedded.pom.xml =================================================================== --- trunk/build/embedded/shaded/jboss-embedded.pom.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/embedded/shaded/jboss-embedded.pom.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-api</artifactId> - <version>beta3-SNAPSHOT</version> + <version>beta3</version> <description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all. This Seam specific version simply keeps the old jboss-embedded-api name for tooling compatibility</description> <dependencies> Modified: trunk/build/embedded/shaded/thirdparty-all.pom.xml =================================================================== --- trunk/build/embedded/shaded/thirdparty-all.pom.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/embedded/shaded/thirdparty-all.pom.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>thirdparty-all</artifactId> - <version>beta3-SNAPSHOT</version> + <version>beta3</version> <description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty dependencies distributed with JBoss AS. This Seam version also includes lucene, a dependency of hibernate search</description> Modified: trunk/build/embedded/thirdparty-all.pom.xml =================================================================== --- trunk/build/embedded/thirdparty-all.pom.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/embedded/thirdparty-all.pom.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>thirdparty-all</artifactId> - <version>beta3-SNAPSHOT</version> + <version>beta3</version> <description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty dependencies distributed with JBoss AS.</description> </project> Modified: trunk/build/root.pom.xml =================================================================== --- trunk/build/root.pom.xml 2008-01-22 00:45:29 UTC (rev 7170) +++ trunk/build/root.pom.xml 2008-01-22 01:52:52 UTC (rev 7171) @@ -657,14 +657,8 @@ <dependency> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-api</artifactId> - <version>beta3-SNAPSHOT</version> + <version>beta3</version> </dependency> - - <dependency> - <groupId>org.jboss.embedded</groupId> - <artifactId>jboss-embedded-api</artifactId> - <version>beta2</version> - </dependency> <dependency> <groupId>quartz</groupId>