.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

README.md

@@ -25,7 +25,7 @@ A common use-case might be to install local git hooks by setting the `core.hooks
     <plugin>
       <groupId>com.rudikershaw.gitbuildhook</groupId>
       <artifactId>git-build-hook-maven-plugin</artifactId>
-      <version>3.2.0</version>
+      <version>3.3.0</version>
       <configuration>
         <gitConfig>
           <!-- The location of the directory you are using to store the Git hooks in your project. -->

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.rudikershaw.gitbuildhook</groupId>
   <artifactId>git-build-hook-maven-plugin</artifactId>
-  <version>3.3.0</version>
+  <version>3.4.0</version>
   <packaging>maven-plugin</packaging>
 
   <name>Git Build Hook Maven Plugin</name>
@@ -31,7 +31,7 @@
   <scm>
     <connection>scm:git:git://github.com/rudikershaw/git-build-hook.git</connection>
     <developerConnection>scm:git:ssh://github.com:rudikershaw/git-build-hook.git</developerConnection>
-    <url>http://github.com/rudikershaw/git-build-hook/tree/master</url>
+    <url>http://github.com/rudikershaw/git-build-hook/tree/main</url>
   </scm>
 
   <prerequisites>
@@ -43,7 +43,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <maven.version>3.8.6</maven.version>
+    <maven.version>3.9.0</maven.version>
   </properties>
 
   <dependencies>
@@ -115,37 +115,8 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clean-plugin</artifactId>
-        <version>3.2.0</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.10.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.0.0</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>3.3.0</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.12.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M7</version>
-      </plugin>
-      <!-- Override jar and install plugin for extra pre-test install to a custom repo for testing. -->
+      <!-- Problem: The integration tests run using Maven verifier API are testing projects run from the previous build. -->
+      <!-- Solution: Override jar and install plugin for extra pre-test install to a custom repo for testing. -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -208,6 +179,25 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.rudikershaw</groupId>
+        <artifactId>remove-attached-artifact-maven-plugin</artifactId>
+        <version>1.1.0</version>
+        <executions>
+          <execution>
+            <id>remove-attached-artifacts</id>
+            <goals>
+              <goal>remove</goal>
+            </goals>
+            <configuration>
+              <artifactIds>
+                <artifactId>${project.groupId}:${project.artifactId}:jar:TEST:${project.version}</artifactId>
+                <artifactId>${project.groupId}:${project.artifactId}:test-jar:CPHOOKS:${project.version}</artifactId>
+              </artifactIds>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

src/main/java/com/rudikershaw/gitbuildhook/GitConfigMojo.java

@@ -23,7 +23,7 @@ public class GitConfigMojo extends GitRepositoryValidator {
     private MavenProject project;
 
     /** The git config to set and the values to set them to. */
-    @Parameter(readonly = true)
+    @Parameter
     private Map<String, String> gitConfig;
 
     @Override
@@ -34,6 +34,14 @@ public void execute() throws MojoFailureException {
         final FileRepositoryBuilder repoBuilder =  new FileRepositoryBuilder();
         repoBuilder.findGitDir(project.getBasedir());
 
+        if (repoBuilder.getGitDir().getAbsolutePath().contains(".git/worktrees/")) {
+            getLog().warn(
+    "The plugin appears to be running in a Git worktree. "
+                + "Worktree configuration is not currently supported. No configuration changes made."
+            );
+            return;
+        }
+
         try (Git git = Git.open(repoBuilder.getGitDir())) {
             final StoredConfig config = git.getRepository().getConfig();
             for (final Map.Entry<String, String> entry : gitConfig.entrySet()) {

src/main/java/com/rudikershaw/gitbuildhook/InstallMojo.java

@@ -27,7 +27,7 @@
 public class InstallMojo extends GitRepositoryValidator {
 
     /** The location of git hooks to install into the default hooks directory. */
-    @Parameter(readonly = true)
+    @Parameter
     private final Map<String, String> installHooks = new HashMap<>();
 
     /** Injected MavenProject containing project related information such as base directory. */

src/main/java/com/rudikershaw/gitbuildhook/validation/GitRepositoryValidator.java

@@ -1,11 +1,8 @@
 package com.rudikershaw.gitbuildhook.validation;
 
-import java.io.IOException;
-
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
-import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 
 /** Abstract class containing the logic required to fail a goal if there is no valid git repository. */
@@ -21,13 +18,7 @@ protected void validateGitRepository(final MavenProject project) throws MojoFail
         final FileRepositoryBuilder repoBuilder =  new FileRepositoryBuilder();
         repoBuilder.findGitDir(project.getBasedir());
 
-        if (repoBuilder.getGitDir() != null) {
-            try (Git git = Git.open(repoBuilder.getGitDir())) {
-                getLog().info("Found the local git repository.");
-            } catch (final IOException e) {
-                failBuildBecauseRepoCouldNotBeFound(e);
-            }
-        } else {
+        if (repoBuilder.getGitDir() == null) {
             failBuildBecauseRepoCouldNotBeFound(null);
         }
     }

src/test/java/com/rudikershaw/gitbuildhook/AbstractMojoTest.java

@@ -1,18 +1,21 @@
 package com.rudikershaw.gitbuildhook;
 
-import static org.junit.Assert.assertTrue;
+import org.apache.commons.io.FileUtils;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.plugin.testing.MojoRule;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.plugin.testing.MojoRule;
-import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
-import org.apache.maven.it.Verifier;
+import static org.junit.Assert.assertTrue;
 
 /** Abstract test for Mojos. */
 public class AbstractMojoTest {
@@ -41,6 +44,18 @@ public TemporaryFolder getFolder() {
         return folder;
     }
 
+    @Before
+    public void setup() throws IOException {
+        FileUtils.copyDirectory(new File("./.mvn"), new File(folder.getRoot().getAbsolutePath() + "/.mvn"));
+        Files.copy(Paths.get("mvnw"), Paths.get(folder.getRoot().getAbsolutePath() + "/mvnw"));
+        Files.copy(Paths.get("mvnw.cmd"), Paths.get(folder.getRoot().getAbsolutePath() + "/mvnw.cmd"));
+    }
+
+    @After
+    public void teardown() throws IOException {
+        FileUtils.deleteDirectory(folder.getRoot());
+    }
+
     /**
      * Move a file for a specified test folder into a temporary directory for testing.
      *

src/test/resources/default-test-project/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.rudikershaw.gitbuildhook</groupId>
-  <artifactId>git-build-hook</artifactId>
+  <artifactId>test-artifact</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Test MyMojo</name>
@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
       </plugin>
     </plugins>
   </build>

src/test/resources/test-project-configure/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.rudikershaw.gitbuildhook</groupId>
-  <artifactId>git-build-hook</artifactId>
+  <artifactId>test-artifact</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Test MyMojo</name>
@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <configuration>
           <gitConfig>
             <core.hooksPath>hooks-path/</core.hooksPath>

src/test/resources/test-project-initialise/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.rudikershaw.gitbuildhook</groupId>
-  <artifactId>git-build-hook</artifactId>
+  <artifactId>test-artifact</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Test MyMojo</name>
@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <executions>
           <execution>
             <goals>

src/test/resources/test-project-install-hooks/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.rudikershaw.gitbuildhook</groupId>
-  <artifactId>git-build-hook</artifactId>
+  <artifactId>test-artifact</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Test MyMojo</name>
@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <configuration>
           <installHooks>
             <pre-commit>hook-to-install.sh</pre-commit>

src/test/resources/test-project-invalid-hook/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.rudikershaw.gitbuildhook</groupId>
-  <artifactId>git-build-hook</artifactId>
+  <artifactId>test-artifact</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Test MyMojo</name>
@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <configuration>
           <installHooks>
             <pre-commit-oops>hook-to-install.sh</pre-commit-oops>

src/test/resources/test-project-reinstall-hooks/pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.rudikershaw.gitbuildhook</groupId>
-  <artifactId>git-build-hook</artifactId>
+  <artifactId>test-artifact</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Test MyMojo</name>
@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <configuration>
           <installHooks>
             <pre-commit>hook-to-install.sh</pre-commit>

src/test/resources/test-project-reinstall-hooks/pom2.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.rudikershaw.gitbuildhook</groupId>
-  <artifactId>git-build-hook</artifactId>
+  <artifactId>test-artifact</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Test MyMojo</name>
@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0</version>
         <configuration>
           <installHooks>
             <pre-commit>hook-to-reinstall.sh</pre-commit>