diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java index f22a139..ea40dcf 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java @@ -218,7 +218,7 @@ public class JGitUtils { list.add( new ScmFile( diff.getNewPath(), ScmFileStatus.CHECKED_IN ) ); } - rw.release(); + rw.close(); } return list; } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java index b42afe6..087580a 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java @@ -99,7 +99,7 @@ public class JGitBranchCommand // search for the tagged files final RevWalk revWalk = new RevWalk( git.getRepository() ); RevCommit commit = revWalk.parseCommit( branchResult.getObjectId() ); - revWalk.release(); + revWalk.close(); final TreeWalk walk = new TreeWalk( git.getRepository() ); walk.reset(); // drop the first empty tree, which we do not need here @@ -111,7 +111,7 @@ public class JGitBranchCommand { files.add( new ScmFile( walk.getPathString(), ScmFileStatus.CHECKED_OUT ) ); } - walk.release(); + walk.close(); return new BranchScmResult( "JGit branch", files ); diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java index 8d4931b..3382825 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java @@ -166,7 +166,7 @@ public class JGitCheckOutCommand RevWalk revWalk = new RevWalk( git.getRepository() ); RevCommit commit = revWalk.parseCommit( git.getRepository().resolve( Constants.HEAD ) ); - revWalk.release(); + revWalk.close(); final TreeWalk walk = new TreeWalk( git.getRepository() ); walk.reset(); // drop the first empty tree, which we do not need here @@ -178,7 +178,7 @@ public class JGitCheckOutCommand { listedFiles.add( new ScmFile( walk.getPathString(), ScmFileStatus.CHECKED_OUT ) ); } - walk.release(); + walk.close(); getLogger().debug( "current branch: " + git.getRepository().getBranch() ); diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java index a543ef8..9e5a14f 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/diff/JGitDiffCommand.java @@ -131,7 +131,7 @@ public class JGitDiffCommand } finally { - or.release(); + or.close(); } } } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java index a66992a..379db59 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java @@ -97,7 +97,7 @@ public class JGitTagCommand // search for the tagged files RevWalk revWalk = new RevWalk( git.getRepository() ); RevCommit commit = revWalk.parseCommit( tagRef.getObjectId() ); - revWalk.release(); + revWalk.close(); final TreeWalk walk = new TreeWalk( git.getRepository() ); walk.reset(); // drop the first empty tree, which we do not need here @@ -109,7 +109,7 @@ public class JGitTagCommand { taggedFiles.add( new ScmFile( walk.getPathString(), ScmFileStatus.CHECKED_OUT ) ); } - walk.release(); + walk.close(); return new TagScmResult( "JGit tag", taggedFiles ); } diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java index 10fdb85..0a5858d 100644 --- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java +++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommandCommitterAuthorTckTest.java @@ -246,7 +246,7 @@ public class JGitCheckInCommandCommitterAuthorTckTest RevWalk rw = new RevWalk( repository ); AnyObjectId headId = repository.resolve( Constants.HEAD ); RevCommit head = rw.parseCommit( headId ); - rw.release(); + rw.close(); return head; }