Merge pull request #179 from katox/master

JGit and other updates

Author: ktoso

pom.xml

@@ -69,9 +69,9 @@
   </scm>
 
   <properties>
-    <maven-plugin-api.version>2.2.1</maven-plugin-api.version>
+    <maven-plugin-api.version>3.1.1</maven-plugin-api.version>
 
-    <jgit.version>3.4.1.201406201815-r</jgit.version>
+    <jgit.version>3.7.0.201502260915-r</jgit.version>
     <junit.version>4.12</junit.version>
     <mockito.version>2.0.5-beta</mockito.version>
 
@@ -93,11 +93,6 @@
       <artifactId>maven-core</artifactId>
       <version>${maven-plugin-api.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>${maven-plugin-api.version}</version>
-    </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

src/main/java/pl/project13/maven/git/GitCommitIdMojo.java

@@ -295,7 +295,7 @@ public class GitCommitIdMojo extends AbstractMojo {
   /**
    * The Maven Session Object
    *
-   * @parameter expression="${session}"
+   * @parameter property="session"
    * @required
    * @readonly
    */

src/main/java/pl/project13/maven/git/JGitProvider.java

@@ -3,6 +3,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
@@ -69,13 +70,13 @@ protected void init() throws MojoExecutionException {
   @Override
   protected String getBuildAuthorName() {
     String userName = git.getConfig().getString("user", null, "name");
-    return Objects.firstNonNull(userName, "");
+    return MoreObjects.firstNonNull(userName, "");
   }
 
   @Override
   protected String getBuildAuthorEmail() {
     String userEmail = git.getConfig().getString("user", null, "email");
-    return Objects.firstNonNull(userEmail, "");
+    return MoreObjects.firstNonNull(userEmail, "");
   }
 
   @Override

src/test/java/pl/project13/maven/git/FileSystemMavenSandbox.java

@@ -168,7 +168,7 @@ public MavenProject getChildProject() {
   @NotNull
   private MavenProject createProject(File basedir, String packaging) {
     MavenProject project = new MavenProject();
-    project.setBasedir(basedir);
+    project.setFile(new File(basedir + FILE_SEPARATOR + "pom.xml"));
     project.setPackaging(packaging);
     return project;
   }