Author: norman.richards(a)jboss.com Date: 2009-07-29 13:54:34 -0400 (Wed, 29 Jul 2009) New Revision: 11320 Modified: tags/JBoss_Seam_2_2_0_GA/build/build.properties tags/JBoss_Seam_2_2_0_GA/build/common.build.xml tags/JBoss_Seam_2_2_0_GA/build/embedded/build.xml tags/JBoss_Seam_2_2_0_GA/build/embedded/hibernate-all.pom.xml tags/JBoss_Seam_2_2_0_GA/build/embedded/jboss-embedded-all.pom.xml tags/JBoss_Seam_2_2_0_GA/build/embedded/jboss-embedded.pom.xml tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/hibernate-all.pom.xml tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/jboss-embedded-all.pom.xml tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/jboss-embedded.pom.xml tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/thirdparty-all.pom.xml tags/JBoss_Seam_2_2_0_GA/build/embedded/thirdparty-all.pom.xml tags/JBoss_Seam_2_2_0_GA/build/root.pom.xml Log: JBSEAM-4308 merge 11318:11319 from branch Modified: tags/JBoss_Seam_2_2_0_GA/build/build.properties =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/build.properties 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/build.properties 2009-07-29 17:54:34 UTC (rev 11320) @@ -1,6 +1,6 @@ -offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repo +offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repository/maven2 embedded.poms.dir /home/mnovotny/workspaces/jboss/jboss-seam_2_2/build/embedded embedded.dir /home/mnovotny/projects/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded #embedded.jars.dir /Users/pmuir/tmp/embedded-jboss-beta3/lib #�embedded.dist.zip /Users/pmuir/Desktop/downloads/embedded-jboss-beta3.zip -embedded.version beta3.SP8 \ No newline at end of file +embedded.version beta3.SP9 \ No newline at end of file Modified: tags/JBoss_Seam_2_2_0_GA/build/common.build.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/common.build.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/common.build.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -23,7 +23,7 @@ <property name="maven.settings.xml" location="${build.dir}/settings.xml" /> - <property name="embedded.version" value="beta3.SP8" /> + <property name="embedded.version" value="beta3.SP9" /> <import file="${build.dir}/utilities.build.xml" /> Modified: tags/JBoss_Seam_2_2_0_GA/build/embedded/build.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/embedded/build.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/embedded/build.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -36,6 +36,7 @@ <zipfileset src="${embedded.jars.dir}/thirdparty-all.jar" /> <zipfileset src="${lib.dir}/lucene-core.jar"/> <zipfileset src="${lib.dir}/slf4j-log4j12.jar"/> + <zipfileset src="${lib.dir}/slf4j-api.jar"/> </jar> <copy file="${embedded.jars.dir}/jboss-embedded.jar" todir="${shaded.embedded.jars.dir}" /> <copy file="${embedded.jars.dir}/jboss-embedded-all.jar" todir="${shaded.embedded.jars.dir}" /> Modified: tags/JBoss_Seam_2_2_0_GA/build/embedded/hibernate-all.pom.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/embedded/hibernate-all.pom.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/embedded/hibernate-all.pom.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>hibernate-all</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</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: tags/JBoss_Seam_2_2_0_GA/build/embedded/jboss-embedded-all.pom.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/embedded/jboss-embedded-all.pom.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/embedded/jboss-embedded-all.pom.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>jboss-embedded-all</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</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> @@ -13,7 +13,7 @@ <dependency> <groupId>org.jboss.embedded</groupId> <artifactId>jboss-embedded</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</version> <exclusions> <exclusion></exclusion> </exclusions> Modified: tags/JBoss_Seam_2_2_0_GA/build/embedded/jboss-embedded.pom.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/embedded/jboss-embedded.pom.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/embedded/jboss-embedded.pom.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>jboss-embedded</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</version> <description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all.</description> <dependencies> Modified: tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/hibernate-all.pom.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/hibernate-all.pom.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/hibernate-all.pom.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>hibernate-all</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</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: tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/jboss-embedded-all.pom.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/jboss-embedded-all.pom.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/jboss-embedded-all.pom.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-all</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</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> @@ -13,7 +13,7 @@ <dependency> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-api</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</version> <exclusions> <exclusion></exclusion> </exclusions> Modified: tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/jboss-embedded.pom.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/jboss-embedded.pom.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/jboss-embedded.pom.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-api</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</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: tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/thirdparty-all.pom.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/thirdparty-all.pom.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/embedded/shaded/thirdparty-all.pom.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>thirdparty-all</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</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: tags/JBoss_Seam_2_2_0_GA/build/embedded/thirdparty-all.pom.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/embedded/thirdparty-all.pom.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/embedded/thirdparty-all.pom.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>thirdparty-all</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</version> <description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty dependencies distributed with JBoss AS.</description> </project> Modified: tags/JBoss_Seam_2_2_0_GA/build/root.pom.xml =================================================================== --- tags/JBoss_Seam_2_2_0_GA/build/root.pom.xml 2009-07-29 15:22:25 UTC (rev 11319) +++ tags/JBoss_Seam_2_2_0_GA/build/root.pom.xml 2009-07-29 17:54:34 UTC (rev 11320) @@ -858,7 +858,7 @@ <dependency> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-api</artifactId> - <version>beta3.SP8</version> + <version>beta3.SP9</version> </dependency> <dependency>