From cd54a225c8dcd5f223cf517c35338709396961d6 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 27 Dec 2023 15:34:45 +0800 Subject: [PATCH] Change job-scheduler plugin group to point to correct location (#56) (#60) * Change job-scheduler plguin group to point to correct localtion * Add publish task * add dependency task to publishToStagingRepo * Fix publishAllPublicationsToStagingRepository failure issue * add comment to JS plugin path --------- (cherry picked from commit 37bbd3b5a642e621f9a7373c9eddd599511f64fa) Signed-off-by: zane-neo Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- build.gradle | 3 ++- scripts/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2caa00f1..a6572106 100644 --- a/build.gradle +++ b/build.gradle @@ -120,7 +120,8 @@ dependencies { // ZipArchive dependencies used for integration tests zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${version}" - zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${version}" + //JS plugin is published to `org/opensearch` instead of `org/opensearch/plugin` under local maven repo: https://mvnrepository.com/artifact/org.opensearch/opensearch-job-scheduler. + zipArchive group: 'org.opensearch', name:'opensearch-job-scheduler', version: "${version}" zipArchive "org.opensearch.plugin:opensearch-anomaly-detection:${version}" zipArchive group: 'org.opensearch.plugin', name:'opensearch-sql-plugin', version: "${version}" diff --git a/scripts/build.sh b/scripts/build.sh index e0495d4a..3b20300e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -65,7 +65,7 @@ fi [ -z "$OUTPUT" ] && OUTPUT=artifacts ./gradlew build -x test -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER -./gradlew publishShadowPublicationToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER -./gradlew publishShadowPublicationToStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER +./gradlew publishToMavenLocal -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER +./gradlew publishPluginZipPublicationToZipStagingRepository -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER mkdir -p $OUTPUT/maven/org/opensearch cp -r ./build/local-staging-repo/org/opensearch/. $OUTPUT/maven/org/opensearch