Fix style

Author: aleksandr-m

src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java

@@ -254,8 +254,8 @@ protected String getCurrentProjectVersion() throws MojoFailureException {
      */
     private MavenProject reloadProject(MavenProject project) throws MojoFailureException {
         try {
-        	ProjectBuildingResult result = projectBuilder.build(project.getFile(), mavenSession.getProjectBuildingRequest());
-        	return result.getProject();
+            ProjectBuildingResult result = projectBuilder.build(project.getFile(), mavenSession.getProjectBuildingRequest());
+            return result.getProject();
         } catch (Exception e) {
             throw new MojoFailureException("Error re-loading project info", e);
         }
@@ -313,7 +313,8 @@ protected void checkSnapshotDependencies() throws MojoFailureException {
                 getLog().warn(s);
             }
             throw new MojoFailureException(
-                    "There is some SNAPSHOT dependencies in the project, see warnings above. Change them or ignore with `allowSnapshots` property.");
+                    "There is some SNAPSHOT dependencies in the project, see warnings above."
+                    + " Change them or ignore with `allowSnapshots` property.");
         }
     }
 
@@ -329,9 +330,9 @@ protected void checkSnapshotDependencies() throws MojoFailureException {
      */
     protected boolean validBranchName(final String branchName)
             throws MojoFailureException, CommandLineException {
-        CommandResult r = executeGitCommandExitCode("check-ref-format",
+        CommandResult res = executeGitCommandExitCode("check-ref-format",
                 "--allow-onelevel", branchName);
-        return r.getExitCode() == SUCCESS_EXIT_CODE;
+        return res.getExitCode() == SUCCESS_EXIT_CODE;
     }
 
     /**
@@ -1000,11 +1001,11 @@ protected void mvnSetVersions(final String version) throws MojoFailureException,
         getLog().info("Updating version(s) to '" + version + "'.");
 
         String newVersion = "-DnewVersion=" + version;
-        String g = "";
-        String a = "";
+        String grp = "";
+        String art = "";
         if (versionsForceUpdate) {
-            g = "-DgroupId=";
-            a = "-DartifactId=";
+            grp = "-DgroupId=";
+            art = "-DartifactId=";
         }
 
         if (tychoBuild) {
@@ -1017,7 +1018,7 @@ protected void mvnSetVersions(final String version) throws MojoFailureException,
             executeMvnCommand(TYCHO_VERSIONS_PLUGIN_SET_GOAL, prop, newVersion, "-Dtycho.mode=maven");
         } else {
             if (!skipUpdateVersion) {
-                executeMvnCommand(VERSIONS_MAVEN_PLUGIN_SET_GOAL, g, a, newVersion, "-DgenerateBackupPoms=false");
+                executeMvnCommand(VERSIONS_MAVEN_PLUGIN_SET_GOAL, grp, art, newVersion, "-DgenerateBackupPoms=false");
             }
 
             if (StringUtils.isNotBlank(versionProperty)) {

src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowHotfixFinishMojo.java

@@ -344,7 +344,7 @@ && notSameProdDevName()) { // if no release branch
             }
 
             if (!keepBranch) {
-                if (skipMergeProdBranch){
+                if (skipMergeProdBranch) {
                     //force delete as upstream merge is skipped
                     gitBranchDeleteForce(hotfixBranchName);
                 } else {

src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowHotfixStartMojo.java

@@ -227,7 +227,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
                 if (useSnapshotInHotfix && mavenSession.getUserProperties().get("useSnapshotInHotfix") != null) {
                     getLog().warn(
-                            "The useSnapshotInHotfix parameter is set from the command line. Don't forget to use it in the finish goal as well."
+                            "The useSnapshotInHotfix parameter is set from the command line."
+                                    + " Don't forget to use it in the finish goal as well."
                                     + " It is better to define it in the project's pom file.");
                 }
 

src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseFinishMojo.java

@@ -309,7 +309,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
             if (commitDevelopmentVersionAtStart && !notSameProdDevName()) {
                 getLog().warn(
-                        "The commitDevelopmentVersionAtStart will not have effect. It can be enabled only when there are separate branches for development and production.");
+                        "The commitDevelopmentVersionAtStart will not have effect. "
+                                + "It can be enabled only when there are separate branches for development and production.");
                 commitDevelopmentVersionAtStart = false;
             }
 

src/main/java/com/amashchenko/maven/plugin/gitflow/GitFlowReleaseStartMojo.java

@@ -186,7 +186,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
             if (commitDevelopmentVersionAtStart && !notSameProdDevName()) {
                 getLog().warn(
-                        "The commitDevelopmentVersionAtStart will not have effect. It can be enabled only when there are separate branches for development and production.");
+                        "The commitDevelopmentVersionAtStart will not have effect. "
+                                + "It can be enabled only when there are separate branches for development and production.");
                 commitDevelopmentVersionAtStart = false;
             }
 
@@ -208,7 +209,8 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
             if (useSnapshotInRelease && mavenSession.getUserProperties().get("useSnapshotInRelease") != null) {
                 getLog().warn(
-                        "The useSnapshotInRelease parameter is set from the command line. Don't forget to use it in the finish goal as well."
+                        "The useSnapshotInRelease parameter is set from the command line."
+                                + " Don't forget to use it in the finish goal as well."
                                 + " It is better to define it in the project's pom file.");
             }