Skip to content

Commit

Permalink
Updates job scheduler version to 1.2 (opensearch-project#68)
Browse files Browse the repository at this point in the history
* Updates job scheduler version to 1.2 and uses Maven for 1.2 dependencies

Signed-off-by: Clay Downs <downsrob@amazon.com>
  • Loading branch information
downsrob committed Oct 1, 2021
1 parent 438864b commit 2d69d53
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 41 deletions.
15 changes: 2 additions & 13 deletions .github/workflows/test-and-build-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,14 @@ jobs:
with:
java-version: ${{ matrix.java }}

# dependencies: OpenSearch
- name: Checkout OpenSearch
uses: actions/checkout@v2
with:
repository: 'opensearch-project/OpenSearch'
ref: '1.1'
path: OpenSearch
- name: Build OpenSearch
working-directory: ./OpenSearch
run: ./gradlew publishToMavenLocal

# job-scheduler
- name: Build and Test
run: |
./gradlew build -Dopensearch.version=1.1.0-SNAPSHOT
./gradlew build -Dopensearch.version=1.2.0-SNAPSHOT
- name: Publish to Maven Local
run: |
./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT
./gradlew publishToMavenLocal -Dopensearch.version=1.2.0-SNAPSHOT
- name: Upload Coverage Report
uses: codecov/codecov-action@v1
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@

buildscript {
ext {
opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT")
opensearch_version = System.getProperty("opensearch.version", "1.2.0-SNAPSHOT")
}

repositories {
mavenLocal()
mavenCentral()
maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
}

dependencies {
Expand Down Expand Up @@ -100,6 +101,7 @@ allprojects {
repositories {
mavenLocal()
mavenCentral()
maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
}

dependencies {
Expand Down
27 changes: 0 additions & 27 deletions gradle.properties

This file was deleted.

1 change: 1 addition & 0 deletions sample-extension-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ ext {
repositories {
mavenLocal()
mavenCentral()
maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
}

dependencies {
Expand Down
1 change: 1 addition & 0 deletions spi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ apply plugin: 'opensearch.java-rest-test'
repositories {
mavenLocal()
mavenCentral()
maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" }
}

ext {
Expand Down

0 comments on commit 2d69d53

Please sign in to comment.