Skip to content

Commit 5d28926

Browse files
authored
[MNG-8674] Deprecate mergeId in the Maven 3 model and remove it in the new model (#2233)
1 parent fffdf0e commit 5d28926

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2208,7 +2208,7 @@
22082208
</field>
22092209
<field xml.transient="true">
22102210
<name>mergeId</name>
2211-
<version>4.0.0+</version>
2211+
<version>4.0.0</version>
22122212
<description>
22132213
FOR INTERNAL USE ONLY. This is a unique identifier assigned to each
22142214
resource to allow Maven to merge changes to this resource that take
@@ -2220,6 +2220,27 @@
22202220
</field>
22212221
</fields>
22222222
<codeSegments>
2223+
<codeSegment>
2224+
<version>4.0.0+</version>
2225+
<code>
2226+
<![CDATA[
2227+
/**
2228+
* @deprecated this was unused and has no replacement, this method returns {@code null} now.
2229+
*/
2230+
@Deprecated(since = "4.0.0")
2231+
public String getMergeId() {
2232+
return null;
2233+
}
2234+
2235+
/**
2236+
* @deprecated this was unused and has no replacement, this method is a no-op now.
2237+
*/
2238+
@Deprecated(since = "4.0.0")
2239+
public void setMergeId(String mergeId) {
2240+
}
2241+
]]>
2242+
</code>
2243+
</codeSegment>
22232244
<codeSegment>
22242245
<version>4.0.0+</version>
22252246
<code>

0 commit comments

Comments
 (0)