Author: steve.ebersole(a)jboss.com Date: 2010-04-20 21:57:44 -0400 (Tue, 20 Apr 2010) New Revision: 19255 Added: core/branches/Branch_3_5/ core/branches/Branch_3_5/entitymanager/pom.xml core/branches/Branch_3_5/parent/pom.xml Removed: core/branches/Branch_3_5/entitymanager/pom.xml core/branches/Branch_3_5/parent/pom.xml Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfile.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/AccessType.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/Version.java core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java core/branches/Branch_3_5/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java Log: [maven-release-plugin] copy for branch Branch_3_5 Copied: core/branches/Branch_3_5 (from rev 19253, core/trunk) Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfile.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchProfile.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfile.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/annotations/FetchProfiles.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/AccessType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/AccessType.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/AccessType.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ConfigurationArtefactType.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/ExtendedMappings.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/VerifyFetchProfileReferenceSecondPass.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java =================================================================== --- core/trunk/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/main/java/org/hibernate/cfg/annotations/reflection/XMLContext.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Closet.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/Foobar.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Bed.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Being.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/BigBed.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Chair.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Gardenshed.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Person.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Thingy.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/User.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/jpa/Woody.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -//$Id:$ +//$Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Crew.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Driver.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/RentalCar.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Tourist.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/access/xml/Waiter.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, Home of Professional Open Source * Copyright 2009, Red Hat, Inc. and/or its affiliates, and individual contributors Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/any/package-info.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ @AnyMetaDefs( @AnyMetaDef( name= "Property", metaType = "string", idType = "integer", metaValues = { Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer2.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer3.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer4.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Customer5.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/Order.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/SupportTickets.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fetchprofile/package-info.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.EmbeddedId; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/A_PK.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import java.io.Serializable; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/B.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/C.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassA.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Column; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassB.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassC.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/ClassD.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import javax.persistence.EmbeddedId; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/D_PK.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import java.io.Serializable; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; import java.io.PrintWriter; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/id/entities/Planet.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.id.entities; public enum Planet { Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Address.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.namingstrategy; import javax.persistence.Entity; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/DummyNamingStrategy.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.namingstrategy; import org.hibernate.cfg.EJB3NamingStrategy; Modified: core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java =================================================================== --- core/trunk/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/annotations/src/test/java/org/hibernate/test/annotations/namingstrategy/Person.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.test.annotations.namingstrategy; import java.util.HashSet; Deleted: core/branches/Branch_3_5/entitymanager/pom.xml =================================================================== --- core/trunk/entitymanager/pom.xml 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,202 +0,0 @@ -<?xml version="1.0"?> -<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/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-parent</artifactId> - <version>3.5.2-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <packaging>jar</packaging> - - <name>Hibernate Entity Manager</name> - <description>Hibernate Entity Manager</description> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>hibernate-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${groupId}</groupId> - <artifactId>hibernate-testing</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.shrinkwrap</groupId> - <artifactId>shrinkwrap-api</artifactId> - <version>1.0.0-alpha-6</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.shrinkwrap</groupId> - <artifactId>shrinkwrap-impl-base</artifactId> - <version>1.0.0-alpha-6</version> - <scope>test</scope> - </dependency> - <dependency> - <!-- - Only really needed for the antrun plugin defined below (which in turn is only really needed - to work around a missing feature on the compile plugin; lovely no?). However I have not - found a way to declare this dependency local to the antrun plugin and then reference it - from the <javac/>'s <classpath/> :( - --> - <groupId>${project.groupId}</groupId> - <artifactId>hibernate-jpamodelgen</artifactId> - <version>1.0.0.Final</version> - <scope>test</scope> - <exclusions> - <exclusion> - <!-- Use the jpa-api defined here, crossing fingers they match up signature-wise --> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <filtering>true</filtering> - <directory>src/test/resources</directory> - </testResource> - <testResource> - <filtering>true</filtering> - <directory>src/test/bundles</directory> - <targetPath>../bundles</targetPath> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-injection-plugin</artifactId> - <configuration> - <bytecodeInjections> - <bytecodeInjection> - <expression>${pom.version}</expression> - <targetMembers> - <methodBodyReturn> - <className>org.hibernate.ejb.Version</className> - <methodName>getVersionString</methodName> - </methodBodyReturn> - </targetMembers> - </bytecodeInjection> - </bytecodeInjections> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <!-- Define one configuration outside executions and without a phase in order to allow 'mvn antrun:run' --> - <configuration> - <tasks> - <property name="target.dir" value="${project.build.directory}/generated-src/jpamodelgen"/> - <property name="src.dir" value="${project.build.testSourceDirectory}"/> - <property name="jdk16_home" value="${jdk16_home}"/> - <property name="classpath" refid="maven.test.classpath"/> - <ant antfile="${basedir}/build.xml"> - <target name="generate-metamodel"/> - </ant> - </tasks> - </configuration> - <executions> - <execution> - <id>process_annotations</id> - <phase>process-test-sources</phase> - <configuration> - <!-- No additional configuration needed. Unbound configuration gets inherited. (Feels wrong, but that's how it is) --> - <testSourceRoot>${project.build.directory}/generated-src/jpamodelgen</testSourceRoot> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/*TestCase.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>doc</id> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <configuration> - <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory> - <masterTranslation>en</masterTranslation> - <imageResource> - <directory>${basedir}/src/main/docbook/en/images</directory> - </imageResource> - </configuration> - <executions> - <execution> - <id>make-doc</id> - <phase>package</phase> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> Copied: core/branches/Branch_3_5/entitymanager/pom.xml (from rev 19254, core/trunk/entitymanager/pom.xml) =================================================================== --- core/branches/Branch_3_5/entitymanager/pom.xml (rev 0) +++ core/branches/Branch_3_5/entitymanager/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) @@ -0,0 +1,202 @@ +<?xml version="1.0"?> +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <version>3.5.2-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <packaging>jar</packaging> + + <name>Hibernate Entity Manager</name> + <description>Hibernate Entity Manager</description> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${groupId}</groupId> + <artifactId>hibernate-testing</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>shrinkwrap-api</artifactId> + <version>1.0.0-alpha-6</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>shrinkwrap-impl-base</artifactId> + <version>1.0.0-alpha-6</version> + <scope>test</scope> + </dependency> + <dependency> + <!-- + Only really needed for the antrun plugin defined below (which in turn is only really needed + to work around a missing feature on the compile plugin; lovely no?). However I have not + found a way to declare this dependency local to the antrun plugin and then reference it + from the <javac />'s <classpath /> :( + --> + <groupId>${project.groupId}</groupId> + <artifactId>hibernate-jpamodelgen</artifactId> + <version>1.0.0.Final</version> + <scope>test</scope> + <exclusions> + <exclusion> + <!-- Use the jpa-api defined here, crossing fingers they match up signature-wise --> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <filtering>true</filtering> + <directory>src/test/resources</directory> + </testResource> + <testResource> + <filtering>true</filtering> + <directory>src/test/bundles</directory> + <targetPath>../bundles</targetPath> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-injection-plugin</artifactId> + <configuration> + <bytecodeInjections> + <bytecodeInjection> + <expression>${pom.version}</expression> + <targetMembers> + <methodBodyReturn> + <className>org.hibernate.ejb.Version</className> + <methodName>getVersionString</methodName> + </methodBodyReturn> + </targetMembers> + </bytecodeInjection> + </bytecodeInjections> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <!-- Define one configuration outside executions and without a phase in order to allow 'mvn antrun:run' --> + <configuration> + <tasks> + <property name="target.dir" value="${project.build.directory}/generated-src/jpamodelgen" /> + <property name="src.dir" value="${project.build.testSourceDirectory}" /> + <property name="jdk16_home" value="${jdk16_home}" /> + <property name="classpath" refid="maven.test.classpath" /> + <ant antfile="${basedir}/build.xml"> + <target name="generate-metamodel" /> + </ant> + </tasks> + </configuration> + <executions> + <execution> + <id>process_annotations</id> + <phase>process-test-sources</phase> + <configuration> + <!-- No additional configuration needed. Unbound configuration gets inherited. (Feels wrong, but that's how it is) --> + <testSourceRoot>${project.build.directory}/generated-src/jpamodelgen</testSourceRoot> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*TestCase.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>doc</id> + <build> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${basedir}/src/main/docbook</sourceDirectory> + <masterTranslation>en</masterTranslation> + <imageResource> + <directory>${basedir}/src/main/docbook/en/images</directory> + </imageResource> + </configuration> + <executions> + <execution> + <id>make-doc</id> + <phase>package</phase> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Modified: core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/Version.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/Version.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/Version.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as * indicated by the @author tags or express copyright attribution Modified: core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java =================================================================== --- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Copyright (c) 2009, Red Hat Middleware LLC or third-party contributors as * indicated by the @author tags or express copyright attribution Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ejb3configuration/TestCase.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Music.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.ejb.test.exception; import java.io.Serializable; Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/exception/Musician.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ package org.hibernate.ejb.test.exception; import java.io.Serializable; Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Modified: core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java =================================================================== --- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/PackagedEntityManagerTest.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java * Deleted: core/branches/Branch_3_5/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/parent/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,941 +0,0 @@ -<?xml version="1.0"?> -<!-- - ~ 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 - --> -<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/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <groupId>org.hibernate</groupId> - <artifactId>hibernate-parent</artifactId> - <packaging>pom</packaging> - <version>3.5.2-SNAPSHOT</version> - - <name>Hibernate Core Parent POM</name> - <description>The base POM for all Hibernate Core modules.</description> - <url>http://hibernate.org</url> - <inceptionYear>2002</inceptionYear> - - <organization> - <name>Hibernate.org</name> - <url>http://hibernate.org</url> - </organization> - - <developers> - </developers> - - <licenses> - <license> - <name>GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> - <comments>See discussion at http://hibernate.org/356.html for more details.</comments> - <distribution>repo</distribution> - </license> - </licenses> - - <scm> - <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk<... - <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core... - <url>https://svn.jboss.org/repos/hibernate/core/trunk</url> - </scm> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.jboss.org/hudson/job/hibernate-testsuite/</url> - <notifiers> - <notifier> - <type>mail</type> - <address&gt;hibernate-dev(a)lists.jboss.org&lt;/address&gt; - </notifier> - </notifiers> - </ciManagement> - - <issueManagement> - <system>jira</system> - <url>http://opensource.atlassian.com/projects/hibernate/browse/HHH</... - </issueManagement> - - <mailingLists> - <mailingList> - <name>Hibernate Announcements</name> - <post&gt;hibernate-announce(a)lists.jboss.org&lt;/post&gt; - <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce&... - <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announc... - <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive> - </mailingList> - <mailingList> - <name>Hibernate Commit Notificatons</name> - <post&gt;hibernate-commits(a)lists.jboss.org&lt;/post&gt; - <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits&l... - <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits... - <archive>http://lists.jboss.org/pipermail/hibernate-commits/</archiv... - </mailingList> - <mailingList> - <name>Hibernate Developers</name> - <post&gt;hibernate-dev(a)lists.jboss.org&lt;/post&gt; - <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</s... - <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev<... - <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive> - <otherArchives> - <otherArchive>http://www.mail-archive.com/hibernate-dev%40lists.jboss.o... - </otherArchives> - </mailingList> - <mailingList> - <name>Hibernate Issue Notifications</name> - <post&gt;hibernate-issues(a)lists.jboss.org&lt;/post&gt; - <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues<... - <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues&... - <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive... - </mailingList> - </mailingLists> - - <build> - <plugins> - <plugin> - <!-- Needed in order to load the proper 'artifact handler' for the 'jdocbook-style' packaging --> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-style-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-java</id> - <goals> - <goal>enforce</goal> - </goals> - </execution> - </executions> - <configuration> - <rules> - <requireJavaVersion> - <!-- require JDK 1.5 to run the build --> - <version>[1.5,1.6)</version> - </requireJavaVersion> - <requireMavenVersion> - <!-- 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 --> - <version>(2.0.7,)</version> - </requireMavenVersion> - </rules> - </configuration> - </plugin> - <!-- by default, compile to JDK 1.4 compatibility (individual modules and/or user can override) --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <!-- add specification/implementation details to the manifests --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Implementation-URL>http://hibernate.org</Implementation-URL> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <redirectTestOutputToFile>true</redirectTestOutputToFile> - <argLine>-Xmx1024m</argLine> - </configuration> - </plugin> - <!-- Attach source jars --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <phase>verify</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.2.3</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-jdocbook-style</artifactId> - <version>2.0.1</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl - </stylesheetResource> - <finalName>hibernate_reference.pdf</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> - <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme --> - <!-- could also locate the docbook dependency and inspect its version... --> - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - </options> - </configuration> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-style-plugin</artifactId> - <version>2.0.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.5</version> - <configuration> - <links> - <link>http://java.sun.com/j2se/1.4.2/docs/api/</link> - <link>http://java.sun.com/j2ee/1.4/docs/api/</link> - </links> - <packagesheader>Hibernate Packages</packagesheader> - <doctitle>Hibernate Core ${project.version}</doctitle> - <windowtitle>Hibernate Core ${project.version}</windowtitle> - <bottom><![CDATA[Copyright &copy; ${inceptionYear}-{currentYear} <a href="http://redhat.com">Red Hat Middleware, LLC.</a> All Rights Reserved]]></bottom> - <excludePackageNames>orh.hibernate.tutorial*</excludePackageNames> - <groups> - <group> - <title>Core API</title> - <packages> - org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.mapping:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.stat - </packages> - </group> - <group> - <title>Extension SPI/API</title> - <packages> - org.hibernate.id*:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc:org.hibernate.usertype - </packages> - </group> - <group> - <title>JBoss Cache Integration</title> - <packages>org.hibernate.cache.jbc2*</packages> - </group> - <group> - <title>Miscellaneous API</title> - <packages>org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.tool.instrument*</packages> - </group> - </groups> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0-alpha-3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>2.1.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-test-ext-plugin</artifactId> - <version>1.1.0</version> - <executions> - <execution> - <goals> - <goal>extend</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-injection-plugin</artifactId> - <version>1.0.2</version> - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>bytecode</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - - <extensions> - <!-- webdav based deployments (snapshot repo) --> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> - </extension> - <!-- scm based deployments (release repo) --> - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-scm</artifactId> - <version>1.0-beta-6</version> - </extension> - <extension> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-manager-plexus</artifactId> - <version>1.0</version> - </extension> - <extension> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-provider-svnexe</artifactId> - <version>1.0</version> - </extension> - </extensions> - </build> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.4.3</version> - </plugin> - <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.2</version> - <configuration> - <linkXRef>true</linkXRef> - <minimumTokens>100</minimumTokens> - <targetJdk>1.4</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>2.1</version> - <configuration> - <tags> - <tag>@FIXME</tag> - <tag>@fixme</tag> - <tag>FIXME</tag> - <tag>fixme</tag> - <tag>@TODO</tag> - <tag>@todo</tag> - <tag>TODO</tag> - <tag>todo</tag> - </tags> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javancss-maven-plugin</artifactId> - <version>2.0-beta-2</version> - </plugin> ---> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>1.1.1</version> - <configuration> - <onlyAnalyze>org.hibernate.*</onlyAnalyze> - </configuration> - </plugin> - </plugins> - </reporting> - - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <!-- test-scoped dependencies for common testing dependencies --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4jVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>99.0-does-not-exist</version> - <scope>test</scope> - </dependency> - <!-- / test-scoped dependencies for common testing dependencies --> - </dependencies> - - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - </dependency> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.6</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - <!-- javassist is optional, but if defined it should be version 3.9.0 --> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.9.0.GA</version> - </dependency> - <!-- cglib is optional, but if defined it should be version 2.2 --> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.2</version> - </dependency> - <!-- Set the version of the JPA api to be used throughout the the project --> - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <version>1.0.0.Final</version> - </dependency> - <!-- Set the version of the hibernate-commons-annotations to be used throughout the the project --> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - <version>3.2.0.Final</version> - </dependency> - <!-- set the optional Bean Validation and Hibernate Validator to be used throughout the project --> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>4.0.2.GA</version> - </dependency> - </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> - <!-- =============================== --> - <!-- Database profiles --> - <!-- =============================== --> - <!-- HSQLDB is the default (eventually move to H2) --> - <profile> - <id>hsqldb</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.2</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect> - <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver> - <jdbc.url>jdbc:hsqldb:.</jdbc.url> - <jdbc.user>sa</jdbc.user> - <jdbc.pass/> - <jdbc.isolation/> - </properties> - </profile> - - <profile> - <id>h2</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.124</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect> - <jdbc.driver>org.h2.Driver</jdbc.driver> - <jdbc.url>jdbc:h2:mem:db1</jdbc.url> - <jdbc.user>sa</jdbc.user> - <jdbc.pass/> - <jdbc.isolation/> - </properties> - </profile> - <!-- - ################################################################### - Profiles naming db instances in the Red Hat QA/QE lab - - First, those with OSS drivers - ################################################################### - --> - - <!-- The MySQL 5 test envionment --> - <profile> - <id>mysql5</id> - <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> - <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdb... - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The MySQL 5.1 test envionment --> - <profile> - <id>mysql51</id> - <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.5</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> - <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbrtru</jdb... - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The MySQL 5.1 Cluster test envionment --> - <profile> - <id>mysql51-cluster</id> - <dependencies> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.8</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect> - <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> - <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbrtru - </jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The PostgreSQL 8.2.4 test envionment --> - <profile> - <id>postgresql824</id> - <dependencies> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.2-504.jdbc3</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> - <jdbc.driver>org.postgresql.Driver</jdbc.driver> - <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The PostgreSQL 8.3.7 test envionment --> - <profile> - <id>postgresql837</id> - <dependencies> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.2-504.jdbc3</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> - <jdbc.driver>org.postgresql.Driver</jdbc.driver> - <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- - ################################################################### - Then, those with commercial drivers - ################################################################### - --> - - <!-- The DB2 8.x test envionment (using 9x drivers)--> - <profile> - <id>db2v82</id> - <dependencies> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.1.57</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>3.1.57</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> - <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> - <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The DB2 9.1 test envionment (using 9x drivers)--> - <profile> - <id>db2v91</id> - <dependencies> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.8.47</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>3.8.47</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> - <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> - <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The DB2 9.7 test envionment (using 9x drivers)--> - <profile> - <id>db2v97</id> - <dependencies> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc</artifactId> - <version>3.57.86</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.ibm</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>3.57.86</version> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> - <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> - <jdbc.url>jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The Oracle9i test envionment --> - <profile> - <id>oracle9i</id> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> - <!-- use the 10g drivers which are surprisingly largely bug free --> - <version>10.0.2.0</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect> - <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> - <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The Oracle10g test envionment --> - <profile> - <id>oracle10g</id> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> - <!-- use the 10g drivers which are surprisingly largely bug free --> - <version>10.0.2.0</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> - <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> - <jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The Oracle11g test envionment --> - <profile> - <id>oracle11g</id> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc5</artifactId> - <version>11.1.0.7.0</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> - <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> - <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The Oracle11gRAC test envionment --> - <profile> - <id>oracle11gRAC</id> - <dependencies> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>ojdbc5</artifactId> - <version>11.1.0.7.0</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> - <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> - <jdbc.url> - jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss))) - </jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The Sybase 15 test envionment --> - <profile> - <id>sybase15</id> - <dependencies> - <dependency> - <groupId>com.sybase</groupId> - <artifactId>jconnect</artifactId> - <version>6.0.5</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect> - <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> - <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbrtru</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation/> - </properties> - </profile> - - <!-- The SQLServer2005 (MS JDBC) test envionment --> - <profile> - <id>mssql2005</id> - <dependencies> - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>msjdbc</artifactId> - <version>2.0.1008.2</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> - <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> - <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation>4096</jdbc.isolation> - </properties> - </profile> - - <!-- The SQLServer2005 (MS JDBC) test envionment --> - <profile> - <id>mssql2008</id> - <dependencies> - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>msjdbc</artifactId> - <version>2.0.1008.2</version> - <scope>test</scope> - </dependency> - </dependencies> - <properties> - <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> - <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> - <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url> - <jdbc.user>hibbrtru</jdbc.user> - <jdbc.pass>hibbrtru</jdbc.pass> - <jdbc.isolation>4096</jdbc.isolation> - </properties> - </profile> - - </profiles> - - <properties> - <slf4jVersion>1.5.8</slf4jVersion> - </properties> -</project> Copied: core/branches/Branch_3_5/parent/pom.xml (from rev 19254, core/trunk/parent/pom.xml) =================================================================== --- core/branches/Branch_3_5/parent/pom.xml (rev 0) +++ core/branches/Branch_3_5/parent/pom.xml 2010-04-21 01:57:44 UTC (rev 19255) @@ -0,0 +1,941 @@ +<?xml version="1.0"?> +<!-- + ~ 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 + --> +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.hibernate</groupId> + <artifactId>hibernate-parent</artifactId> + <packaging>pom</packaging> + <version>3.5.2-SNAPSHOT</version> + + <name>Hibernate Core Parent POM</name> + <description>The base POM for all Hibernate Core modules.</description> + <url>http://hibernate.org</url> + <inceptionYear>2002</inceptionYear> + + <organization> + <name>Hibernate.org</name> + <url>http://hibernate.org</url> + </organization> + + <developers> + </developers> + + <licenses> + <license> + <name>GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/lgpl-2.1.html</url> + <comments>See discussion at http://hibernate.org/356.html for more details.</comments> + <distribution>repo</distribution> + </license> + </licenses> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/branches... + <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core... + <url>https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_5<... + </scm> + + <ciManagement> + <system>hudson</system> + <url>http://hudson.jboss.org/hudson/job/hibernate-testsuite/</url> + <notifiers> + <notifier> + <type>mail</type> + <address&gt;hibernate-dev(a)lists.jboss.org&lt;/address&gt; + </notifier> + </notifiers> + </ciManagement> + + <issueManagement> + <system>jira</system> + <url>http://opensource.atlassian.com/projects/hibernate/browse/HHH</... + </issueManagement> + + <mailingLists> + <mailingList> + <name>Hibernate Announcements</name> + <post&gt;hibernate-announce(a)lists.jboss.org&lt;/post&gt; + <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announce&... + <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-announc... + <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive> + </mailingList> + <mailingList> + <name>Hibernate Commit Notificatons</name> + <post&gt;hibernate-commits(a)lists.jboss.org&lt;/post&gt; + <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits&l... + <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-commits... + <archive>http://lists.jboss.org/pipermail/hibernate-commits/</archiv... + </mailingList> + <mailingList> + <name>Hibernate Developers</name> + <post&gt;hibernate-dev(a)lists.jboss.org&lt;/post&gt; + <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev</s... + <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-dev<... + <archive>http://lists.jboss.org/pipermail/hibernate-dev/</archive> + <otherArchives> + <otherArchive>http://www.mail-archive.com/hibernate-dev%40lists.jboss.o... + </otherArchives> + </mailingList> + <mailingList> + <name>Hibernate Issue Notifications</name> + <post&gt;hibernate-issues(a)lists.jboss.org&lt;/post&gt; + <subscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues<... + <unsubscribe>https://lists.jboss.org/mailman/listinfo/hibernate-issues&... + <archive>http://lists.jboss.org/pipermail/hibernate-issues/</archive... + </mailingList> + </mailingLists> + + <build> + <plugins> + <plugin> + <!-- Needed in order to load the proper 'artifact handler' for the 'jdocbook-style' packaging --> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-style-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-java</id> + <goals> + <goal>enforce</goal> + </goals> + </execution> + </executions> + <configuration> + <rules> + <requireJavaVersion> + <!-- require JDK 1.5 to run the build --> + <version>[1.5,1.6)</version> + </requireJavaVersion> + <requireMavenVersion> + <!-- 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 --> + <version>(2.0.7,)</version> + </requireMavenVersion> + </rules> + </configuration> + </plugin> + <!-- by default, compile to JDK 1.4 compatibility (individual modules and/or user can override) --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + <!-- add specification/implementation details to the manifests --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Implementation-URL>http://hibernate.org</Implementation-URL> + </manifestEntries> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + <argLine>-Xmx1024m</argLine> + </configuration> + </plugin> + <!-- Attach source jars --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.2.3</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-jdocbook-style</artifactId> + <version>2.0.1</version> + <type>jdocbook-style</type> + </dependency> + </dependencies> + <configuration> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl + </stylesheetResource> + <finalName>hibernate_reference.pdf</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl + </stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>true</xincludeSupported> + <xmlTransformerType>saxon</xmlTransformerType> + <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme --> + <!-- could also locate the docbook dependency and inspect its version... --> + <docbookVersion>1.72.0</docbookVersion> + <localeSeparator>-</localeSeparator> + </options> + </configuration> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-style-plugin</artifactId> + <version>2.0.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.5</version> + <configuration> + <links> + <link>http://java.sun.com/j2se/1.4.2/docs/api/</link> + <link>http://java.sun.com/j2ee/1.4/docs/api/</link> + </links> + <packagesheader>Hibernate Packages</packagesheader> + <doctitle>Hibernate Core ${project.version}</doctitle> + <windowtitle>Hibernate Core ${project.version}</windowtitle> + <bottom><![CDATA[Copyright &copy; ${inceptionYear}-{currentYear} <a href="http://redhat.com">Red Hat Middleware, LLC.</a> All Rights Reserved]]></bottom> + <excludePackageNames>orh.hibernate.tutorial*</excludePackageNames> + <groups> + <group> + <title>Core API</title> + <packages> + org.hibernate:org.hibernate.classic:org.hibernate.criterion:org.hibernate.mapping:org.hibernate.metadata:org.hibernate.cfg:org.hibernate.stat + </packages> + </group> + <group> + <title>Extension SPI/API</title> + <packages> + org.hibernate.id*:org.hibernate.connection:org.hibernate.transaction:org.hibernate.type:org.hibernate.dialect*:org.hibernate.cache*:org.hibernate.event*:org.hibernate.property:org.hibernate.loader*:org.hibernate.persister*:org.hibernate.proxy:org.hibernate.tuple:org.hibernate.transform:org.hibernate.collection:org.hibernate.jdbc:org.hibernate.usertype + </packages> + </group> + <group> + <title>JBoss Cache Integration</title> + <packages>org.hibernate.cache.jbc2*</packages> + </group> + <group> + <title>Miscellaneous API</title> + <packages>org.hibernate.tool.hbm2ddl:org.hibernate.jmx:org.hibernate.tool.instrument*</packages> + </group> + </groups> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.4.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.0-alpha-3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-test-ext-plugin</artifactId> + <version>1.1.0</version> + <executions> + <execution> + <goals> + <goal>extend</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-injection-plugin</artifactId> + <version>1.0.2</version> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>bytecode</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + + <extensions> + <!-- webdav based deployments (snapshot repo) --> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav</artifactId> + <version>1.0-beta-2</version> + </extension> + <!-- scm based deployments (release repo) --> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-scm</artifactId> + <version>1.0-beta-6</version> + </extension> + <extension> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-manager-plexus</artifactId> + <version>1.0</version> + </extension> + <extension> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-svnexe</artifactId> + <version>1.0</version> + </extension> + </extensions> + </build> + + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.4.3</version> + </plugin> + <!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.2</version> + <configuration> + <linkXRef>true</linkXRef> + <minimumTokens>100</minimumTokens> + <targetJdk>1.4</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <version>2.1</version> + <configuration> + <tags> + <tag>@FIXME</tag> + <tag>@fixme</tag> + <tag>FIXME</tag> + <tag>fixme</tag> + <tag>@TODO</tag> + <tag>@todo</tag> + <tag>TODO</tag> + <tag>todo</tag> + </tags> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javancss-maven-plugin</artifactId> + <version>2.0-beta-2</version> + </plugin> +--> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>1.1.1</version> + <configuration> + <onlyAnalyze>org.hibernate.*</onlyAnalyze> + </configuration> + </plugin> + </plugins> + </reporting> + + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <!-- test-scoped dependencies for common testing dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4jVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>99.0-does-not-exist</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>99.0-does-not-exist</version> + <scope>test</scope> + </dependency> + <!-- / test-scoped dependencies for common testing dependencies --> + </dependencies> + + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + </dependency> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>2.7.6</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + </dependency> + <!-- javassist is optional, but if defined it should be version 3.9.0 --> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.9.0.GA</version> + </dependency> + <!-- cglib is optional, but if defined it should be version 2.2 --> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.2</version> + </dependency> + <!-- Set the version of the JPA api to be used throughout the the project --> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>1.0.0.Final</version> + </dependency> + <!-- Set the version of the hibernate-commons-annotations to be used throughout the the project --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-commons-annotations</artifactId> + <version>3.2.0.Final</version> + </dependency> + <!-- set the optional Bean Validation and Hibernate Validator to be used throughout the project --> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>4.0.2.GA</version> + </dependency> + </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> + <!-- =============================== --> + <!-- Database profiles --> + <!-- =============================== --> + <!-- HSQLDB is the default (eventually move to H2) --> + <profile> + <id>hsqldb</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.2</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.HSQLDialect</db.dialect> + <jdbc.driver>org.hsqldb.jdbcDriver</jdbc.driver> + <jdbc.url>jdbc:hsqldb:.</jdbc.url> + <jdbc.user>sa</jdbc.user> + <jdbc.pass /> + <jdbc.isolation /> + </properties> + </profile> + + <profile> + <id>h2</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.2.124</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.H2Dialect</db.dialect> + <jdbc.driver>org.h2.Driver</jdbc.driver> + <jdbc.url>jdbc:h2:mem:db1</jdbc.url> + <jdbc.user>sa</jdbc.user> + <jdbc.pass /> + <jdbc.isolation /> + </properties> + </profile> + <!-- + ################################################################### + Profiles naming db instances in the Red Hat QA/QE lab + + First, those with OSS drivers + ################################################################### + --> + + <!-- The MySQL 5 test envionment --> + <profile> + <id>mysql5</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbrtru</jdb... + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The MySQL 5.1 test envionment --> + <profile> + <id>mysql51</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.5</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbrtru</jdb... + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The MySQL 5.1 Cluster test envionment --> + <profile> + <id>mysql51-cluster</id> + <dependencies> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.8</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect> + <jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver> + <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbrtru + </jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The PostgreSQL 8.2.4 test envionment --> + <profile> + <id>postgresql824</id> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504.jdbc3</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> + <jdbc.driver>org.postgresql.Driver</jdbc.driver> + <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbrtru</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The PostgreSQL 8.3.7 test envionment --> + <profile> + <id>postgresql837</id> + <dependencies> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-504.jdbc3</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect> + <jdbc.driver>org.postgresql.Driver</jdbc.driver> + <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbrtru</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- + ################################################################### + Then, those with commercial drivers + ################################################################### + --> + + <!-- The DB2 8.x test envionment (using 9x drivers)--> + <profile> + <id>db2v82</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.1.57</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.1.57</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> + <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> + <jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The DB2 9.1 test envionment (using 9x drivers)--> + <profile> + <id>db2v91</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.8.47</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.8.47</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> + <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> + <jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The DB2 9.7 test envionment (using 9x drivers)--> + <profile> + <id>db2v97</id> + <dependencies> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc</artifactId> + <version>3.57.86</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>3.57.86</version> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect> + <jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver> + <jdbc.url>jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The Oracle9i test envionment --> + <profile> + <id>oracle9i</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <!-- use the 10g drivers which are surprisingly largely bug free --> + <version>10.0.2.0</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The Oracle10g test envionment --> + <profile> + <id>oracle10g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <!-- use the 10g drivers which are surprisingly largely bug free --> + <version>10.0.2.0</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The Oracle11g test envionment --> + <profile> + <id>oracle11g</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The Oracle11gRAC test envionment --> + <profile> + <id>oracle11gRAC</id> + <dependencies> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> + <version>11.1.0.7.0</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect> + <jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver> + <jdbc.url> + jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss))) + </jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The Sybase 15 test envionment --> + <profile> + <id>sybase15</id> + <dependencies> + <dependency> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>6.0.5</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect> + <jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver> + <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbrtru</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation /> + </properties> + </profile> + + <!-- The SQLServer2005 (MS JDBC) test envionment --> + <profile> + <id>mssql2005</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>2.0.1008.2</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> + <jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> + + <!-- The SQLServer2005 (MS JDBC) test envionment --> + <profile> + <id>mssql2008</id> + <dependencies> + <dependency> + <groupId>com.microsoft.sqlserver</groupId> + <artifactId>msjdbc</artifactId> + <version>2.0.1008.2</version> + <scope>test</scope> + </dependency> + </dependencies> + <properties> + <db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect> + <jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver> + <jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url> + <jdbc.user>hibbrtru</jdbc.user> + <jdbc.pass>hibbrtru</jdbc.pass> + <jdbc.isolation>4096</jdbc.isolation> + </properties> + </profile> + + </profiles> + + <properties> + <slf4jVersion>1.5.8</slf4jVersion> + </properties> +</project> Modified: core/branches/Branch_3_5/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java =================================================================== --- core/trunk/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java 2010-04-20 16:44:07 UTC (rev 19253) +++ core/branches/Branch_3_5/testing/src/main/java/org/hibernate/test/annotations/HibernateTestCase.java 2010-04-21 01:57:44 UTC (rev 19255) @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * Hibernate, Relational Persistence for Idiomatic Java *