Skip to content

Commit

Permalink
re-enable bwc testing and change version to prevent fail
Browse files Browse the repository at this point in the history
Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
  • Loading branch information
nknize committed Aug 17, 2023
1 parent 983d44a commit f2887a3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,15 @@ tasks.register("verifyVersions") {
boolean bwc_tests_enabled = false

/* place an issue link here when committing bwc changes */
String bwc_tests_disabled_issue = "https://github.com/opensearch-project/OpenSearch/issues/9349"
String bwc_tests_disabled_issue = ""

/* there's no existing MacOS release, therefore disable bcw tests */
if (Os.isFamily(Os.FAMILY_MAC)) {
bwc_tests_enabled = false
bwc_tests_disabled_issue = "https://github.com/opensearch-project/OpenSearch/issues/4173"
}

if (bwc_tests_enabled == false) {
if (bwc_tests_enabled == true) {
if (bwc_tests_disabled_issue.isEmpty()) {
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public DateTime(StreamInput in) throws IOException {
String zoneId = in.readString();
this.timeZone = ZoneId.of(zoneId);
this.resolution = DateFieldMapper.Resolution.ofOrdinal(in.readVInt());
if (in.getVersion().before(Version.V_2_10_0)) {
if (in.getVersion().before(Version.V_3_0_0)) {
in.readBoolean(); // ignore deprecated joda
}
}
Expand All @@ -263,7 +263,7 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeString(formatter.pattern());
out.writeString(timeZone.getId());
out.writeVInt(resolution.ordinal());
if (out.getVersion().before(Version.V_2_10_0)) {
if (out.getVersion().before(Version.V_3_0_0)) {
out.writeBoolean(false); // ignore deprecated joda flag
}
}
Expand Down

0 comments on commit f2887a3

Please sign in to comment.