From 2106ff62045d09b7bcd4d9545318f5b4476b832a Mon Sep 17 00:00:00 2001 From: moremagic Date: Thu, 19 Mar 2015 14:28:36 +0900 Subject: [PATCH 1/2] Fix committed to do under the login name if you register a GitHub user profile name does not exist. --- github-site-plugin/pom.xml | 3 ++- .../main/java/com/github/maven/plugins/site/SiteMojo.java | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/github-site-plugin/pom.xml b/github-site-plugin/pom.xml index 92c04124..5b8f57f8 100644 --- a/github-site-plugin/pom.xml +++ b/github-site-plugin/pom.xml @@ -9,6 +9,7 @@ site-maven-plugin maven-plugin + 0.12.1-SNAPSHOT GitHub Site Maven Plugin https://github.com/github/maven-plugins Maven plugin that commits files to a branch in a GitHub repository @@ -77,7 +78,7 @@ com.github.github github-maven-core - ${project.version} + ${project.parent.version} diff --git a/github-site-plugin/src/main/java/com/github/maven/plugins/site/SiteMojo.java b/github-site-plugin/src/main/java/com/github/maven/plugins/site/SiteMojo.java index f09080ca..72ba9e3b 100644 --- a/github-site-plugin/src/main/java/com/github/maven/plugins/site/SiteMojo.java +++ b/github-site-plugin/src/main/java/com/github/maven/plugins/site/SiteMojo.java @@ -318,7 +318,6 @@ public void execute() throws MojoExecutionException { Arrays.toString(excludePaths))); String[] paths = PathUtils.getMatchingPaths(includePaths, excludePaths, baseDir); - if (paths.length != 1) info(MessageFormat.format("Creating {0} blobs", paths.length)); else @@ -432,7 +431,11 @@ public void execute() throws MojoExecutionException { User user = userService.getUser(); CommitUser author = new CommitUser(); - author.setName(user.getName()); + //Register a GitHub user profile name does not exist in the login name you commit + if( user.getName() == null || user.getName().length() == 0){ + author.setName(user.getLogin()); + } + author.setEmail(userService.getEmails().get(0)); author.setDate(new GregorianCalendar().getTime()); From 8cf8cbcbecc0d4e97285d9ccc1b3ce596a4606c0 Mon Sep 17 00:00:00 2001 From: moremagic Date: Fri, 20 Mar 2015 09:50:22 +0900 Subject: [PATCH 2/2] Fix leak response. --- .../src/main/java/com/github/maven/plugins/site/SiteMojo.java | 1 + 1 file changed, 1 insertion(+) diff --git a/github-site-plugin/src/main/java/com/github/maven/plugins/site/SiteMojo.java b/github-site-plugin/src/main/java/com/github/maven/plugins/site/SiteMojo.java index 72ba9e3b..446732ab 100644 --- a/github-site-plugin/src/main/java/com/github/maven/plugins/site/SiteMojo.java +++ b/github-site-plugin/src/main/java/com/github/maven/plugins/site/SiteMojo.java @@ -432,6 +432,7 @@ public void execute() throws MojoExecutionException { CommitUser author = new CommitUser(); //Register a GitHub user profile name does not exist in the login name you commit + author.setName(user.getName()); if( user.getName() == null || user.getName().length() == 0){ author.setName(user.getLogin()); }