Ensure that apply data is present in submodules as well

Otherwise calling "project.Module#ApplyNewVersion()" on a submodule
would return an empty version.

Author: bernd

project/project.go

@@ -175,6 +175,9 @@ func New(config config.Config, manifestFiles []string, options ...projectOption)
 		moduleRepository := module.Repository
 		submodules := make([]Module, 0)
 
+		// Create apply data for this module and fill the blanks from the default apply data
+		moduleApply := newApplyFromTemplate(module, defaultApply)
+
 		if config.ForceHttpsRepos {
 			moduleRepository = utils.ConvertGithubGitToHTTPS(module.Repository)
 		}
@@ -184,6 +187,9 @@ func New(config config.Config, manifestFiles []string, options ...projectOption)
 				path := getModulePath(repositoryRoot, moduleName, submodule)
 				name := getMavenCoordinates(path).ArtifactId
 
+				// Create apply data for this submodule and fill the blanks from the parent module apply data
+				submoduleApply := newApplyFromTemplate(submodule, moduleApply)
+
 				if name == "" {
 					name = moduleName
 				}
@@ -195,6 +201,7 @@ func New(config config.Config, manifestFiles []string, options ...projectOption)
 					Revision:           module.Revision,
 					Assemblies:         submodule.Assemblies,
 					AssemblyAttachment: submodule.AssemblyAttachment,
+					apply:              submoduleApply,
 				})
 			}
 		}
@@ -206,15 +213,6 @@ func New(config config.Config, manifestFiles []string, options ...projectOption)
 			name = moduleName
 		}
 
-		moduleApply := Apply{
-			FromRevision: module.Apply.FromRevision,
-			NewBranch:    module.Apply.NewBranch,
-			NewVersion:   module.Apply.NewVersion,
-		}
-
-		// Merge the module `apply` field with the default apply values.
-		mergo.Merge(&moduleApply, defaultApply)
-
 		newModule := Module{
 			Name:               name,
 			Path:               path,
@@ -261,6 +259,21 @@ func New(config config.Config, manifestFiles []string, options ...projectOption)
 	return project
 }
 
+func newApplyFromTemplate(module manifest.ManifestModule, template Apply) Apply {
+	newApply := Apply{
+		FromRevision: module.Apply.FromRevision,
+		NewBranch:    module.Apply.NewBranch,
+		NewVersion:   module.Apply.NewVersion,
+	}
+
+	// Fill in missing Apply attributes from template
+	if err := mergo.Merge(&newApply, template); err != nil {
+		logger.Fatal("Couldn't merge apply state: src=%#v dst=%#v", template, newApply)
+	}
+
+	return newApply
+}
+
 func applyModuleOverride(c config.Config, modules []Module) []Module {
 	newModules := make([]Module, 0)