[hibernate-commits] Hibernate SVN: r19381 - in core/branches/Branch_3_3_2_GA_CP/distribution: src/assembly and 1 other directory.

Author: stliu Date: 2010-05-06 06:56:51 -0400 (Thu, 06 May 2010) New Revision: 19381 Removed: core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/hibernate-all.xml Modified: core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/dist.xml Log: JBPAPP-4228 update pom to add source plugin and disable unnecessary sub-modules Modified: core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml 2010-05-06 10:31:32 UTC (rev 19380) +++ core/branches/Branch_3_3_2_GA_CP/distribution/pom.xml 2010-05-06 10:56:51 UTC (rev 19381) @@ -59,7 +59,6 @@ </executions> <configuration> <descriptors> - <descriptor>src/assembly/hibernate-all.xml</descriptor> <descriptor>src/assembly/dist.xml</descriptor> </descriptors> </configuration> @@ -118,7 +117,6 @@ <artifactId>hibernate-proxool</artifactId> <version>${project.version}</version> </dependency> - <!-- optional deps for bytecode providers since they are optional on core --> <dependency> <groupId>javassist</groupId> @@ -131,7 +129,4 @@ <optional>true</optional> </dependency> </dependencies> - - - </project> Modified: core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/dist.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/dist.xml 2010-05-06 10:31:32 UTC (rev 19380) +++ core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/dist.xml 2010-05-06 10:56:51 UTC (rev 19381) @@ -27,18 +27,9 @@ <assembly xmlns="http://maven.apache.org/POM/4.0.0" 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"> - - <!-- - Produces a dist-style bundle similar to what previous (non-mavenized) versions of - Hibernate did. - --> - - <!-- todo : still need to account for overall site stuff --> - <id>dist</id> <formats> <format>zip</format> - <format>tar.gz</format> </formats> <includeBaseDirectory>true</includeBaseDirectory> @@ -51,17 +42,54 @@ <source>../hibernate_logo.gif</source> </file> <file> - <!-- todo : this should eventually become the release-notes bawany is working on --> - <source>../changelog.txt</source> + <source>../cache-ehcache/target/hibernate-ehcache-${project.version}.jar</source> + <destName>hibernate-ehcache.jar</destName> </file> <file> - <source>target/${project.artifactId}-${project.version}-all.jar</source> - <destName>hibernate3.jar</destName> + <source>../cache-jbosscache2/target/hibernate-jbosscache2-${project.version}.jar</source> + <destName>hibernate-jbosscache2.jar</destName> </file> + <file> + <source>../cache-oscache/target/hibernate-oscache-${project.version}.jar</source> + <destName>hibernate-oscache.jar</destName> + </file> + <file> + <source>../cache-swarmcache/target/hibernate-swarmcache-${project.version}.jar</source> + <destName>hibernate-swarmcache.jar</destName> + </file> + <file> + <source>../connection-c3p0/target/hibernate-c3p0-${project.version}.jar</source> + <destName>hibernate-c3p0.jar</destName> + </file> + <file> + <source>../connection-proxool/target/hibernate-proxool-${project.version}.jar</source> + <destName>hibernate-proxool.jar</destName> + </file> + <file> + <source>../core/target/hibernate-core-${project.version}.jar</source> + <destName>hibernate-core.jar</destName> + </file> + <file> + <source>../jdbc3-testing/target/hibernate-jdbc3-testing-${project.version}.jar</source> + <destName>hibernate-jdbc3-testing.jar</destName> + </file> + <file> + <source>../jdbc4-testing/target/hibernate-jdbc4-testing-${project.version}.jar</source> + <destName>hibernate-jdbc4-testing.jar</destName> + </file> + <file> + <source>../jmx/target/hibernate-jmx-${project.version}.jar</source> + <destName>hibernate-jmx.jar</destName> + </file> + <file> <source>../testing/target/hibernate-testing-${project.version}.jar</source> <destName>hibernate-testing.jar</destName> </file> + <file> + <source>../testsuite/target/hibernate-testsuite-${project.version}.jar</source> + <destName>hibernate-testsuite.jar</destName> + </file> </files> <dependencySets> @@ -69,81 +97,29 @@ <outputDirectory>lib/required</outputDirectory> <includes> <include>antlr:antlr</include> - <include>commons-collections:commons-collections</include> - <include>dom4j:dom4j</include> - <include>javassist:javassist</include> - <include>org.slf4j:slf4j-api</include> - <include>javax.transaction:jta</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>lib/optional/c3p0</outputDirectory> - <includes> - <include>c3p0:c3p0</include> - </includes> - </dependencySet> - - <dependencySet> - <outputDirectory>lib/optional/proxool</outputDirectory> - <includes> - <include>proxool:proxool</include> - </includes> - </dependencySet> - - <dependencySet> - <outputDirectory>lib/optional/ehcache</outputDirectory> - <includes> - <include>net.sf.ehcache:ehcache</include> - </includes> - </dependencySet> - - <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> + <include>jgroups:jgroups</include> + <include>org.jboss:jboss-common-core</include> + <include>org.jboss.logging:jboss-logging-spi</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>lib/optional/oscache</outputDirectory> - <includes> - <include>opensymphony:oscache</include> - </includes> - </dependencySet> - - <dependencySet> - <outputDirectory>lib/optional/swarmcache</outputDirectory> - <includes> - <include>swarmcache:swarmcache</include> - </includes> - </dependencySet> - - <dependencySet> <outputDirectory>lib/bytecode/cglib</outputDirectory> <includes> <include>cglib:cglib</include> <include>asm:asm</include> </includes> </dependencySet> - <dependencySet> <outputDirectory>lib/bytecode/javassist</outputDirectory> <includes> @@ -167,28 +143,13 @@ <exclude>**/*.iws</exclude> </excludes> </fileSet> - <!-- - Build the 'documentation/manual' directory containing the built - reference manual documentation - --> <fileSet> - <directory>../documentation/manual/target/docbook/publish/</directory> - <outputDirectory>documentation/manual</outputDirectory> + <directory>..</directory> + <useDefaultExcludes>true</useDefaultExcludes> + <outputDirectory>.</outputDirectory> <includes> - <include>**/**</include> - </includes> + <include>etc/*</include> + </includes> </fileSet> - <!-- - Build the 'documentation/jbosscache-guide' directory containing the built - reference manual documentation - --> - <fileSet> - <directory>../documentation/jbosscache2/target/docbook/publish/</directory> - <outputDirectory>documentation/jbosscache-guide</outputDirectory> - <includes> - <include>**/**</include> - </includes> - </fileSet> </fileSets> - </assembly> \ No newline at end of file Deleted: core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/hibernate-all.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/hibernate-all.xml 2010-05-06 10:31:32 UTC (rev 19380) +++ core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/hibernate-all.xml 2010-05-06 10:56:51 UTC (rev 19381) @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ Hibernate, Relational Persistence for Idiomatic Java - ~ - ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - ~ indicated by the @author tags or express copyright attribution - ~ statements applied by the authors. All third-party contributions are - ~ distributed under license by Red Hat Middleware LLC. - ~ - ~ This copyrighted material is made available to anyone wishing to use, modify, - ~ copy, or redistribute it subject to the terms and conditions of the GNU - ~ Lesser General Public License, as published by the Free Software Foundation. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - ~ for more details. - ~ - ~ You should have received a copy of the GNU Lesser General Public License - ~ along with this distribution; if not, write to: - ~ Free Software Foundation, Inc. - ~ 51 Franklin Street, Fifth Floor - ~ Boston, MA 02110-1301 USA - ~ - --> - -<assembly xmlns="http://maven.apache.org/POM/4.0.0" - 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"> - - <!-- - Take the 'core' resoures and build a jar, ala the legacy hibernate3.jar - --> - <id>all</id> - <formats> - <format>jar</format> - </formats> - - <includeBaseDirectory>false</includeBaseDirectory> - <baseDirectory>hibernate-all</baseDirectory> - - <dependencySets> - <dependencySet> - <unpack>true</unpack> - <includes> - <include>org.hibernate:*</include> - </includes> - </dependencySet> - </dependencySets> - -</assembly> \ No newline at end of file