Skip to content

Commit e3295ac

Browse files
authored
Adapt version after backport of #61779 (#62029)
This commit adapts the bwc version checks added in #61779 and disable bwc tests until the backport #62028 is merged.
1 parent 5579025 commit e3295ac

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ tasks.register("verifyVersions") {
174174
* after the backport of the backcompat code is complete.
175175
*/
176176

177-
boolean bwc_tests_enabled = true
178-
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
177+
boolean bwc_tests_enabled = false
178+
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/62028" /* place a PR link here when committing bwc changes */
179179
if (bwc_tests_enabled == false) {
180180
if (bwc_tests_disabled_issue.isEmpty()) {
181181
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalTerms.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ protected InternalTerms(String name,
192192
protected InternalTerms(StreamInput in) throws IOException {
193193
super(in);
194194
reduceOrder = InternalOrder.Streams.readOrder(in);
195-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
195+
if (in.getVersion().onOrAfter(Version.V_7_10_0)) {
196196
order = InternalOrder.Streams.readOrder(in);
197197
} else {
198198
order = reduceOrder;
@@ -203,7 +203,7 @@ protected InternalTerms(StreamInput in) throws IOException {
203203

204204
@Override
205205
protected final void doWriteTo(StreamOutput out) throws IOException {
206-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
206+
if (out.getVersion().onOrAfter(Version.V_7_10_0)) {
207207
reduceOrder.writeTo(out);
208208
}
209209
order.writeTo(out);

0 commit comments

Comments
 (0)