Revert "Switch publication to shadow JAR and add build script (#29)" (#…

…43) (#44) This reverts commit 1ce5e78. (cherry picked from commit a975717) Signed-off-by: Dhrubo Saha <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Jan 13, 2025 · eb9271b · eb9271b
1 parent b629311
commit eb9271b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 107 deletions.
diff --git a/.github/workflows/publish-snapshots.yml b/.github/workflows/publish-snapshots.yml
@@ -34,4 +34,4 @@ jobs:
           export SONATYPE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-password --query SecretString --output text)
           echo "::add-mask::$SONATYPE_USERNAME"
           echo "::add-mask::$SONATYPE_PASSWORD"
-          ./gradlew publishShadowPublicationToSnapshotsRepository
+          ./gradlew publishMavenJavaPublicationToSnapshotsRepository
diff --git a/aos-client/build.gradle b/aos-client/build.gradle
@@ -32,8 +32,3 @@ dependencies {
     implementation("software.amazon.awssdk:url-connection-client")
     implementation("software.amazon.awssdk:utils")
 }
-
-shadowJar {
-    dependsOn(':opensearch-remote-metadata-sdk-core:shadowJar', 
-              ':opensearch-remote-metadata-sdk-remote-client:shadowJar')
-}
diff --git a/build.gradle b/build.gradle
@@ -85,7 +85,6 @@ allprojects {
 
 subprojects {
     apply plugin: 'java-library'
-    apply plugin: 'com.github.johnrengelman.shadow'
 
     dependencies {
         // Common dependencies for all subprojects
@@ -108,8 +107,6 @@ subprojects {
 
     configurations {
         testImplementation.extendsFrom testFixtures
-        implementation.extendsFrom shadowImplementation
-        runtimeOnly.extendsFrom shadowRuntimeOnly
     }
 
     test {
@@ -148,11 +145,6 @@ subprojects {
         withJavadocJar()
     }
 
-    shadowJar {
-        archiveClassifier.set(null)
-        mergeServiceFiles()
-    }
-
     checkstyle {
         toolVersion = "10.21.1"
     }
@@ -164,26 +156,18 @@ subprojects {
 
     publishing {
         publications {
-            shadow(MavenPublication) {
+            mavenJava(MavenPublication) {
                 from components.java
 
-                project.shadow.component(it)
+                // These are for unpublished test classes
+                suppressPomMetadataWarningsFor('testFixturesApiElements')
+                suppressPomMetadataWarningsFor('testFixturesRuntimeElements')
 
                 // Customize artifact ID for core project
                 if (project.name == 'opensearch-remote-metadata-sdk-core') {
                     artifactId = 'opensearch-remote-metadata-sdk'
                 }
 
-                artifacts.clear()
-
-                artifact shadowJar
-                artifact sourcesJar
-                artifact javadocJar
-
-                // These are for unpublished test classes
-                suppressPomMetadataWarningsFor('testFixturesApiElements')
-                suppressPomMetadataWarningsFor('testFixturesRuntimeElements')
-
                 pom {
                     name = project.name == 'opensearch-remote-metadata-sdk-core'
                         ? "OpenSearch Remote Metadata SDK for Java"

diff --git a/core/build.gradle b/core/build.gradle
@@ -16,3 +16,5 @@ java {
 dependencies {
     testFixturesImplementation "org.opensearch:opensearch:${opensearch_version}"
 }
+
+
diff --git a/ddb-client/build.gradle b/ddb-client/build.gradle
@@ -12,9 +12,3 @@ dependencies {
     implementation(platform("software.amazon.awssdk:bom:${aws_sdk_version}"))
     implementation "software.amazon.awssdk:dynamodb"
 }
-
-shadowJar {
-    dependsOn(':opensearch-remote-metadata-sdk-core:shadowJar', 
-              ':opensearch-remote-metadata-sdk-remote-client:shadowJar',
-              ':opensearch-remote-metadata-sdk-aos-client:shadowJar')
-}
diff --git a/remote-client/build.gradle b/remote-client/build.gradle
@@ -9,7 +9,3 @@ dependencies {
 
     implementation "org.opensearch.client:opensearch-java:${opensearch_java_version}"
 }
-
-shadowJar {
-    dependsOn(':opensearch-remote-metadata-sdk-core:shadowJar')
-}
diff --git a/scripts/build.sh b/scripts/build.sh
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,5 @@ java {
		dependencies {
		testFixturesImplementation "org.opensearch:opensearch:${opensearch_version}"
		}