Skip to content

Commit d2cd51e

Browse files
authored
Add explicit automatic module name configuration. (#1236)
Original PR (#1232) JAVA-5213 JAVA-5202
1 parent 81ad6a1 commit d2cd51e

File tree

8 files changed

+20
-7
lines changed

8 files changed

+20
-7
lines changed

bson-kotlin/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,5 @@ tasks.javadocJar.configure {
148148
// Sources publishing configuration
149149
// ===========================
150150
tasks.sourcesJar { from(project.sourceSets.main.map { it.kotlin }) }
151+
152+
afterEvaluate { tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.bson.kotlin" } } }

bson-kotlinx/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,5 @@ tasks.javadocJar.configure {
152152
// Sources publishing configuration
153153
// ===========================
154154
tasks.sourcesJar { from(project.sourceSets.main.map { it.kotlin }) }
155+
156+
afterEvaluate { tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.bson.kotlinx" } } }

bson-scala/build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ test {
5858
maxParallelForks = 1
5959
}
6060

61-
jar.manifest.attributes['Import-Package'] = [
62-
'!scala.*',
63-
'*'
64-
].join(',')
61+
afterEvaluate {
62+
jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.bson.scala'
63+
jar.manifest.attributes['Import-Package'] = [
64+
'!scala.*',
65+
'*'
66+
].join(',')
67+
}

bson/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@ ext {
2222
pomURL = 'https://bsonspec.org'
2323
}
2424

25-
jar.manifest.attributes['Import-Package'] = 'org.slf4j.*;resolution:=optional'
25+
afterEvaluate {
26+
jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.bson'
27+
jar.manifest.attributes['Import-Package'] = 'org.slf4j.*;resolution:=optional'
28+
}

driver-kotlin-coroutine/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,5 @@ tasks.javadocJar.configure {
193193
// Sources publishing configuration
194194
// ===========================
195195
tasks.sourcesJar { from(project.sourceSets.main.map { it.kotlin }) }
196+
197+
afterEvaluate { tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.driver.kotlin.coroutine" } } }

driver-kotlin-sync/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,3 +188,5 @@ tasks.javadocJar.configure {
188188
// Sources publishing configuration
189189
// ===========================
190190
tasks.sourcesJar { from(project.sourceSets.main.map { it.kotlin }) }
191+
192+
afterEvaluate { tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.driver.kotlin.sync" } } }

driver-scala/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ ext {
117117
}
118118

119119
afterEvaluate {
120-
jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.scala.mongo-scala-driver'
120+
jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.driver.scala'
121121
jar.manifest.attributes['Import-Package'] = [
122122
'!scala.*',
123123
'*'

gradle/publish.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ ext {
6060
configureJarManifestAttributes = { project ->
6161
{ ->
6262
manifest.attributes['-exportcontents'] = "*;-noimport:=true"
63-
manifest.attributes['Automatic-Module-Name'] = project.group + '.' + project.archivesBaseName
6463
manifest.attributes['Build-Version'] = project.gitVersion
6564
manifest.attributes['Bundle-Version'] = project.version
6665
manifest.attributes['Bundle-Name'] = project.archivesBaseName

0 commit comments

Comments
 (0)