From 50da01f1aaba2e7d930f0191a97a46e8fe51db6d Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Sat, 3 Jun 2023 01:49:14 -0400 Subject: [PATCH] Revert #764 to only use shadowjar publication (#959) * Revert #764 to only use shadowjar publication Signed-off-by: Peter Zhu * Restore changes Signed-off-by: Peter Zhu --------- Signed-off-by: Peter Zhu (cherry picked from commit e6dabc00f4fcfba7fad9ab6ebba923b934028a7f) --- 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 aed3649fb4..cc4f904083 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"]