Skip to content

Commit

Permalink
Increment version to 1.2.1 (#1700)
Browse files Browse the repository at this point in the history
* Increment version to 1.2.1.

Signed-off-by: dblock <[email protected]>

* Move Gradle wrapper and precommit checks into OpenSearch repo. (#1664)

* Move Gradle checks into OpenSearch repo.

Signed-off-by: dblock <[email protected]>

* Use working-directory for gradle wrapper validation.

Signed-off-by: dblock <[email protected]>

* Use https://github.com/gradle/wrapper-validation-action.

Signed-off-by: dblock <[email protected]>

* Use Java 14.

Signed-off-by: dblock <[email protected]>
  • Loading branch information
dblock authored Dec 10, 2021
1 parent c459282 commit db4df4b
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 2 deletions.
1 change: 1 addition & 0 deletions .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,4 @@ BWC_VERSION:
- "1.0.1"
- "1.1.0"
- "1.1.1"
- "1.2.0"
16 changes: 16 additions & 0 deletions .github/workflows/precommit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Gradle Precommit
on: [pull_request]

jobs:
precommit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 14
uses: actions/setup-java@v2
with:
java-version: 14
distribution: adopt
- name: Run Gradle
run: |
./gradlew precommit --parallel
10 changes: 10 additions & 0 deletions .github/workflows/wrapper.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Validate Gradle Wrapper
on: [push, pull_request]

jobs:
validate:
name: Validate
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
opensearch = 1.2.0
opensearch = 1.2.1
lucene = 8.10.1

bundled_jdk_vendor = adoptopenjdk
Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/opensearch/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_1_1_0 = new Version(1010099, org.apache.lucene.util.Version.LUCENE_8_9_0);
public static final Version V_1_1_1 = new Version(1010199, org.apache.lucene.util.Version.LUCENE_8_9_0);
public static final Version V_1_2_0 = new Version(1020099, org.apache.lucene.util.Version.LUCENE_8_10_1);
public static final Version CURRENT = V_1_2_0;
public static final Version V_1_2_1 = new Version(1020199, org.apache.lucene.util.Version.LUCENE_8_10_1);
public static final Version CURRENT = V_1_2_1;

public static Version readVersion(StreamInput in) throws IOException {
return fromId(in.readVInt());
Expand Down

0 comments on commit db4df4b

Please sign in to comment.