diff --git a/examples/mixin-maven-plugin/mixin-example/pom.xml b/examples/mixin-maven-plugin/mixin-example/pom.xml index 7aebdff..2a2ae0f 100755 --- 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 --> 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 index a375584..669fdb0 100755 --- 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 context = new HashMap(); - Build targetBuild = targetModel.getBuild(); + Build sourceBuild = sourceModel.getBuild(); + if (Objects.isNull(sourceBuild)) { + return; + } + + Build targetBuild = targetModel.getBuild(); super.mergeBuild_Extensions(targetBuild, sourceBuild, false, context); } }