Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,796 Commits 28 Branches 361 Tags 364 MiB
Java 99.7%
Shell 0.1%
ANTLR 0.1%
Go to file
Gail Badner 6fdc9bac13 HHH-9106 : Merging multiple representations of the same entity merged 
(cherry picked from commit 70532259fa)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
	hibernate-core/src/main/java/org/hibernate/event/internal/DefaultMergeEventListener.java
	hibernate-core/src/main/java/org/hibernate/event/internal/EventCache.java
	hibernate-core/src/test/java/org/hibernate/event/internal/EventCacheTest.java
	hibernate-core/src/test/java/org/hibernate/test/ops/AbstractOperationTestCase.java
	hibernate-core/src/test/java/org/hibernate/test/ops/Category.java
	hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.hbm.xml
	hibernate-core/src/test/java/org/hibernate/test/ops/Hoarder.java
	hibernate-core/src/test/java/org/hibernate/test/ops/Item.java
	hibernate-core/src/test/resources/log4j.properties
 		2014-06-13 18:15:32 -07:00
buildSrc [HHH-8707] Add support for oracle12c, postgresql92, postgresplus92, db2-10, mssql2012 to DatabaseAllocator 2013-11-19 18:12:51 -05:00
databases HHH-7298 org.hibernate.test.dialect.functional.SQLServerDialectTest#testLockNowaitSqlServer catches wrong exception 2012-06-01 15:52:00 +08:00
documentation HHH-8904 minor edits 2014-05-27 22:06:54 -04:00
etc HHH-9039 Typo 2014-03-12 14:37:36 -04:00
gradle/wrapper HHH-8734 Update to Gradle 1.9 2013-11-21 14:51:33 -05:00
hibernate-c3p0 HHH-8779 corrected bundle symbolic name 2013-12-09 11:01:39 -05:00
hibernate-core HHH-9106 : Merging multiple representations of the same entity merged 2014-06-13 18:15:32 -07:00
hibernate-ehcache HHH-8779 corrected bundle symbolic name 2013-12-09 11:01:39 -05:00
hibernate-enhance-maven-plugin HHH-8777 corrected configurations used in pom plugin 2014-02-04 12:32:30 -05:00
hibernate-entitymanager HHH-9106 : Merging multiple representations of the same entity merged 2014-06-13 18:15:32 -07:00
hibernate-envers HHH-9193 : Default audit behavior of mapped-superclass (test cases) 2014-05-27 17:39:08 -07:00
hibernate-gradle-plugin HHH-8354 added new dirty-checking options to newly cherry-picked plugins 2013-11-21 15:35:24 -05:00
hibernate-infinispan HHH-8923 corrected test case 2014-03-26 10:36:23 -04:00
hibernate-osgi HHH-8922 ClassLoaderServiceImpl#getResources should use LinkedHashSet to 2014-02-07 10:07:31 -05:00
hibernate-proxool HHH-8779 corrected bundle symbolic name 2013-12-09 11:01:39 -05:00
hibernate-testing HHH-8923 - Reconsider closing of ServiceRegistry instances 2014-03-26 09:32:40 -04:00
release HHH-8335 Hibernate OSGi not included in build's /lib 2013-06-29 12:56:06 -04:00
.gitignore HHH-8777 dynamically generate descriptor dependencies 2014-02-04 10:06:41 -05:00
README.md update README 2012-10-30 15:39:16 +08:00
build.gradle Update version to 4.2.14.SNAPSHOT 2014-05-28 16:46:12 -07:00
changelog.txt 4.2.13 prep 2014-05-28 13:56:56 -07:00
gradlew HHH-8734 Update to Gradle 1.9 2013-11-21 14:51:33 -05:00
gradlew.bat HHH-8734 Update to Gradle 1.9 2013-11-21 14:51:33 -05:00
hibernate_logo.gif SVN layout migration for core/trunk 2007-06-29 19:24:12 +00:00
lgpl.txt SVN layout migration for core/trunk 2007-06-29 19:24:18 +00:00
libraries.gradle HHH-8337 Added Maven plugin to enhance Entities during build time. 2013-11-21 15:21:20 -05:00
settings.gradle HHH-8777 Completed implementation of Maven Enhance Plugin fixing issue with 2014-02-04 10:06:39 -05:00
utilities.gradle HHH-7527 Enterprise OSGi JPA support 2013-02-14 11:04:35 -05:00

README.md

How to build

Starting with development of version 4.0, Hibernate uses Gradle as its build tool.

This README describes some of the basics developers and contributors new to Gradle need to know to get productive quickly.

Quickstart

 git clone git://github.com/hibernate/hibernate-orm.git
 cd hibernate-orm
 ./gradlew clean build

If you are having problems with unresolved dependencies you need to configure access to the JBoss Nexus repository (see below).

Resources

General

JBoss Nexus

Gradle

Executing Tasks

Gradle uses the concept of build tasks (equivalent to Ant targets). You can get a list of available tasks via

gradle tasks

or using gradle wrapper

./gradlew tasks

Executing Tasks Across All Modules

To execute a task across all modules, simply perform that task from the root directory. Gradle will visit each subproject and execute that task if the subproject defines it.

Executing Tasks In Specific Module

To execute a task in a specific module you can either:

  1. cd into that module directory and execute the task
  2. name the "task path". For example, in order to run the tests for the hibernate-core module from the root directory you could say gradle hibernate-core:test

Common Java related tasks

  • build - Assembles (jars) and tests this project
  • buildDependents - Assembles and tests this project and all projects that depend on it. So think of running this in hibernnate-entitymanager, Gradle would assemble and test hibernate-entitymanager as well as hibernate-envers (because envers depends on entitymanager)
  • classes - Compiles the main classes
  • testClasses - Compiles the test classes
  • jar - Generates a jar archive with all the compiled classes
  • test - Runs the tests
  • uploadArchives - Think Maven deploy
  • install - Installs the project jar to your local maven cache (aka ~/.m2/repository)
  • eclipse - Generates an Eclipse project
  • idea - Generates an IntelliJ/IDEA project.
  • clean - Cleans the build directory