Split up the Maven groupIds for core, plugins, and test to match pack…

…age names. (#4324) Signed-off-by: David Venable <dlv@amazon.com> (cherry picked from commit 8f139a0)
opensearch-project · Mar 25, 2024 · 3ac3172 · 3ac3172
1 parent 42b2811
commit 3ac3172
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 28 deletions.
diff --git a/build.gradle b/build.gradle
@@ -48,39 +48,41 @@ allprojects {
             withSourcesJar()
         }
 
-        project.publishing {
-            repositories {
-                maven {
-                    url "file://${mavenPublicationRootFile.absolutePath}"
+        afterEvaluate {
+            project.publishing {
+                repositories {
+                    maven {
+                        url "file://${mavenPublicationRootFile.absolutePath}"
+                    }
                 }
-            }
-            publications {
-                mavenJava(MavenPublication) {
-                    from project.components.findByName("java") ?: project.components.findByName("javaLibrary")
+                publications {
+                    mavenJava(MavenPublication) {
+                        from project.components.findByName("java") ?: project.components.findByName("javaLibrary")
 
-                    groupId = project.group
-                    artifactId = project.name
-                    version = project.version
+                        groupId = project.group
+                        artifactId = project.name
+                        version = project.version
 
-                    pom {
-                        name = project.name
-                        description = "Data Prepper project: ${project.name}"
-                        url = 'https://github.com/opensearch-project/data-prepper'
-                        licenses {
-                            license {
-                                name = 'The Apache Software License, Version 2.0'
-                                url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                                distribution = 'repo'
+                        pom {
+                            name = project.name
+                            description = "Data Prepper project: ${project.name}"
+                            url = 'https://github.com/opensearch-project/data-prepper'
+                            licenses {
+                                license {
+                                    name = 'The Apache Software License, Version 2.0'
+                                    url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                                    distribution = 'repo'
+                                }
                             }
-                        }
-                        developers {
-                            developer {
-                                name = 'OpenSearch'
-                                url = 'https://github.com/opensearch-project'
+                            developers {
+                                developer {
+                                    name = 'OpenSearch'
+                                    url = 'https://github.com/opensearch-project'
+                                }
+                            }
+                            scm {
+                                url = 'https://github.com/opensearch-project/data-prepper'
                             }
-                        }
-                        scm {
-                            url = 'https://github.com/opensearch-project/data-prepper'
                         }
                     }
                 }

diff --git a/data-prepper-core/build.gradle b/data-prepper-core/build.gradle
@@ -11,6 +11,8 @@ sourceSets {
     }
 }
 
+group = 'org.opensearch.dataprepper.core'
+
 dependencies {
     implementation project(':data-prepper-api')
     implementation project(':data-prepper-expression')

diff --git a/data-prepper-event/build.gradle b/data-prepper-event/build.gradle
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+group = 'org.opensearch.dataprepper.core'
+
 dependencies {
     implementation project(':data-prepper-api')
     implementation 'javax.inject:javax.inject:1'

diff --git a/data-prepper-expression/build.gradle b/data-prepper-expression/build.gradle
@@ -8,6 +8,8 @@ plugins {
     id 'idea'
 }
 
+group = 'org.opensearch.dataprepper.core'
+
 ext {
     antlrGeneratedPackageDirectory = "org/opensearch/dataprepper/expression/antlr/"
 }

diff --git a/data-prepper-logstash-configuration/build.gradle b/data-prepper-logstash-configuration/build.gradle
@@ -8,6 +8,8 @@ plugins {
     id 'idea'
 }
 
+group = 'org.opensearch.dataprepper.core'
+
 ext {
     antlrGeneratedPackageDirectory = "org/opensearch/dataprepper/logstash/"
 }

diff --git a/data-prepper-main/build.gradle b/data-prepper-main/build.gradle
@@ -11,6 +11,8 @@ sourceSets {
     }
 }
 
+group = 'org.opensearch.dataprepper.core'
+
 dependencies {
     implementation project(':data-prepper-core')
     implementation project(':data-prepper-plugins')

diff --git a/data-prepper-pipeline-parser/build.gradle b/data-prepper-pipeline-parser/build.gradle
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+group = 'org.opensearch.dataprepper.core'
+
 dependencies {
     implementation project(':data-prepper-api')
     implementation project(':data-prepper-plugins:blocking-buffer')

diff --git a/data-prepper-plugin-framework/build.gradle b/data-prepper-plugin-framework/build.gradle
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+group = 'org.opensearch.dataprepper.core'
+
 dependencies {
     implementation project(':data-prepper-api')
     implementation project(':data-prepper-pipeline-parser')

diff --git a/data-prepper-plugins/build.gradle b/data-prepper-plugins/build.gradle
@@ -7,6 +7,10 @@ plugins {
     id 'java-library'
 }
 
+allprojects {
+    group = 'org.opensearch.dataprepper.plugins'
+}
+
 dependencies {
     subprojects.forEach { api project(':data-prepper-plugins:' + it.name) }
 }
diff --git a/data-prepper-test-common/build.gradle b/data-prepper-test-common/build.gradle
@@ -7,6 +7,8 @@ plugins {
     id 'java'
 }
 
+group = 'org.opensearch.dataprepper.test'
+
 dependencies {
     implementation testLibs.hamcrest
     testRuntimeOnly testLibs.junit.engine

diff --git a/data-prepper-test-event/build.gradle b/data-prepper-test-event/build.gradle
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+group = 'org.opensearch.dataprepper.test'
+
 dependencies {
     implementation project(':data-prepper-api')
     implementation project(':data-prepper-event')