Switch develop to 3.4.1-SNAPSHOT and add thread safety features to config an initialise goals.

Author: rudikershaw

pom.xml

@@ -5,7 +5,7 @@
 
   <groupId>com.rudikershaw.gitbuildhook</groupId>
   <artifactId>git-build-hook-maven-plugin</artifactId>
-  <version>3.5.0-SNAPSHOT</version>
+  <version>3.4.1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>Git Build Hook Maven Plugin</name>

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

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.util.Map;
 
+import com.rudikershaw.gitbuildhook.threadsafety.ClassLock;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -37,21 +38,23 @@ public void execute() throws MojoFailureException {
         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."
+                + "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()) {
-                final String[] conf = stringToConfigArray(entry.getKey());
-                config.setString(conf[0], conf[1], conf[2], entry.getValue());
-                getLog().info("Git config '" + entry.getKey() + "' set to - " + entry.getValue());
+        synchronized (ClassLock.class) {
+            try (Git git = Git.open(repoBuilder.getGitDir())) {
+                final StoredConfig config = git.getRepository().getConfig();
+                for (final Map.Entry<String, String> entry : gitConfig.entrySet()) {
+                    final String[] conf = stringToConfigArray(entry.getKey());
+                    config.setString(conf[0], conf[1], conf[2], entry.getValue());
+                    getLog().info("Git config '" + entry.getKey() + "' set to - " + entry.getValue());
+                }
+                config.save();
+            } catch (final IOException ioe) {
+                failBuildBecauseRepoCouldNotBeFound(ioe);
             }
-            config.save();
-        } catch (final IOException ioe) {
-            failBuildBecauseRepoCouldNotBeFound(ioe);
         }
     }
 

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

@@ -1,5 +1,6 @@
 package com.rudikershaw.gitbuildhook;
 
+import com.rudikershaw.gitbuildhook.threadsafety.ClassLock;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -44,7 +45,9 @@ private boolean isGitRepoInitialised() {
      */
     private void initialiseGitRepository() throws MojoFailureException {
         try {
-            Git.init().setDirectory(project.getBasedir()).call();
+            synchronized (ClassLock.class) {
+                Git.init().setDirectory(project.getBasedir()).call();
+            }
         } catch (final GitAPIException e) {
             if (!isGitRepoInitialised()) {
                 throw new MojoFailureException("Could not initialise a local git repository.", e);

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

@@ -72,7 +72,7 @@ private void installGitHook(final String hookName, final String filePath, final
     }
 
     /**
-     * Copies the specified file from the file system into the the default hooks directory.
+     * Copies the specified file from the file system into the default hooks directory.
      *
      * @param filePath path to the file to use as the hook.
      * @param gitHookPathStr the location to move the file to.

src/main/java/com/rudikershaw/gitbuildhook/threadsafety/ClassLock.java

@@ -0,0 +1,8 @@
+package com.rudikershaw.gitbuildhook.threadsafety;
+
+/**
+ * Class to act as a universal lock for non-thread safe operations of the plugin.
+ */
+public class ClassLock {
+
+}

src/main/java/com/rudikershaw/gitbuildhook/threadsafety/package-info.java

@@ -0,0 +1,2 @@
+/** Package containing classes for aiding in the thread safety of the plugin. */
+package com.rudikershaw.gitbuildhook.threadsafety;

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

@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
       </plugin>
     </plugins>
   </build>

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

@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <configuration>
           <gitConfig>
             <core.hooksPath>hooks-path/</core.hooksPath>

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

@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <executions>
           <execution>
             <goals>

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

@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <configuration>
           <installHooks>
             <pre-commit>hook-to-install.sh</pre-commit>

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

@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <configuration>
           <installHooks>
             <pre-commit-oops>hook-to-install.sh</pre-commit-oops>

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

@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <configuration>
           <installHooks>
             <pre-commit>hook-to-install.sh</pre-commit>

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

@@ -15,7 +15,7 @@
       <plugin>
         <groupId>com.rudikershaw.gitbuildhook</groupId>
         <artifactId>git-build-hook-maven-plugin</artifactId>
-        <version>3.5.0-SNAPSHOT</version>
+        <version>3.4.1-SNAPSHOT</version>
         <configuration>
           <installHooks>
             <pre-commit>hook-to-reinstall.sh</pre-commit>