Merge remote-tracking branch 'origin/master' into 674

Author: TheSnoozer

pom.xml

@@ -556,7 +556,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.1.1</version>
+                        <version>3.2.0</version>
                         <inherited>false</inherited>
                         <executions>
                             <execution>

src/main/java/pl/project13/maven/git/GitCommitIdMojo.java

@@ -1420,17 +1420,17 @@ public boolean shouldPropertiesEscapeUnicode() {
   }
 
   private void publishToAllSystemEnvironments(
-      LogInterface log,
-      Properties propertiesToPublish,
-      Properties contextProperties) {
+      @Nonnull LogInterface log,
+      @Nonnull Properties propertiesToPublish,
+      @Nullable Properties contextProperties) {
     publishPropertiesInto(propertiesToPublish, project.getProperties());
     // some plugins rely on the user properties (e.g. flatten-maven-plugin)
     publishPropertiesInto(propertiesToPublish, session.getUserProperties());
 
     if (injectAllReactorProjects) {
       Properties diffPropertiesToPublish = new Properties();
       propertiesToPublish.forEach((k, v) -> {
-        if (!contextProperties.contains(k)) {
+        if (contextProperties == null || !contextProperties.contains(k)) {
           diffPropertiesToPublish.setProperty(k.toString(), v.toString());
         }
       });