diff --git a/data-loader/build.gradle b/data-loader/build.gradle index 87a057933b..56b88b8614 100644 --- a/data-loader/build.gradle +++ b/data-loader/build.gradle @@ -2,7 +2,6 @@ subprojects { ext { jacksonVersion = '2.17.0' } - group = "scalardb.dataloader" dependencies { // AssertJ testImplementation("org.assertj:assertj-core:${assertjVersion}") diff --git a/data-loader/cli/build.gradle b/data-loader/cli/build.gradle index 5c495467d2..f1b37d0c58 100644 --- a/data-loader/cli/build.gradle +++ b/data-loader/cli/build.gradle @@ -9,11 +9,13 @@ application { mainClass = 'com.scalar.db.dataloader.cli.DataLoaderCli' } -archivesBaseName = "scalardb-data-loader-cli" +base { + archivesName = "scalardb-data-loader-cli" +} dependencies { implementation project(':core') - implementation project(':data-loader:core') + implementation project(':data-loader:data-loader-core') implementation "org.slf4j:slf4j-simple:${slf4jVersion}" implementation "info.picocli:picocli:${picocliVersion}" diff --git a/data-loader/core/build.gradle b/data-loader/core/build.gradle index 4c66c65712..706921401e 100644 --- a/data-loader/core/build.gradle +++ b/data-loader/core/build.gradle @@ -7,7 +7,9 @@ plugins { id 'base' } -archivesBaseName = "scalardb-data-loader-core" +base { + archivesName = "scalardb-data-loader-core" +} dependencies { // ScalarDB core @@ -45,12 +47,6 @@ spotbugsTest.reports { } spotbugsTest.excludeFilter = file("${project.rootDir}/gradle/spotbugs-exclude.xml") -if (project.gradle.startParameter.taskNames.any { it.endsWith('publish') } || - project.gradle.startParameter.taskNames.any { it.endsWith('publishToMavenLocal') }) { - // not to publish the fat jar to maven central - shadowJar.enabled = false -} - publishing { publications { mavenJava(MavenPublication) { diff --git a/settings.gradle b/settings.gradle index c095d18d19..544d77e5f4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,3 +4,7 @@ include 'schema-loader' include 'integration-test' include 'data-loader:core' include 'data-loader:cli' + +// This is a workaround for an issue where projects with the same name lead to unintended conflict. +// See https://github.com/gradle/gradle/issues/847 for the details +findProject(':data-loader:core')?.name = 'data-loader-core'