Uplift to jgit 7 to support worktrees

pom.xml

@@ -3,23 +3,23 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.oecd.ant</groupId>
   <artifactId>org.oecd.ant.git</artifactId>
-  <version>1.3.0</version>
-  
+  <version>1.4.0</version>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
-  
+
   <scm>
     <connection>scm:git:https://pacps01.oecd.org/gitblit/r/ant/git-ant-tasks.git</connection>
   </scm>
-  
+
   <repositories>
     <repository>
       <id>jgit-repository</id>
       <url>https://repo.eclipse.org/content/groups/releases/</url>
     </repository>
   </repositories>
-  
+
   <build>
     <sourceDirectory>src</sourceDirectory>
     <resources>
@@ -30,7 +30,7 @@
         </excludes>
       </resource>
     </resources>
-    
+
     <pluginManagement>
       <plugins>
         <plugin>
@@ -50,14 +50,14 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    
+
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>8</source>
+          <target>8</target>
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
@@ -95,10 +95,26 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.8.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <includeScope>compile</includeScope>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <finalName>${project.artifactId}-${project.version}-${buildNumber}</finalName>
   </build>
-  
+
   <dependencies>
     <dependency>
      <groupId>org.slf4j</groupId>
@@ -109,7 +125,7 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>4.1.0.201509280440-r</version>
+      <version>7.7.0.202606012155-r</version>
       <exclusions>
        <exclusion>
         <artifactId>httpclient</artifactId>
@@ -124,5 +140,5 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
-</project>
+
+</project>

src/org/oecd/ant/git/CloneTask.java

@@ -96,7 +96,7 @@ public final void execute() throws BuildException {
 			Git git = cc.call();
 
 			// some testing on current HEAD, wrong branch parameter can leave the clone in a bad state
-			Ref headRef = git.getRepository().getRef(Constants.HEAD);
+			Ref headRef = git.getRepository().findRef(Constants.HEAD);
 			if (headRef != null) {
 				if (!headRef.isSymbolic())
 					throw new BuildException("detached HEAD");

src/org/oecd/ant/git/CommitTask.java

@@ -104,7 +104,7 @@ protected void executeCustom(Git git) throws Exception {
 
 		RevCommit commit = cc.call();
 
-		Ref head = git.getRepository().getRef(Constants.HEAD);
+		Ref head = git.getRepository().findRef(Constants.HEAD);
 
 		String branchName;
 		if (!head.isSymbolic())

src/org/oecd/ant/git/RefTask.java

@@ -34,7 +34,7 @@ protected void checkProperties() throws Exception {
 
 	@Override
 	protected void executeCustom(Git git) throws Exception {
-		Ref ref = git.getRepository().getRef(name);
+		Ref ref = git.getRepository().findRef(name);
 		if (ref == null) {
 			throw new BuildException(MessageFormat.format("Ref ''{1}'' not found in ''{0}''", getRepo().getAbsolutePath(), name));
 		}

src/org/oecd/ant/git/SimpleProgressMonitor.java

@@ -34,4 +34,10 @@ public boolean isCancelled() {
 		return false;
 	}
 
+	/**
+	 * No implementation of showing duration
+	 */
+	public void showDuration(boolean show) {
+	}
+
 }

src/org/oecd/ant/git/custom/CustomAddCommand.java

@@ -174,7 +174,7 @@ else if (!(path.equals(lastAddedFile))) {
 
 								if (FileMode.GITLINK != mode) {
 									entry.setLength(sz);
-									entry.setLastModified(f.getEntryLastModified());
+									entry.setLastModified(f.getEntryLastModifiedInstant());
 									long contentSize = f.getEntryContentLength();
 									InputStream in = f.openEntryStream();
 									try {