Skip to content

Commit

Permalink
Split up the Maven groupIds for core, plugins, and test to match pack…
Browse files Browse the repository at this point in the history
…age names. (#4324)

Signed-off-by: David Venable <[email protected]>
  • Loading branch information
dlvenable authored Mar 25, 2024
1 parent 3bae4a7 commit 8f139a0
Show file tree
Hide file tree
Showing 11 changed files with 52 additions and 28 deletions.
58 changes: 30 additions & 28 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions data-prepper-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ sourceSets {
}
}

group = 'org.opensearch.dataprepper.core'

dependencies {
implementation project(':data-prepper-api')
implementation project(':data-prepper-expression')
Expand Down
2 changes: 2 additions & 0 deletions data-prepper-event/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 2 additions & 0 deletions data-prepper-expression/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ plugins {
id 'idea'
}

group = 'org.opensearch.dataprepper.core'

ext {
antlrGeneratedPackageDirectory = "org/opensearch/dataprepper/expression/antlr/"
}
Expand Down
2 changes: 2 additions & 0 deletions data-prepper-logstash-configuration/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ plugins {
id 'idea'
}

group = 'org.opensearch.dataprepper.core'

ext {
antlrGeneratedPackageDirectory = "org/opensearch/dataprepper/logstash/"
}
Expand Down
2 changes: 2 additions & 0 deletions data-prepper-main/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ sourceSets {
}
}

group = 'org.opensearch.dataprepper.core'

dependencies {
implementation project(':data-prepper-core')
implementation project(':data-prepper-plugins')
Expand Down
2 changes: 2 additions & 0 deletions data-prepper-pipeline-parser/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 2 additions & 0 deletions data-prepper-plugin-framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 4 additions & 0 deletions data-prepper-plugins/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ plugins {
id 'java-library'
}

allprojects {
group = 'org.opensearch.dataprepper.plugins'
}

dependencies {
subprojects.forEach { api project(':data-prepper-plugins:' + it.name) }
}
2 changes: 2 additions & 0 deletions data-prepper-test-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ plugins {
id 'java'
}

group = 'org.opensearch.dataprepper.test'

dependencies {
implementation testLibs.hamcrest
testRuntimeOnly testLibs.junit.engine
Expand Down
2 changes: 2 additions & 0 deletions data-prepper-test-event/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 8f139a0

Please sign in to comment.