Skip to content

Commit 6aeee07

Browse files
committed
Added module name, issues url and doc url, improved bnd metadata
1 parent b8bc0ee commit 6aeee07

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

build.gradle

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,20 @@ description 'HiveMQ MQTT Client is a MQTT 5.0 and MQTT 3.1.1 compatible and feat
2828
'library with different API flavours and backpressure support'
2929

3030
ext {
31+
moduleName = 'com.hivemq.client.mqtt'
3132
readableName = 'HiveMQ MQTT Client'
3233
githubOrg = 'hivemq'
3334
githubRepo = 'hivemq-mqtt-client'
3435
githubUrl = 'https://github.com/' + githubOrg + '/' + githubRepo
3536
scmConnection = 'scm:git:git://github.com/' + githubOrg + '/' + githubRepo + '.git'
3637
scmDeveloperConnection = 'scm:git:ssh://[email protected]/' + githubOrg + '/' + githubRepo + '.git'
38+
issuesUrl = githubUrl + '/issues'
39+
docUrl = 'https://' + githubOrg + '.github.io/' + githubRepo + '/'
3740
licenseShortName = 'Apache-2.0'
3841
licenseReadableName = 'The Apache License, Version 2.0'
3942
licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
4043
shadedAppendix = 'shaded'
41-
prevVersion = '1.0.1'
44+
prevVersion = '1.1.0'
4245
}
4346

4447
sourceCompatibility = 1.8
@@ -101,15 +104,17 @@ apply from: 'japicc.gradle'
101104
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
102105

103106
jar {
104-
bnd('Automatic-Module-Name' : jar.baseName,
105-
'Bundle-Name': readableName,
106-
'Bundle-Description': rootProject.description,
107-
'Bundle-Vendor': 'dc-square and the HiveMQ MQTT Client Project',
108-
'Bundle-License': licenseShortName + ';description="' + licenseReadableName + '";link="' + licenseUrl + '"',
109-
'Bundle-DocURL': 'https://hivemq.github.io/hivemq-mqtt-client/',
110-
'Bundle-SCM': 'url="' + githubUrl + '";connection="' + scmConnection + '";developerConnection="' +scmDeveloperConnection + '"',
111-
'Export-Package': 'com.hivemq.client.annotations.*, com.hivemq.client.mqtt.*, com.hivemq.client.rx.*, com.hivemq.client.util.*',
112-
'-consumer-policy': '${range;[==,=+)}')
107+
bnd('Automatic-Module-Name': project.moduleName,
108+
'Bundle-Name': project.name,
109+
'Bundle-SymbolicName': project.moduleName,
110+
'Bundle-Description': project.description,
111+
'Bundle-Vendor': 'HiveMQ and the HiveMQ Community',
112+
'Bundle-License': project.licenseShortName + ';description="' + project.licenseReadableName + '";link="' + project.licenseUrl + '"',
113+
'Bundle-DocURL': project.docUrl,
114+
'Bundle-SCM': 'url="' + project.githubUrl + '";connection="' + project.scmConnection + '";developerConnection="' + project.scmDeveloperConnection + '"',
115+
'Export-Package': 'com.hivemq.client.annotations.*, com.hivemq.client.mqtt.*, com.hivemq.client.rx.*, com.hivemq.client.util.*',
116+
'-consumer-policy': '${range;[==,=+)}',
117+
'-removeheaders': 'Private-Package')
113118
}
114119

115120
shadowJar { ShadowJar shadowJar ->

publishing.gradle

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ void addPom(MavenPublication publication) {
8282
developerConnection = project.scmDeveloperConnection
8383
url = project.githubUrl
8484
}
85+
issueManagement {
86+
system = 'github'
87+
url = project.issuesUrl
88+
}
8589
}
8690
}
8791

@@ -124,10 +128,10 @@ bintray {
124128
repo = 'HiveMQ'
125129
name = 'hivemq-mqtt-client'
126130
desc = project.description
127-
websiteUrl = githubUrl
128-
issueTrackerUrl = githubUrl + '/issues'
129-
vcsUrl = githubUrl + '.git'
130-
licenses = [licenseShortName]
131+
websiteUrl = project.githubUrl
132+
issueTrackerUrl = project.issuesUrl
133+
vcsUrl = project.githubUrl + '.git'
134+
licenses = [project.licenseShortName]
131135
labels = ['mqtt', 'mqtt-client', 'iot', 'internet-of-things', 'rxjava2', 'reactive-streams', 'backpressure']
132136
version {
133137
released = new Date()

0 commit comments

Comments
 (0)