Author: manaRH Date: 2011-08-24 06:26:17 -0400 (Wed, 24 Aug 2011) New Revision: 14154 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 Log: JBPAPP-7058 - upgrading facelets and JBoss Embedded Modified: branches/enterprise/JBPAPP_5_0/build/build.properties =================================================================== --- branches/enterprise/JBPAPP_5_0/build/build.properties 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/build.properties 2011-08-24 10:26:17 UTC (rev 14154) @@ -1,6 +1,7 @@ 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.poms.dir /home/mnovotny/workspaces/seam/jboss-seam-2_2_eap5/build/embedded +#embedded.dir /home/mnovotny/projects/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded +embedded.dir /home/mnovotny/projects/jboss-embedded-EAP-project/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.SP13 +embedded.version beta3.SP14 Modified: branches/enterprise/JBPAPP_5_0/build/common.build.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/common.build.xml 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/common.build.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -23,7 +23,7 @@ <property name="maven.settings.xml" location="${build.dir}/settings.xml" /> - <property name="embedded.version" value="beta3.SP13" /> + <property name="embedded.version" value="beta3.SP14" /> <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 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/embedded/build.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -29,8 +29,11 @@ <delete dir="${shaded.embedded.jars.dir}" failonerror="off"/> <mkdir dir="${shaded.embedded.jars.dir}" /> <jar destfile="${shaded.embedded.jars.dir}/hibernate-all.jar" > - <zipfileset src="${embedded.jars.dir}/hibernate-all.jar" /> - <zipfileset src="${lib.dir}/hibernate-search.jar" /> + <zipfileset src="${embedded.jars.dir}/hibernate-all.jar"> + <exclude name="META-INF/JBOSSCOD.*" /> + </zipfileset> + + <zipfileset src="${lib.dir}/hibernate-search.jar"/> </jar> <jar destfile="${shaded.embedded.jars.dir}/thirdparty-all.jar" duplicate="preserve"> <zipfileset src="${embedded.jars.dir}/thirdparty-all.jar" /> @@ -39,7 +42,7 @@ <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}" /> </target> - + <target name="installEmbedded" depends="shadeEmbedded"> <install pom="${embedded.poms.dir}/shaded/jboss-embedded.pom.xml" jar="${shaded.embedded.jars.dir}/jboss-embedded.jar" /> <install pom="${embedded.poms.dir}/shaded/jboss-embedded-all.pom.xml" jar="${shaded.embedded.jars.dir}/jboss-embedded-all.jar" /> @@ -94,4 +97,5 @@ <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 +</project> + Modified: branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml =================================================================== --- branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/embedded/hibernate-all.pom.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>hibernate-all</artifactId> - <version>beta3.SP13</version> + <version>beta3.SP14</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 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded-all.pom.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>jboss-embedded-all</artifactId> - <version>beta3.SP13</version> + <version>beta3.SP14</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.SP13</version> + <version>beta3.SP14</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 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/embedded/jboss-embedded.pom.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>jboss-embedded</artifactId> - <version>beta3.SP13</version> + <version>beta3.SP14</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 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/hibernate-all.pom.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>hibernate-all</artifactId> - <version>beta3.SP13</version> + <version>beta3.SP14</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 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded-all.pom.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-all</artifactId> - <version>beta3.SP13</version> + <version>beta3.SP14</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.SP13</version> + <version>beta3.SP14</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 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/jboss-embedded.pom.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-api</artifactId> - <version>beta3.SP13</version> + <version>beta3.SP14</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 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/embedded/shaded/thirdparty-all.pom.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.embedded</groupId> <artifactId>thirdparty-all</artifactId> - <version>beta3.SP13</version> + <version>beta3.SP14</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 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/embedded/thirdparty-all.pom.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.embedded</groupId> <artifactId>thirdparty-all</artifactId> - <version>beta3.SP13</version> + <version>beta3.SP14</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 2011-08-18 08:19:19 UTC (rev 14153) +++ branches/enterprise/JBPAPP_5_0/build/root.pom.xml 2011-08-24 10:26:17 UTC (rev 14154) @@ -481,7 +481,7 @@ <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> - <version>1.1.15.B1</version> + <version>1.1.15.B1-patch-01</version> </dependency> <dependency> @@ -870,7 +870,7 @@ <dependency> <groupId>org.jboss.seam.embedded</groupId> <artifactId>jboss-embedded-api</artifactId> - <version>beta3.SP13</version> + <version>beta3.SP14</version> </dependency> <dependency>