Merge pull request #541 from reactive-streams/wip-fix-540-Bundle-SymbolicName-√

rkuhn · web-flow · commit f3614839f01c · 2023-08-05T09:41:32.000+02:00
Fixing #540 by manually overriding the Bundle-SymbolicName for the BN…
diff --git a/api/build.gradle b/api/build.gradle
@@ -25,7 +25,8 @@ jar {
             'Bundle-DocURL': 'http://reactive-streams.org',
             'Bundle-Version': project.version,
             'Export-Package': 'org.reactivestreams.*',
-            'Automatic-Module-Name': 'org.reactivestreams'
+            'Automatic-Module-Name': 'org.reactivestreams',
+            'Bundle-SymbolicName': 'org.reactivestreams.reactive-streams'
     )
 }
 
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -11,7 +11,8 @@ jar {
             'Bundle-DocURL': 'http://reactive-streams.org',
             'Bundle-Version': project.version,
             'Export-Package': 'org.reactivestreams.example.*',
-            'Automatic-Module-Name': 'org.reactivestreams.examples'
+            'Automatic-Module-Name': 'org.reactivestreams.examples',
+            'Bundle-SymbolicName': 'org.reactivestreams.examples'
     )
 }
 
diff --git a/tck-flow/build.gradle b/tck-flow/build.gradle
@@ -11,7 +11,8 @@ jar {
             'Bundle-DocURL': 'http://reactive-streams.org',
             'Bundle-Version': project.version,
             'Export-Package': 'org.reactivestreams.tck.flow.*',
-            'Automatic-Module-Name': 'org.reactivestreams.tckflow'
+            'Automatic-Module-Name': 'org.reactivestreams.tckflow',
+            'Bundle-SymbolicName': 'org.reactivestreams.tckflow'
     )
 }
 
diff --git a/tck/build.gradle b/tck/build.gradle
@@ -12,7 +12,8 @@ jar {
             'Bundle-DocURL': 'http://reactive-streams.org',
             'Bundle-Version': project.version,
             'Export-Package': 'org.reactivestreams.tck.*',
-            'Automatic-Module-Name': 'org.reactivestreams.tck'
+            'Automatic-Module-Name': 'org.reactivestreams.tck',
+            'Bundle-SymbolicName': 'org.reactivestreams.tck'
     )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ jar {`
`25`	`25`	`'Bundle-DocURL': 'http://reactive-streams.org',`
`26`	`26`	`'Bundle-Version': project.version,`
`27`	`27`	`'Export-Package': 'org.reactivestreams.*',`
`28`		`- 'Automatic-Module-Name': 'org.reactivestreams'`
	`28`	`+ 'Automatic-Module-Name': 'org.reactivestreams',`
	`29`	`+ 'Bundle-SymbolicName': 'org.reactivestreams.reactive-streams'`
`29`	`30`	`)`
`30`	`31`	`}`
`31`	`32`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ jar {`
`11`	`11`	`'Bundle-DocURL': 'http://reactive-streams.org',`
`12`	`12`	`'Bundle-Version': project.version,`
`13`	`13`	`'Export-Package': 'org.reactivestreams.example.*',`
`14`		`- 'Automatic-Module-Name': 'org.reactivestreams.examples'`
	`14`	`+ 'Automatic-Module-Name': 'org.reactivestreams.examples',`
	`15`	`+ 'Bundle-SymbolicName': 'org.reactivestreams.examples'`
`15`	`16`	`)`
`16`	`17`	`}`
`17`	`18`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ jar {`
`12`	`12`	`'Bundle-DocURL': 'http://reactive-streams.org',`
`13`	`13`	`'Bundle-Version': project.version,`
`14`	`14`	`'Export-Package': 'org.reactivestreams.tck.*',`
`15`		`- 'Automatic-Module-Name': 'org.reactivestreams.tck'`
	`15`	`+ 'Automatic-Module-Name': 'org.reactivestreams.tck',`
	`16`	`+ 'Bundle-SymbolicName': 'org.reactivestreams.tck'`
`16`	`17`	`)`
`17`	`18`	`}`
`18`	`19`