Skip to content

Fix Gradle configurations in data-loader module #2742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2025
Merged

Fix Gradle configurations in data-loader module #2742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion data-loader/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ subprojects {
ext {
jacksonVersion = '2.17.0'
}
group = "scalardb.dataloader"
Copy link
Collaborator Author

@brfrn169 brfrn169 Jun 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted this to avoid overriding the scalardb group name. This is the root cause of the release failure.

dependencies {
// AssertJ
testImplementation("org.assertj:assertj-core:${assertjVersion}")
Expand Down
6 changes: 4 additions & 2 deletions data-loader/cli/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
10 changes: 3 additions & 7 deletions data-loader/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ plugins {
id 'base'
}

archivesBaseName = "scalardb-data-loader-core"
base {
archivesName = "scalardb-data-loader-core"
}

dependencies {
// ScalarDB core
Expand Down Expand Up @@ -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
}

Comment on lines -48 to -53
Copy link
Collaborator Author

@brfrn169 brfrn169 Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is unnecessary. I missed it during the review of the previous PR.

publishing {
publications {
mavenJava(MavenPublication) {
Expand Down
4 changes: 4 additions & 0 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Comment on lines +8 to +10
Copy link
Collaborator Author

@brfrn169 brfrn169 Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added this to avoid the name conflicting issue.