From 1fe3581bd5886bcaade147cb4ddca979f5bc2356 Mon Sep 17 00:00:00 2001 From: zane-neo Date: Mon, 28 Aug 2023 17:38:49 +0800 Subject: [PATCH] Revert #764 to only use shadowjar publication (#959) (#1260) * Revert #764 to only use shadowjar publication * Restore changes --------- Signed-off-by: Peter Zhu Co-authored-by: Peter Zhu --- client/build.gradle | 29 ----------------------------- scripts/build.sh | 2 +- settings.gradle | 1 - 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/client/build.gradle b/client/build.gradle index b63482a53c..9224eb2353 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -107,35 +107,6 @@ publishing { } } } - jars(MavenPublication) { publication -> - from components.java - artifact sourcesJar - artifact javadocJar - - pom { - name = "OpenSearch Machine Learning Client" - packaging = "jar" - url = "https://github.com/opensearch-project/ml-commons" - description = "OpenSearch Machine Learning Client" - scm { - connection = "scm:git@github.com:opensearch-project/ml-commons.git" - developerConnection = "scm:git@github.com:opensearch-project/ml-commons.git" - url = "git@github.com:opensearch-project/ml-commons.git" - } - licenses { - license { - name = "The Apache License, Version 2.0" - url = "http://www.apache.org/licenses/LICENSE-2.0.txt" - } - } - developers { - developer { - name = "OpenSearch" - url = "https://github.com/opensearch-project/ml-commons" - } - } - } - } } diff --git a/scripts/build.sh b/scripts/build.sh index d9d1038ac9..c3e101b283 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -76,4 +76,4 @@ cp -r ./build/local-staging-repo/org/opensearch/. $OUTPUT/maven/org/opensearch ./gradlew assemble --no-daemon --refresh-dependencies -DskipTests=true -Dopensearch.version=$VERSION -Dbuild.snapshot=$SNAPSHOT -Dbuild.version_qualifier=$QUALIFIER [ -z "$OUTPUT" ] && OUTPUT=artifacts mkdir -p $OUTPUT/plugins -cp ./plugin/build/distributions/*.zip $OUTPUT/plugins \ No newline at end of file +cp ./plugin/build/distributions/*.zip $OUTPUT/plugins diff --git a/settings.gradle b/settings.gradle index 3a50a520f5..b69d65c8b6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,4 +14,3 @@ project(":plugin").name = rootProject.name + "-plugin" include 'ml-algorithms' project(":ml-algorithms").name = rootProject.name + "-algorithms" -startParameter.excludedTaskNames=["publishShadowPublicationToStagingRepository", "publishShadowPublicationToMavenLocal"]