Merge pull request #514 from git-commit-id/update-deps

Update dependencies

Author: TheSnoozer

core/pom.xml

@@ -17,7 +17,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.target>1.8</java.target>
 
-        <jgit.version>5.2.2.201904231744-r</jgit.version>
+        <jgit.version>5.8.1.202007141445-r</jgit.version>
     </properties>
 
     <dependencies>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.10.3</version>
+            <version>2.10.6</version>
         </dependency>
         <!-- plexus build -->
         <dependency>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.11.1</version>
+            <version>2.11.2</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>

maven/pom.xml

@@ -32,7 +32,7 @@
     <maven-plugin-api.version>3.0</maven-plugin-api.version>
     <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
 
-    <junit.version>4.12</junit.version>
+    <junit.version>4.13</junit.version>
     <mockito.version>3.1.0</mockito.version>
 
     <fest-assert.version>1.4</fest-assert.version>

maven/src/test/java/pl/project13/core/GitDataProviderTest.java

@@ -18,9 +18,6 @@
 package pl.project13.core;
 
 import org.junit.Test;
-import pl.project13.core.GitCommitIdExecutionException;
-import pl.project13.core.GitCommitPropertyConstant;
-import pl.project13.core.GitDataProvider;
 import pl.project13.core.log.LoggerBridge;
 
 import java.util.Properties;

maven/src/test/java/pl/project13/core/JgitProviderAheadBehindTest.java

@@ -17,7 +17,6 @@
 
 package pl.project13.core;
 
-import pl.project13.core.JGitProvider;
 import pl.project13.maven.git.AheadBehindTest;
 
 import java.nio.file.Paths;

maven/src/test/java/pl/project13/core/NativeProviderAheadBehindTest.java

@@ -17,7 +17,6 @@
 
 package pl.project13.core;
 
-import pl.project13.core.NativeGitProvider;
 import pl.project13.maven.git.AheadBehindTest;
 
 public class NativeProviderAheadBehindTest extends AheadBehindTest<NativeGitProvider> {

maven/src/test/java/pl/project13/core/PropertiesFileGeneratorTest.java

@@ -27,7 +27,6 @@
 import pl.project13.core.log.StdOutLoggerBridge;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Properties;

maven/src/test/java/pl/project13/core/UriUserInfoRemoverTest.java

@@ -27,8 +27,6 @@
 
 import junitparams.JUnitParamsRunner;
 import junitparams.Parameters;
-import pl.project13.core.GitCommitIdExecutionException;
-import pl.project13.core.GitDataProvider;
 
 import java.util.Arrays;
 import java.util.Collection;

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

@@ -17,14 +17,11 @@
 
 package pl.project13.maven.git;
 
-import static org.junit.Assert.assertThat;
-
 import java.io.File;
 
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.StoredConfig;
-import org.hamcrest.CoreMatchers;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -33,6 +30,8 @@
 import pl.project13.core.AheadBehind;
 import pl.project13.core.GitProvider;
 
+import static org.junit.Assert.assertEquals;
+
 public abstract class AheadBehindTest<T extends GitProvider> {
 
   @Rule
@@ -87,8 +86,8 @@ protected void extraSetup() {
   public void shouldNotBeAheadOrBehind() throws Exception {
 
     AheadBehind aheadBehind = gitProvider.getAheadBehind();
-    assertThat(aheadBehind.ahead(), CoreMatchers.is("0"));
-    assertThat(aheadBehind.behind(), CoreMatchers.is("0"));
+    assertEquals(aheadBehind.ahead(), "0");
+    assertEquals(aheadBehind.behind(), "0");
   }
 
   @Test
@@ -97,8 +96,8 @@ public void shouldBe1Ahead() throws Exception {
     createLocalCommit();
 
     AheadBehind aheadBehind = gitProvider.getAheadBehind();
-    assertThat(aheadBehind.ahead(), CoreMatchers.is("1"));
-    assertThat(aheadBehind.behind(), CoreMatchers.is("0"));
+    assertEquals(aheadBehind.ahead(),"1");
+    assertEquals(aheadBehind.behind(),"0");
   }
 
   @Test
@@ -107,8 +106,8 @@ public void shouldBe1Behind() throws Exception {
     createCommitInSecondRepoAndPush();
 
     AheadBehind aheadBehind = gitProvider.getAheadBehind();
-    assertThat(aheadBehind.ahead(), CoreMatchers.is("0"));
-    assertThat(aheadBehind.behind(), CoreMatchers.is("1"));
+    assertEquals(aheadBehind.ahead(),"0");
+    assertEquals(aheadBehind.behind(),"1");
   }
 
   @Test
@@ -118,8 +117,8 @@ public void shouldBe1AheadAnd1Behind() throws Exception {
     createCommitInSecondRepoAndPush();
 
     AheadBehind aheadBehind = gitProvider.getAheadBehind();
-    assertThat(aheadBehind.ahead(), CoreMatchers.is("1"));
-    assertThat(aheadBehind.behind(), CoreMatchers.is("1"));
+    assertEquals(aheadBehind.ahead(),"1");
+    assertEquals(aheadBehind.behind(),"1");
   }
 
   protected void createLocalCommit() throws Exception {

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

@@ -287,7 +287,7 @@ public void shouldNotUseBuildEnvironmentBranchInfoWhenParameterSet(boolean useNa
     // reset repo and force detached HEAD
     try (final Git git = git("my-jar-project")) {   
       git.reset().setMode(ResetCommand.ResetType.HARD).setRef("b6a73ed").call();
-      git.checkout().setCreateBranch(true).setName("test_branch").setForce(true).call();
+      git.checkout().setCreateBranch(true).setName("test_branch").setForceRefUpdate(true).call();
     }
 
     // when
@@ -375,7 +375,7 @@ private void shouldUseJenkinsBranchInfoWhenAvailableHelperAndAssertBranch(boolea
     // reset repo and force detached HEAD
     try (final Git git = git("my-jar-project")) {
       git.reset().setMode(ResetCommand.ResetType.HARD).setRef("b6a73ed").call();
-      git.checkout().setName("b6a73ed").setForce(true).call();
+      git.checkout().setName("b6a73ed").setForceRefUpdate(true).call();
     }
 
     // when
@@ -1527,8 +1527,8 @@ public void verifyEvalOnCommitWithTwoBranches(boolean useNativeGit) throws Excep
     //    2343428 - Moved master - Fri, 29 Nov 2013 10:38:34 +0100 (HEAD, branch: master)
     try (final Git git = git("my-jar-project")) {
       git.reset().setMode(ResetCommand.ResetType.HARD).setRef("2343428").call();
-      git.checkout().setCreateBranch(true).setName("another_branch").setForce(true).call();
-      git.checkout().setCreateBranch(true).setName("z_branch").setForce(true).call();
+      git.checkout().setCreateBranch(true).setName("another_branch").setForceRefUpdate(true).call();
+      git.checkout().setCreateBranch(true).setName("z_branch").setForceRefUpdate(true).call();
     }
 
     mojo.useNativeGit = useNativeGit;