Author: manaRH Date: 2009-09-11 06:39:24 -0400 (Fri, 11 Sep 2009) New Revision: 11477 Modified: branches/enterprise/JBPAPP_5_0/build/build.properties branches/enterprise/JBPAPP_5_0/build/common.build.xml branches/enterprise/JBPAPP_5_0/build/embedded/build.xml branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml branches/enterprise/JBPAPP_5_0/build/root.pom.xml branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml Log: JBPAPP-2774 Modified: branches/enterprise/JBPAPP_5_0/build/build.properties =================================================================== --- branches/enterprise/JBPAPP_5_0/build/build.properties 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/build.properties 2009-09-11 10:39:24 UTC (rev 11477) @@ -1,6 +1,6 @@ -offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repo -embedded.poms.dir /home/mnovotny/workspaces/jboss/jboss-seam_2_2/build/embedded -embedded.dir /home/mnovotny/projects/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded +offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repository/maven2 +embedded.poms.dir /home/mnovotny/workspaces/jboss/jboss-seam-2_2_eap5/build/embedded +embedded.dir /home/mnovotny/projects/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/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.SP7 \ No newline at end of file +embedded.version beta3.SP11 \ No newline at end of file Modified: branches/enterprise/JBPAPP_5_0/build/common.build.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/common.build.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/common.build.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -23,7 +23,7 @@ <property name="maven.settings.xml" location="${build.dir}/settings.xml" /> - <property name="embedded.version" value="beta3.SP9" /> + <property name="embedded.version" value="beta3.SP11" /> <import file="${build.dir}/utilities.build.xml" /> Modified: branches/enterprise/JBPAPP_5_0/build/embedded/build.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/embedded/build.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/embedded/build.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -32,11 +32,9 @@ <zipfileset src="${embedded.jars.dir}/hibernate-all.jar" /> <zipfileset src="${lib.dir}/hibernate-search.jar" /> </jar> - <jar destfile="${shaded.embedded.jars.dir}/thirdparty-all.jar"> + <jar destfile="${shaded.embedded.jars.dir}/thirdparty-all.jar" duplicate="preserve"> <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: branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>hibernate-all</artifactId> - <version>beta3.SP9</version> + <version>beta3.SP11</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: branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>jboss-embedded-all</artifactId> - <version>beta3.SP9</version> + <version>beta3.SP11</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.SP9</version> + <version>beta3.SP11</version> <exclusions> <exclusion></exclusion> </exclusions> Modified: branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>jboss-embedded</artifactId> - <version>beta3.SP9</version> + <version>beta3.SP11</version> <description>This jar has the org.jboss.embedded packages split out from jboss-embedded-all.</description> <dependencies> Modified: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>hibernate-all</artifactId> - <version>beta3.SP9</version> + <version>beta3.SP11</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: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-all</artifactId> - <version>beta3.SP9</version> + <version>beta3.SP11</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.SP9</version> + <version>beta3.SP11</version> <exclusions> <exclusion></exclusion> </exclusions> Modified: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-api</artifactId> - <version>beta3.SP9</version> + <version>beta3.SP11</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: branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>thirdparty-all</artifactId> - <version>beta3.SP9</version> + <version>beta3.SP11</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: branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>thirdparty-all</artifactId> - <version>beta3.SP9</version> + <version>beta3.SP11</version> <description>The thirdparty-all.jar distributed with JBoss Embedded. This contains thirdparty dependencies distributed with JBoss AS.</description> </project> Modified: branches/enterprise/JBPAPP_5_0/build/root.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -791,7 +791,7 @@ <dependency> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-api</artifactId> - <version>beta3.SP9</version> + <version>beta3.SP11</version> </dependency> <dependency> Modified: branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml 2009-09-11 06:36:02 UTC (rev 11476) +++ branches/enterprise/JBPAPP_5_0/seam-gen/ivy/ivy-build.xml 2009-09-11 10:39:24 UTC (rev 11477) @@ -12,7 +12,7 @@ <property name="seam.version" value="2.1.2"/> <property name="jsf.version" value="1.2_12"/> <property name="richfaces.version" value="3.3.1.GA"/> - <property name="jboss-embedded.version" value="beta3.SP9"/> + <property name="jboss-embedded.version" value="beta3.SP11"/> <target name="init-ivy"> <available property="ivy.installed" value="true" file="${ivy.jar.file}" type="file"/>