Resolve difference in META-INF/MANIFEST.MF files between 3.x and 4.x

jstewart148 · jstewart148 · commit 7a3fbd7c164d · 2020-01-14T14:07:31.000-05:00
JAVA-3566
diff --git a/bson-scala/build.gradle b/bson-scala/build.gradle
@@ -18,7 +18,7 @@ description = "A Scala wrapper / extension to the bson library"
 archivesBaseName = 'mongo-scala-bson'
 
 dependencies {
-    compile project(':bson')
+    compile project(path: ':bson', configuration: 'default')
 }
 
 sourceSets {
@@ -48,11 +48,4 @@ test {
     maxParallelForks = 1
 }
 
-jar {
-    bnd (
-        '-exportcontents': "*;-noimport:=true",
-        'Automatic-Module-Name': 'org.mongodb.scala.mongo-scala-bson',
-        'Build-Version': project.gitVersion,
-        'Import-Package': 'org.bson.*'
-    )
-}
+jar.manifest.attributes['Import-Package'] = 'org.bson.*'
diff --git a/bson/build.gradle b/bson/build.gradle
@@ -22,11 +22,4 @@ ext {
     pomURL = 'https://bsonspec.org'
 }
 
-jar {
-    bnd (
-        '-exportcontents': "*;-noimport:=true",
-         'Automatic-Module-Name': 'org.mongodb.bson',
-         'Build-Version': project.gitVersion,
-         'Import-Package': 'org.slf4j;resolution:=optional'
-    )
-}
+jar.manifest.attributes['Import-Package'] = 'org.slf4j;resolution:=optional'
diff --git a/build.gradle b/build.gradle
@@ -90,7 +90,6 @@ configure(javaProjects) {
 
 configure(scalaProjects) {
     apply plugin: 'scala'
-    apply plugin: 'biz.aQute.bnd.builder'
     apply plugin: 'idea'
     apply plugin: "com.adtran.scala-multiversion-plugin"
     apply plugin: "com.diffplug.gradle.spotless"
@@ -110,6 +109,7 @@ configure(scalaProjects) {
         testCompile('ch.qos.logback:logback-classic:1.1.3')
         testCompile('org.reflections:reflections:0.9.10')
     }
+    
 
     spotless {
         scala {
@@ -130,7 +130,6 @@ configure(scalaProjects) {
 }
 
 configure(javaMainProjects) {
-    apply plugin: 'biz.aQute.bnd.builder'
     apply plugin: 'nebula.optional-base'
 
     dependencies {
diff --git a/driver-core/build.gradle b/driver-core/build.gradle
@@ -31,7 +31,7 @@ ext {
 sourceSets.main.resources.srcDirs = ['src/resources']
 
 dependencies {
-    compile project(':bson')
+    compile project(path: ':bson', configuration: 'default')
 
     compile "com.github.jnr:jnr-unixsocket:$jnrUnixsocketVersion", optional
     compile "io.netty:netty-buffer:$nettyVersion", optional
@@ -52,28 +52,25 @@ buildConfig {
     packageName = 'com.mongodb.internal.build'
 }
 
-jar {
-    bnd(
-            '-exportcontents': "*;-noimport:=true",
-            'Automatic-Module-Name': 'org.mongodb.driver.core',
-            'Build-Version': project.gitVersion,
-            'Import-Package': [
-                    'org.bson.*',                       // unfortunate that this is necessary, but if it's left out then it's not included
-                    'javax.crypto.*',
-                    'javax.crypto.spec.*',
-                    'javax.management.*',
-                    'javax.naming.*',
-                    'javax.naming.directory.*',
-                    'javax.net.*',
-                    'javax.net.ssl.*',
-                    'javax.security.sasl.*',
-                    'javax.security.auth.callback.*',
-                    'org.ietf.jgss.*',
-                    'io.netty.*;resolution:=optional',
-                    'org.xerial.snappy.*;resolution:=optional',
-                    'com.github.luben.zstd.*;resolution:=optional',
-                    'org.slf4j;resolution:=optional',
-                    'jnr.unixsocket;resolution:=optional'
-            ].join(',')
-    )
+afterEvaluate {
+    jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.driver.core'
+    jar.manifest.attributes['Bundle-SymbolicName'] = 'org.mongodb.driver-core'
+    jar.manifest.attributes['Import-Package'] = [
+        'org.bson.*', // unfortunate that this is necessary, but if it's left out then it's not included
+        'javax.crypto.*',
+        'javax.crypto.spec.*',
+        'javax.management.*',
+        'javax.naming.*',
+        'javax.naming.directory.*',
+        'javax.net.*',
+        'javax.net.ssl.*',
+        'javax.security.sasl.*',
+        'javax.security.auth.callback.*',
+        'org.ietf.jgss.*',
+        'io.netty.*;resolution:=optional',
+        'org.xerial.snappy.*;resolution:=optional',
+        'com.github.luben.zstd.*;resolution:=optional',
+        'org.slf4j;resolution:=optional',
+        'jnr.unixsocket;resolution:=optional'
+    ].join(',')
 }
diff --git a/driver-reactive-streams/build.gradle b/driver-reactive-streams/build.gradle
@@ -18,8 +18,8 @@ description = "A Reactive Streams implementation of the MongoDB Java driver"
 archivesBaseName = 'mongodb-driver-reactivestreams'
 
 dependencies {
-    compile project(':bson')
-    compile project(':driver-core')
+    compile project(path: ':bson', configuration: 'default')
+    compile project(path: ':driver-core', configuration: 'default')
 
     compile 'org.reactivestreams:reactive-streams:1.0.2'
 
@@ -59,11 +59,8 @@ ext {
     pomName = 'The MongoDB Reactive Streams Driver'
 }
 
-jar {
-    bnd (
-        '-exportcontents': "*;-noimport:=true",
-        'Automatic-Module-Name': 'org.mongodb.driver.reactivestreams',
-        'Build-Version': project.gitVersion,
-        'Import-Package': 'org.bson.*,com.mongodb.*'
-    )
+afterEvaluate {
+    jar.manifest.attributes['Import-Package'] = 'org.bson.*,com.mongodb.*'
+    jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.driver.reactivestreams'
+    jar.manifest.attributes['Bundle-SymbolicName'] = 'org.mongodb.driver-reactivestreams'
 }
diff --git a/driver-scala/build.gradle b/driver-scala/build.gradle
@@ -18,8 +18,13 @@ description = "A Scala wrapper / extension to the bson library"
 archivesBaseName = 'mongo-scala-driver'
 
 dependencies {
-    compile project(':bson-scala')
-    compile project(':driver-reactive-streams')
+    compile project(path: ':bson', configuration: 'default')
+    compile project(path: ':bson-scala', configuration: 'default')
+    compile project(path: ':driver-core', configuration: 'default')
+    compile project(path: ':driver-reactive-streams', configuration: 'default')
+    compile project(path: ':driver-sync', configuration: 'default')
+
+    compile 'org.reactivestreams:reactive-streams:1.0.2'
 
     testCompile project(':util')
     testCompile project(':driver-sync')
@@ -91,11 +96,7 @@ ext {
     pomName = 'Mongo Scala Driver'
 }
 
-jar {
-    bnd (
-        '-exportcontents': "*;-noimport:=true",
-        'Automatic-Module-Name': 'org.mongodb.scala.mongo-scala-driver',
-        'Build-Version': project.gitVersion,
-        'Import-Package': 'org.bson.*,com.mongodb.*'
-    )
+afterEvaluate {
+    jar.manifest.attributes['Import-Package'] = 'org.bson.*,com.mongodb.*'
+    jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.scala.mongo-scala-driver'
 }
diff --git a/driver-sync/build.gradle b/driver-sync/build.gradle
@@ -21,8 +21,8 @@ ext {
 }
 
 dependencies {
-    compile project(':bson')
-    compile project(':driver-core')
+    compile project(path: ':bson', configuration: 'default')
+    compile project(path: ':driver-core', configuration: 'default')
 
     testCompile project(':bson').sourceSets.test.output
     testCompile project(':driver-core').sourceSets.test.output
@@ -41,11 +41,8 @@ tasks.withType(Checkstyle) {
     classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output)
 }
 
-jar {
-    bnd (
-        '-exportcontents': "*;-noimport:=true",
-        'Automatic-Module-Name': 'org.mongodb.driver.sync.client',
-        'Build-Version': project.gitVersion,
-        'Import-Package': 'org.bson.*,com.mongodb.*'
-    )
+afterEvaluate {
+    jar.manifest.attributes['Import-Package'] = 'org.bson.*,com.mongodb.*'
+    jar.manifest.attributes['Automatic-Module-Name'] = 'org.mongodb.driver.sync.client'
+    jar.manifest.attributes['Bundle-SymbolicName'] = 'org.mongodb.driver-sync'
 }
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -57,12 +57,23 @@ ext {
             }
         }
     }
+    configureJarManifestAttributes = { project ->
+        { ->
+            manifest.attributes['-exportcontents'] =  "*;-noimport:=true"
+            manifest.attributes['Automatic-Module-Name'] =  project.group + '.' + project.archivesBaseName
+            manifest.attributes['Build-Version'] =  project.gitVersion
+            manifest.attributes['Bundle-Version'] =  project.version
+            manifest.attributes['Bundle-Name'] =  project.archivesBaseName
+            manifest.attributes['Bundle-SymbolicName'] =  project.group + '.' + project.archivesBaseName
+        }
+    }
 }
 
 def scalaProjects = subprojects.findAll { it.name.contains('scala') }
 def javaProjects = subprojects.findAll { !scalaProjects.contains(it) && !['util', 'driver-benchmarks'].contains(it.name) }
 
 configure(javaProjects) { project ->
+    apply plugin: 'biz.aQute.bnd.builder'
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
 
@@ -92,6 +103,7 @@ configure(javaProjects) { project ->
     }
 
     afterEvaluate {
+        jar configureJarManifestAttributes(project)
         publishing.publications.mavenJava.artifactId = project.archivesBaseName
         signing {
             sign publishing.publications.mavenJava
@@ -100,6 +112,7 @@ configure(javaProjects) { project ->
 }
 
 configure(scalaProjects) { project ->
+    apply plugin: 'biz.aQute.bnd.builder'
     apply plugin: 'maven-publish'
     apply plugin: 'signing'
 
@@ -130,6 +143,7 @@ configure(scalaProjects) { project ->
     }
 
     afterEvaluate {
+        jar configureJarManifestAttributes(project)
         signing {
             sign publishing.publications.mavenJava
         }

Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,23 @@ ext {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`
	`60`	`+ configureJarManifestAttributes = { project ->`
	`61`	`+ { ->`
	`62`	`+ manifest.attributes['-exportcontents'] = "*;-noimport:=true"`
	`63`	`+ manifest.attributes['Automatic-Module-Name'] = project.group + '.' + project.archivesBaseName`
	`64`	`+ manifest.attributes['Build-Version'] = project.gitVersion`
	`65`	`+ manifest.attributes['Bundle-Version'] = project.version`
	`66`	`+ manifest.attributes['Bundle-Name'] = project.archivesBaseName`
	`67`	`+ manifest.attributes['Bundle-SymbolicName'] = project.group + '.' + project.archivesBaseName`
	`68`	`+ }`
	`69`	`+ }`
`60`	`70`	`}`
`61`	`71`
`62`	`72`	`def scalaProjects = subprojects.findAll { it.name.contains('scala') }`
`63`	`73`	`def javaProjects = subprojects.findAll { !scalaProjects.contains(it) && !['util', 'driver-benchmarks'].contains(it.name) }`
`64`	`74`
`65`	`75`	`configure(javaProjects) { project ->`
	`76`	`+ apply plugin: 'biz.aQute.bnd.builder'`
`66`	`77`	`apply plugin: 'maven-publish'`
`67`	`78`	`apply plugin: 'signing'`
`68`	`79`
`@@ -92,6 +103,7 @@ configure(javaProjects) { project ->`
`92`	`103`	`}`
`93`	`104`
`94`	`105`	`afterEvaluate {`
	`106`	`+ jar configureJarManifestAttributes(project)`
`95`	`107`	`publishing.publications.mavenJava.artifactId = project.archivesBaseName`
`96`	`108`	`signing {`
`97`	`109`	`sign publishing.publications.mavenJava`
`@@ -100,6 +112,7 @@ configure(javaProjects) { project ->`
`100`	`112`	`}`
`101`	`113`
`102`	`114`	`configure(scalaProjects) { project ->`
	`115`	`+ apply plugin: 'biz.aQute.bnd.builder'`
`103`	`116`	`apply plugin: 'maven-publish'`
`104`	`117`	`apply plugin: 'signing'`
`105`	`118`
`@@ -130,6 +143,7 @@ configure(scalaProjects) { project ->`
`130`	`143`	`}`
`131`	`144`
`132`	`145`	`afterEvaluate {`
	`146`	`+ jar configureJarManifestAttributes(project)`
`133`	`147`	`signing {`
`134`	`148`	`sign publishing.publications.mavenJava`
`135`	`149`	`}`