Skip to content

Commit b015b62

Browse files
authored
Remove @UpdateForV10 annotation in 8.x (#125084)
The `8.x` branch doesn't know anything about v10-only changes. Backporting code from 9.x to 8.x branches doesn't work anyway if it mentions `@UpdateForV10`. This commit just removes the `@UpdateForV10` annotation entirely in the `8.x` branch.
1 parent 4e722f2 commit b015b62

File tree

4 files changed

+1
-28
lines changed

4 files changed

+1
-28
lines changed

libs/core/src/main/java/org/elasticsearch/core/UpdateForV10.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/ReleaseVersions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ private static IntFunction<String> lookupFunction(NavigableMap<Integer, List<Ver
115115
// maybe keep the release mapping around in the csv file?
116116
// SEP for now
117117
@UpdateForV9
118-
// @UpdateForV10
119118
Version oldVersion = Version.fromId(id);
120119
return oldVersion.toString();
121120
}

server/src/main/java/org/elasticsearch/action/admin/cluster/node/features/TransportNodesFeaturesAction.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import java.util.List;
2929

3030
@UpdateForV9
31-
// @UpdateForV10 // this can be removed in v10. It may be called by v8 nodes to v9 nodes.
3231
public class TransportNodesFeaturesAction extends TransportNodesAction<
3332
NodesFeaturesRequest,
3433
NodesFeaturesResponse,
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
[
22
"Content moved to reference-docs-links.txt",
3-
"This is a temporary placeholder to satisfy sub check_elasticsearch_links in the docs build",
4-
"Remove with @UpdateForV10 (if not before)"
3+
"This is a temporary placeholder to satisfy sub check_elasticsearch_links in the docs build"
54
]

0 commit comments

Comments
 (0)