File tree Expand file tree Collapse file tree 4 files changed +11
-10
lines changed Expand file tree Collapse file tree 4 files changed +11
-10
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,6 @@ subprojects {
22 ext {
33 jacksonVersion = ' 2.17.0'
44 }
5- group = " scalardb.dataloader"
65 dependencies {
76 // AssertJ
87 testImplementation(" org.assertj:assertj-core:${ assertjVersion} " )
Original file line number Diff line number Diff line change @@ -9,11 +9,13 @@ application {
99 mainClass = ' com.scalar.db.dataloader.cli.DataLoaderCli'
1010}
1111
12- archivesBaseName = " scalardb-data-loader-cli"
12+ base {
13+ archivesName = " scalardb-data-loader-cli"
14+ }
1315
1416dependencies {
1517 implementation project(' :core' )
16- implementation project(' :data-loader:core' )
18+ implementation project(' :data-loader:data-loader- core' )
1719 implementation " org.slf4j:slf4j-simple:${ slf4jVersion} "
1820 implementation " info.picocli:picocli:${ picocliVersion} "
1921
Original file line number Diff line number Diff line change @@ -7,7 +7,9 @@ plugins {
77 id ' base'
88}
99
10- archivesBaseName = " scalardb-data-loader-core"
10+ base {
11+ archivesName = " scalardb-data-loader-core"
12+ }
1113
1214dependencies {
1315 // ScalarDB core
@@ -45,12 +47,6 @@ spotbugsTest.reports {
4547}
4648spotbugsTest. excludeFilter = file(" ${ project.rootDir} /gradle/spotbugs-exclude.xml" )
4749
48- if (project. gradle. startParameter. taskNames. any { it. endsWith(' publish' ) } ||
49- project. gradle. startParameter. taskNames. any { it. endsWith(' publishToMavenLocal' ) }) {
50- // not to publish the fat jar to maven central
51- shadowJar. enabled = false
52- }
53-
5450publishing {
5551 publications {
5652 mavenJava(MavenPublication ) {
Original file line number Diff line number Diff line change @@ -4,3 +4,7 @@ include 'schema-loader'
44include ' integration-test'
55include ' data-loader:core'
66include ' data-loader:cli'
7+
8+ // This is a workaround for an issue where projects with the same name lead to unintended conflict.
9+ // See https://github.com/gradle/gradle/issues/847 for the details
10+ findProject(' :data-loader:core' )?. name = ' data-loader-core'
You can’t perform that action at this time.
0 commit comments