Skip to content

Commit f67acc3

Browse files
authored
Merge pull request #74 from testng-team/feat/testng_7_12
feat: update to the latest 7.12 snapshot with fixed OSGi headers
2 parents 13443a7 + 6c61317 commit f67acc3

File tree

1 file changed

+2
-38
lines changed

1 file changed

+2
-38
lines changed

build.gradle

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repositories {
3030

3131
// project version is also platform feature version default,
3232
// here uses TestNG version as project version.
33-
version = '7.11.0'
33+
version = '7.12.0-SNAPSHOT'
3434

3535
def buildMode = System.getProperty('BUILD_MODE')
3636
def versionWithQualifier
@@ -53,45 +53,9 @@ defaultTasks 'updateSiteZip'
5353
updateSiteZip.dependsOn clean
5454

5555
platform {
56-
bundle "org.testng:testng:${version}", {
57-
bnd {
58-
// override/set the symbolic name
59-
symbolicName = 'org.testng'
60-
// override/set the bundle name
61-
bundleName = 'testng'
62-
// instruction 'Export-Package', "org.testng.*;version=$version"
63-
instruction 'Import-Package',
64-
'com.beust.jcommander.*;version="[1.8.3,2.0.0)",' +
65-
'org.slf4j.*,' +
66-
'bsh.*;version="[2.0.0,3.0.0)";resolution:=optional,' +
67-
'com.google.inject.*;version="5.0";resolution:=optional,' +
68-
'junit.framework;version="[3.8.1, 5.0.0)";resolution:=optional,' +
69-
'org.junit.*;resolution:=optional,' +
70-
'org.apache.tools.ant.*;version="[1.7.0, 2.0.0)";resolution:=optional,' +
71-
'org.yaml.*;version="[2.0,3.0)";resolution:=optional,' +
72-
'!com.beust.testng,' +
73-
'!org.testng.*,' +
74-
'!com.sun.*'
75-
instruction 'Require-Bundle', 'com.beust.jcommander;bundle-version="[1.8.3,2.0.0)";visibility:=reexport'
76-
instruction 'Bundle-Vendor', 'TestNG Team'
77-
version = versionWithQualifier
78-
}
79-
exclude module: 'ant'
80-
exclude module: 'bsh'
81-
exclude module: 'junit'
82-
exclude module: 'jsr305'
83-
exclude module: 'guice'
84-
}
85-
56+
bundle "org.testng:testng:${version}"
8657
bundle "org.yaml:snakeyaml:2.2"
8758
bundle "org.slf4j:slf4j-api:2.0.16"
88-
89-
bundle "org.apache-extras.beanshell:bsh:2.0b6", {
90-
bnd {
91-
optionalImport 'org.apache.bsf.*'
92-
}
93-
}
94-
9559
bundle "org.jcommander:jcommander:1.83", {
9660
bnd {
9761
// override/set the symbolic name

0 commit comments

Comments
 (0)