From 425d5a1aedc17da35a523b7c1f4ca7c142bb05a8 Mon Sep 17 00:00:00 2001
From: "James X. Nelson" <James@WeTheInter.net>
Date: Fri, 29 Jun 2018 08:07:28 -0700
Subject: [PATCH] Fix livelock from concurrent use of HashMap

---
 .../plugins/license/maven/AbstractLicenseMojo.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/groovy/nl/javadude/gradle/plugins/license/maven/AbstractLicenseMojo.java b/src/main/groovy/nl/javadude/gradle/plugins/license/maven/AbstractLicenseMojo.java
index b45b0b6..ca2c491 100644
--- a/src/main/groovy/nl/javadude/gradle/plugins/license/maven/AbstractLicenseMojo.java
+++ b/src/main/groovy/nl/javadude/gradle/plugins/license/maven/AbstractLicenseMojo.java
@@ -37,13 +37,13 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.CompletionService;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.ExecutorService;
@@ -187,8 +187,8 @@ public void run() {
      * From com/google/code/mojo/license/AbstractLicenseMojo.java
      */
     protected final Map<String, String> mergeProperties() {
-        // first put syste environment
-        Map<String, String> props = new HashMap<String, String>(System.getenv());
+        // first put system environment
+        Map<String, String> props = new ConcurrentHashMap<String, String>(System.getenv());
 
         // Override with extension
         props.putAll(initial);
@@ -201,8 +201,8 @@ protected final Map<String, String> mergeProperties() {
     }
 
     private Map<String, String> buildMapping(Map<String,HeaderDefinition> headerDefinitions) {
-        Map<String, String> extensionMapping = useDefaultMappings ? new HashMap<String, String>(defaultMapping())
-                        : new HashMap<String, String>();
+        Map<String, String> extensionMapping = useDefaultMappings ? new ConcurrentHashMap<String, String>(defaultMapping())
+                        : new ConcurrentHashMap<String, String>();
 
         List<HeaderType> headerTypes = Arrays.asList(HeaderType.values());
         Set<String> validHeaderTypes = new HashSet<String>();
@@ -228,7 +228,7 @@ private Map<String, String> buildMapping(Map<String,HeaderDefinition> headerDefi
 
     private Map<String, HeaderDefinition> buildHeaderDefinitions() {
         // like mappings, first get default definitions
-        final Map<String, HeaderDefinition> headers = new HashMap<String, HeaderDefinition>(
+        final Map<String, HeaderDefinition> headers = new ConcurrentHashMap<String, HeaderDefinition>(
                         HeaderType.defaultDefinitions());
 
         // Add additional header definitions