File tree Expand file tree Collapse file tree 1 file changed +22
-1
lines changed
api/maven-api-model/src/main/mdo Expand file tree Collapse file tree 1 file changed +22
-1
lines changed Original file line number Diff line number Diff line change 2208
2208
</field >
2209
2209
<field xml.transient=" true" >
2210
2210
<name >mergeId</name >
2211
- <version >4.0.0+ </version >
2211
+ <version >4.0.0</version >
2212
2212
<description >
2213
2213
FOR INTERNAL USE ONLY. This is a unique identifier assigned to each
2214
2214
resource to allow Maven to merge changes to this resource that take
2220
2220
</field >
2221
2221
</fields >
2222
2222
<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 >
2223
2244
<codeSegment >
2224
2245
<version >4.0.0+</version >
2225
2246
<code >
You can’t perform that action at this time.
0 commit comments