Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTO] Increment version to 2.7.0-SNAPSHOT #333

Merged
merged 2 commits into from
Feb 23, 2023
Merged

[AUTO] Increment version to 2.7.0-SNAPSHOT #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4741405
Increment version to 2.7.0-SNAPSHOT
opensearch-ci-bot Feb 22, 2023
73ea894
Adding media type to Strings.toString()
joshpalis Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import org.opensearch.gradle.test.RestIntegTestTask

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "2.6.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "2.7.0-SNAPSHOT")
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
buildVersionQualifier = System.getProperty("build.version_qualifier", "")
}
Expand Down
3 changes: 2 additions & 1 deletion spi/src/main/java/org/opensearch/jobscheduler/spi/LockModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.XContentParserUtils;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.index.seqno.SequenceNumbers;

import java.io.IOException;
Expand Down Expand Up @@ -173,7 +174,7 @@ public XContentBuilder toXContent(final XContentBuilder builder, final Params pa

@Override
public String toString() {
return Strings.toString(this, false, true);
return Strings.toString(XContentType.JSON, this, false, true);
}

public String getLockId() {
Expand Down
3 changes: 2 additions & 1 deletion spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/CronSchedule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentType;

import java.io.IOException;
import java.time.Clock;
Expand Down Expand Up @@ -180,7 +181,7 @@ private XContentBuilder toXContentWithDelay(XContentBuilder builder) throws IOEx

@Override
public String toString() {
return Strings.toString(this, false, true);
return Strings.toString(XContentType.JSON, this, false, true);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion spi/src/main/java/org/opensearch/jobscheduler/spi/schedule/IntervalSchedule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentType;

import java.io.IOException;
import java.time.Clock;
Expand Down Expand Up @@ -188,7 +189,7 @@ void setClock(Clock clock) {

@Override
public String toString() {
return Strings.toString(this, false, true);
return Strings.toString(XContentType.JSON, this, false, true);
}

@Override
Expand Down