HHH-14509 : Git master -> main branch renaming

Author: sebersole

.github/workflows/contributor-build.yml

@@ -9,11 +9,11 @@ name: Hibernate ORM build
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
       - 'wip/6.0'
   pull_request:
     branches:
-      - 'master'
+      - 'main'
       - 'wip/6.0'
 jobs:
   build:

CONTRIBUTING.md

@@ -62,8 +62,8 @@ although this is more of a mnemonic strategy than a hard-and-fast rule - but doi
 
 _If there is not already a JIRA issue covering the work you want to do, create one._
 
-Assuming you will be working from the master branch and working
-on the JIRA HHH-123 : `git checkout -b HHH-123 master`
+Assuming you will be working from the `main` branch and working
+on the JIRA HHH-123 : `git checkout -b HHH-123 main`
 
 
 ## Code

README.md

@@ -8,7 +8,7 @@ It also provides an implementation of the JPA specification, which is the standa
 
 This is the repository of its source code: see [Hibernate.org](http://hibernate.org/orm/) for additional information.
 
-[![Build Status](http://ci.hibernate.org/job/hibernate-orm-master-h2-main/badge/icon)](http://ci.hibernate.org/job/hibernate-orm-master-h2-main/)
+[![Build Status](http://ci.hibernate.org/job/hibernate-orm-main-h2-main/badge/icon)](http://ci.hibernate.org/job/hibernate-orm-main-h2-main/)
 [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/hibernate/hibernate-orm.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/hibernate/hibernate-orm/context:java)
 
 Building from sources

etc/hibernate.properties

@@ -190,7 +190,7 @@ hibernate.connection.url jdbc:hsqldb:./build/db/hsqldb/hibernate
 
 #hibernate.dialect org.hibernate.dialect.InterbaseDialect
 #hibernate.connection.username sysdba
-#hibernate.connection.password masterkey
+#hibernate.connection.password thekey
 
 ## DO NOT specify hibernate.connection.sqlDialect
 

etc/hibernate.properties.template

@@ -169,7 +169,7 @@ hibernate.connection.url @DB_URL@
 
 #hibernate.dialect org.hibernate.dialect.InterbaseDialect
 #hibernate.connection.username sysdba
-#hibernate.connection.password masterkey
+#hibernate.connection.password thepass
 
 ## DO NOT specify hibernate.connection.sqlDialect
 

hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

@@ -1669,7 +1669,7 @@ void cannotResolveNonNullableTransientDependencies(
 	)
 	void applyingExplicitDiscriminatorColumnForJoined(String className, String overrideSetting);
 
-	// 458-466 reserved for use by master (ORM 5.0.0)
+	// 458-466 reserved for use by main branch (ORM 5.0.0)
 
 	@LogMessage(level = DEBUG)
 	@Message(value = "Creating pooled optimizer (lo) with [incrementSize=%s; returnClass=%s]", id = 467)

hibernate-core/src/test/java/org/hibernate/test/annotations/entity/FormalLastName.java

@@ -26,7 +26,7 @@ public class FormalLastName {
 	@Embedded
 	private LastName lastName;
 
-	private String designation; /* Mr/Mrs/Master */
+	private String designation; /* Mr/Mrs */
 
 	public Integer getId() {
 		return id;

hibernate-core/src/test/java/org/hibernate/test/fileimport/Dog.java

@@ -12,7 +12,7 @@
  */
 public class Dog {
 	private Integer id;
-	private Human master;
+	private Human owner;
 
 	public Integer getId() {
 		return id;
@@ -22,11 +22,11 @@ public void setId(Integer id) {
 		this.id = id;
 	}
 
-	public Human getMaster() {
-		return master;
+	public Human getOwner() {
+		return owner;
 	}
 
-	public void setMaster(Human master) {
-		this.master = master;
+	public void setOwner(Human owner) {
+		this.owner = owner;
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedFormWithBeanValidationNotNullTest.java

@@ -21,7 +21,7 @@ public class AnnotatedFormWithBeanValidationNotNullTest extends BaseUnitTestCase
 	@TestForIssue( jiraKey = "HHH-8167" )
 	public void testAnnotatedFormWithBeanValidationNotNull() {
 		Configuration cfg = new Configuration();
-		cfg.addAnnotatedClass( AnnotatedMaster.class ).addAnnotatedClass( AnnotatedDetail.class );
+		cfg.addAnnotatedClass( AnnotatedRoot.class ).addAnnotatedClass( AnnotatedDetail.class );
 		cfg.buildSessionFactory().close();
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedMaster.java renamed to hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedRoot.java

@@ -22,7 +22,7 @@
  * @author Steve Ebersole
  */
 @Entity
-public class AnnotatedMaster {
+public class AnnotatedRoot {
 	@Id
 	private Integer id;
 	private String name;