Skip to content

Commit e4cd448

Browse files
committed
[MNG-5102] Add support for POM mixins
1 parent 838cda7 commit e4cd448

5 files changed

Lines changed: 166 additions & 113 deletions

File tree

api/maven-api-model/src/main/mdo/maven.mdo

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,20 @@
113113
</association>
114114
</field>
115115

116+
<!-- ====================================================================== -->
117+
<!-- Mixins -->
118+
<!-- ====================================================================== -->
119+
120+
<field xdoc.separator="blank">
121+
<name>mixins</name>
122+
<version>4.1.0+</version>
123+
<description>Mixins...</description>
124+
<association>
125+
<type>Parent</type>
126+
<multiplicity>*</multiplicity>
127+
</association>
128+
</field>
129+
116130
<!-- ====================================================================== -->
117131
<!-- groupId/artifactId/Version/Packaging -->
118132
<!-- ====================================================================== -->

maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ public Model merge(Model target, Model source) {
9696
targetBuild = Build.newInstance();
9797
}
9898

99-
Map<Object, Object> context = Collections.singletonMap(
100-
PLUGIN_MANAGEMENT, target.getBuild().getPluginManagement());
99+
Map<Object, Object> context =
100+
Collections.singletonMap(PLUGIN_MANAGEMENT, targetBuild.getPluginManagement());
101101

102-
Build.Builder builder = Build.newBuilder(target.getBuild());
102+
Build.Builder builder = Build.newBuilder(targetBuild);
103103
mergePluginContainer_Plugins(builder, targetBuild, source.getBuild(), false, context);
104104

105105
return target.withBuild(builder.build());

0 commit comments

Comments
 (0)