Fixed source build model for merge extensions (#61)

PlaytikaOSS · May 13, 2024 · b546403 · b546403
1 parent 805a0d5
commit b546403
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/examples/mixin-maven-plugin/mixin-example/pom.xml b/examples/mixin-maven-plugin/mixin-example/pom.xml
@@ -32,6 +32,6 @@
     How to test :
     1. build all mixin
     2. locate to mixin-consumer
-    3. Run: mvn -Dmixin-maven-plugin.version=1.0.4 help:effective-pom -U
+    3. Run: mvn -Dmixin-maven-plugin.version=1.0.5 help:effective-pom -U
     -->
 </project>
diff --git a/mixin-maven-plugin/src/main/java/com/playtika/maven/plugins/MixinModelMerger.java b/mixin-maven-plugin/src/main/java/com/playtika/maven/plugins/MixinModelMerger.java
@@ -16,6 +16,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * MixinModelMerger
@@ -189,8 +190,13 @@ public void mergePluginRepositories(Model targetModel, Model sourceModel) {
 
     public void mergeBuildExtensions(Model targetModel, Model sourceModel) {
         Map<Object, Object> context = new HashMap<Object, Object>();
-        Build targetBuild = targetModel.getBuild();
+
         Build sourceBuild = sourceModel.getBuild();
+        if (Objects.isNull(sourceBuild)) {
+            return;
+        }
+
+        Build targetBuild = targetModel.getBuild();
         super.mergeBuild_Extensions(targetBuild, sourceBuild, false, context);
     }
 }