Skip to content

Commit 9332749

Browse files
authored
Fix generated pom with duplicated entries (#6931)
In d512ca5, a change was introduced which started generating pom.xml with duplicated entries when a dependency is declared as `provided`. The dependency is added with `compile` and `provided` scopes.
1 parent 38fcf46 commit 9332749

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

core/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ dependencies {
125125
tasks.generatePomFileForMavenJavaPublication.finalizedBy(
126126
tasks.register('checkPOMdependencies', org.testcontainers.build.ComparePOMWithLatestReleasedTask) {
127127
ignore = [
128-
"com.google.cloud.tools:jib-core"
129128
]
130129
}
131130
)

gradle/publishing.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,20 @@ publishing {
5757

5858
def dependenciesNode = rootNode.appendNode('dependencies')
5959

60-
def addDependencies = { Configuration configuration, scope ->
61-
for (dependency in configuration.resolvedConfiguration.firstLevelModuleDependencies) {
60+
def apiDeps= project.configurations.api.resolvedConfiguration.firstLevelModuleDependencies
61+
def providedDeps = project.configurations.provided.resolvedConfiguration.firstLevelModuleDependencies
62+
def newApiDeps = apiDeps - providedDeps
63+
64+
def addDependencies = { Set<ResolvedDependency> resolvedDependencies, scope ->
65+
for (dependency in resolvedDependencies) {
6266
if (dependency.configuration.startsWith("platform-")) {
6367
continue
6468
}
6569
dependenciesNode.appendNode('dependency').with {
6670
if (!dependency.moduleGroup || !dependency.moduleName || !dependency.moduleVersion) {
6771
throw new IllegalStateException("Wrong dependency: $dependency")
6872
}
73+
6974
appendNode('groupId', dependency.moduleGroup)
7075
appendNode('artifactId', dependency.moduleName)
7176
appendNode('version', dependency.moduleVersion)
@@ -83,8 +88,8 @@ publishing {
8388
}
8489
}
8590
}
86-
addDependencies(project.configurations.api, 'compile')
87-
addDependencies(project.configurations.provided, 'provided')
91+
addDependencies(newApiDeps, 'compile')
92+
addDependencies(providedDeps, 'provided')
8893
}
8994
}
9095
}

0 commit comments

Comments
 (0)