Author: stliu Date: 2011-03-12 08:57:35 -0500 (Sat, 12 Mar 2011) New Revision: 20923 Modified: core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/dist.xml core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/pom.xml core/branches/Branch_3_3_2_GA_CP/parent/pom.xml core/branches/Branch_3_3_2_GA_CP/pom.xml Log: JBPAPP-6090 update assembly descriptor file to honor the standalone file structure 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 2011-03-12 13:54:35 UTC (rev 20922) +++ core/branches/Branch_3_3_2_GA_CP/distribution/src/assembly/dist.xml 2011-03-12 13:57:35 UTC (rev 20923) @@ -24,10 +24,9 @@ ~ 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"> - <id>dist</id> +<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/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + <id>dist</id> <formats> <format>zip</format> </formats> @@ -43,28 +42,28 @@ </file> <file> <source>../cache-ehcache/target/hibernate-ehcache-${project.version}.jar</source> - <destName>hibernate-ehcache.jar</destName> + <destName>lib/optional/hibernate-ehcache.jar</destName> </file> <file> <source>../cache-jbosscache2/target/hibernate-jbosscache2-${project.version}.jar</source> - <destName>hibernate-jbosscache2.jar</destName> + <destName>lib/optional/hibernate-jbosscache2.jar</destName> </file> <file> <source>../cache-oscache/target/hibernate-oscache-${project.version}.jar</source> - <destName>hibernate-oscache.jar</destName> + <destName>lib/optional/hibernate-oscache.jar</destName> </file> <file> <source>../cache-swarmcache/target/hibernate-swarmcache-${project.version}.jar</source> - <destName>hibernate-swarmcache.jar</destName> + <destName>lib/optional/hibernate-swarmcache.jar</destName> </file> <file> <source>../connection-c3p0/target/hibernate-c3p0-${project.version}.jar</source> - <destName>hibernate-c3p0.jar</destName> + <destName>lib/optional/hibernate-c3p0.jar</destName> </file> <file> <source>../connection-proxool/target/hibernate-proxool-${project.version}.jar</source> - <destName>hibernate-proxool.jar</destName> + <destName>lib/optional/hibernate-proxool.jar</destName> </file> <file> <source>../core/target/hibernate-core-${project.version}.jar</source> @@ -76,11 +75,11 @@ </file> <file> <source>../testing/target/hibernate-testing-${project.version}.jar</source> - <destName>hibernate-testing.jar</destName> + <destName>lib/optional/hibernate-testing.jar</destName> </file> <file> <source>../testsuite/target/hibernate-testsuite-${project.version}.jar</source> - <destName>hibernate-testsuite.jar</destName> + <destName>lib/optional/hibernate-testsuite.jar</destName> </file> </files> @@ -96,28 +95,6 @@ <include>javax.transaction:jta</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/bytecode/cglib</outputDirectory> - <includes> - <include>cglib:cglib</include> - <include>asm:asm</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/bytecode/javassist</outputDirectory> - <includes> - <include>javassist:javassist</include> - </includes> - </dependencySet> </dependencySets> <fileSets> Modified: core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/pom.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/pom.xml 2011-03-12 13:54:35 UTC (rev 20922) +++ core/branches/Branch_3_3_2_GA_CP/jdbc4-testing/pom.xml 2011-03-12 13:57:35 UTC (rev 20923) @@ -22,58 +22,27 @@ ~ 51 Franklin Street, Fifth Floor ~ Boston, MA 02110-1301 USA --> -<project 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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> +<project 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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-parent</artifactId> - <version>3.3.2.GA_CP04</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <version>3.3.2.GA_CP04</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> - <artifactId>hibernate-jdbc4-testing</artifactId> - <name>Hibernate JDBC4-JdbcSupport Testing</name> - <description>Test support of JDBC4 through JdbcSupport</description> + <artifactId>hibernate-jdbc4-testing</artifactId> + <name>Hibernate JDBC4-JdbcSupport Testing</name> + <description>Test support of JDBC4 through JdbcSupport</description> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> - <profiles> - <profile> - <id>jdbc4-jdk6</id> - <activation> - <jdk>1.5</jdk> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - <compilerVersion>1.6</compilerVersion> - <executable>${jdk16_home}/bin/javac</executable> - <fork>true</fork> - <verbose>true</verbose> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <jvm>${jdk16_home}/bin/java</jvm> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </project> Modified: core/branches/Branch_3_3_2_GA_CP/parent/pom.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/parent/pom.xml 2011-03-12 13:54:35 UTC (rev 20922) +++ core/branches/Branch_3_3_2_GA_CP/parent/pom.xml 2011-03-12 13:57:35 UTC (rev 20923) @@ -3,10 +3,10 @@ <!-- ~ Hibernate, Relational Persistence for Idiomatic Java ~ - ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + ~ Copyright (c) 2011, Red Hat Inc. 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. + ~ distributed under license by Red Hat Inc.. ~ ~ 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 @@ -124,10 +124,6 @@ </testResources> <plugins> <plugin> - <!-- require at least JDK 1.5 to run the build --> - <!-- ... --> - <!-- we need at least Maven 2.0.8 because of a bug fix affecting our antlr usage --> - <!-- 2.0.8 not released at this time, so I instead say anything greater that 2.0.7 --> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <executions> @@ -385,20 +381,6 @@ </dependencies> </dependencyManagement> - <distributionManagement> - <repository> - <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} --> - <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml --> - <!-- todo : replace this with direct svn access once the svnkit providers are available --> - <id>repository.jboss.org</id> - <url>file://${maven.repository.root}</url> - </repository> - <snapshotRepository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>dav:https://snapshots.jboss.org/maven2</url> - </snapshotRepository> - </distributionManagement> <profiles> <!-- HSQLDB is the default (eventually move to H2) --> <profile> Modified: core/branches/Branch_3_3_2_GA_CP/pom.xml =================================================================== --- core/branches/Branch_3_3_2_GA_CP/pom.xml 2011-03-12 13:54:35 UTC (rev 20922) +++ core/branches/Branch_3_3_2_GA_CP/pom.xml 2011-03-12 13:57:35 UTC (rev 20923) @@ -3,10 +3,10 @@ <!-- ~ Hibernate, Relational Persistence for Idiomatic Java ~ - ~ Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as + ~ Copyright (c) 2011, Red Hat Inc. 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. + ~ distributed under license by Red Hat Inc. ~ ~ 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 @@ -66,17 +66,4 @@ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core... <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.3.2.GA... </scm> - - <!-- <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.1</version> - <configuration> - <autoVersionSubmodules>true</autoVersionSubmodules> - </configuration> - </plugin> - </plugins> - </build> --> </project> \ No newline at end of file