Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion api/maven-api-model/src/main/mdo/maven.mdo
Original file line number Diff line number Diff line change
Expand Up @@ -2208,7 +2208,7 @@
</field>
<field xml.transient="true">
<name>mergeId</name>
<version>4.0.0+</version>
<version>4.0.0</version>
<description>
FOR INTERNAL USE ONLY. This is a unique identifier assigned to each
resource to allow Maven to merge changes to this resource that take
Expand All @@ -2220,6 +2220,27 @@
</field>
</fields>
<codeSegments>
<codeSegment>
<version>4.0.0+</version>
<code>
<![CDATA[
/**
* @deprecated this was unused and has no replacement, this method returns {@code null} now.
*/
@Deprecated(since = "4.0.0")
public String getMergeId() {
return null;
}

/**
* @deprecated this was unused and has no replacement, this method is a no-op now.
*/
@Deprecated(since = "4.0.0")
public void setMergeId(String mergeId) {
}
]]>
</code>
</codeSegment>
<codeSegment>
<version>4.0.0+</version>
<code>
Expand Down