Merge pull request #54 from hazendaz/master
[SCM-884] Raise to last version of java 7 release
diff --git a/maven-scm-plugin/pom.xml b/maven-scm-plugin/pom.xml
index 4bd375f..2f12e7f 100644
--- a/maven-scm-plugin/pom.xml
+++ b/maven-scm-plugin/pom.xml
@@ -43,6 +43,8 @@
<properties>
<mavenVersion>2.2.1</mavenVersion>
<mavenPluginVersion>3.2</mavenPluginVersion>
+
+ <maven.compiler.target>1.7</maven.compiler.target>
</properties>
<prerequisites>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml
index 20b93fa..22cfcc9 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml
@@ -35,6 +35,10 @@
see http://eclipse.org/jgit/
</description>
+ <properties>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<!-- Test -->
<dependency>
@@ -50,8 +54,8 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <!-- 4.x version are java 7 -->
- <version>3.7.1.201504261725-r</version>
+ <version>4.5.0.201609210915-r</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
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 d530d9c..b6900b4 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
@@ -243,7 +243,7 @@
{
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 4b0565e..7fd7c35 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 @@
// 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 @@
{
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 60f3d44..b89299a 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
@@ -167,7 +167,7 @@
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
@@ -179,7 +179,7 @@
{
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 f640b03..d699a44 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 @@
}
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 4957a29..2083a4b 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 @@
// 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 @@
{
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 8aeccce..b391e91 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
@@ -270,7 +270,7 @@
RevWalk rw = new RevWalk( repository );
AnyObjectId headId = repository.resolve( Constants.HEAD );
RevCommit head = rw.parseCommit( headId );
- rw.release();
+ rw.close();
return head;
}
diff --git a/maven-scm-providers/maven-scm-providers-standard/pom.xml b/maven-scm-providers/maven-scm-providers-standard/pom.xml
index 4d4efa9..9b51186 100644
--- a/maven-scm-providers/maven-scm-providers-standard/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-standard/pom.xml
@@ -33,6 +33,10 @@
<name>Maven SCM Standard Providers</name>
+ <properties>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.scm</groupId>
