[hibernate-commits] Hibernate SVN: r17834 - in core/trunk/distribution: src/assembly and 1 other directory.

Author: steve.ebersole(a)jboss.com Date: 2009-10-25 15:11:38 -0400 (Sun, 25 Oct 2009) New Revision: 17834 Modified: core/trunk/distribution/pom.xml core/trunk/distribution/src/assembly/dist.xml core/trunk/distribution/src/assembly/hibernate-all.xml Log: HHH-4525 - Trunk is not including the newly added modules to the distribution bundle Modified: core/trunk/distribution/pom.xml =================================================================== --- core/trunk/distribution/pom.xml 2009-10-25 18:30:03 UTC (rev 17833) +++ core/trunk/distribution/pom.xml 2009-10-25 19:11:38 UTC (rev 17834) @@ -107,6 +107,21 @@ <artifactId>hibernate-proxool</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-envers</artifactId> + <version>${project.version}</version> + </dependency> <!-- optional deps for bytecode providers since they are optional on core --> <dependency> Modified: core/trunk/distribution/src/assembly/dist.xml =================================================================== --- core/trunk/distribution/src/assembly/dist.xml 2009-10-25 18:30:03 UTC (rev 17833) +++ core/trunk/distribution/src/assembly/dist.xml 2009-10-25 19:11:38 UTC (rev 17834) @@ -24,9 +24,9 @@ ~ Boston, MA 02110-1301 USA --> -<assembly xmlns="http://maven.apache.org/POM/4.0.0" +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> <!-- Produces a dist-style bundle similar to what previous (non-mavenized) versions of @@ -106,18 +106,6 @@ <dependencySet> <outputDirectory>lib/optional/jbosscache</outputDirectory> <includes> - <include>jboss:jboss-cache</include> - <include>concurrent:concurrent:1.3.4</include> - <include>jboss:jboss-common:4.0.2</include> - <include>jboss:jboss-jmx:4.0.2</include> - <include>jboss:jboss-system:4.0.2</include> - <include>jgroups:jgroups-all:2.2.7</include> - </includes> - </dependencySet> - - <dependencySet> - <outputDirectory>lib/optional/jbosscache2</outputDirectory> - <includes> <include>org.jboss.cache:jbosscache-core</include> </includes> </dependencySet> Modified: core/trunk/distribution/src/assembly/hibernate-all.xml =================================================================== --- core/trunk/distribution/src/assembly/hibernate-all.xml 2009-10-25 18:30:03 UTC (rev 17833) +++ core/trunk/distribution/src/assembly/hibernate-all.xml 2009-10-25 19:11:38 UTC (rev 17834) @@ -25,9 +25,9 @@ ~ --> -<assembly xmlns="http://maven.apache.org/POM/4.0.0" +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> <!-- Take the 'core' resoures and build a jar, ala the legacy hibernate3.jar @@ -46,6 +46,10 @@ <includes> <include>org.hibernate:*</include> </includes> + <excludes> + <exclude>org.hibernate:hibernate-tools:*</exclude> + <exclude>org.hibernate:jtidy:*</exclude> + </excludes> </dependencySet> </dependencySets>