Skip to content

Commit 34a9c78

Browse files
authored
Re-enable BWC tests after backport of changes in values source (#68534)
Relates to #68490
1 parent 5a05678 commit 34a9c78

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull
178178
*/
179179

180180
if ( BuildParams.inFipsJvm ) {
181-
bwc_tests_enabled = false
182-
bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/issues/66772"
181+
bwc_tests_enabled = true
182+
bwc_tests_disabled_issue = ""
183183
}
184184
if (bwc_tests_enabled == false) {
185185
if (bwc_tests_disabled_issue.isEmpty()) {

server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSourceFieldConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public MultiValuesSourceFieldConfig(StreamInput in) throws IOException {
122122
} else {
123123
this.filter = null;
124124
}
125-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
125+
if (in.getVersion().onOrAfter(Version.V_7_12_0)) {
126126
this.userValueTypeHint = in.readOptionalWriteable(ValueType::readFromStream);
127127
this.format = in.readOptionalString();
128128
} else {
@@ -173,7 +173,7 @@ public void writeTo(StreamOutput out) throws IOException {
173173
if (out.getVersion().onOrAfter(Version.V_7_8_0)) {
174174
out.writeOptionalNamedWriteable(filter);
175175
}
176-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
176+
if (out.getVersion().onOrAfter(Version.V_7_12_0)) {
177177
out.writeOptionalWriteable(userValueTypeHint);
178178
out.writeOptionalString(format);
179179
}

0 commit comments

Comments
 (0)