Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to Gradle 6.0.1, TestNG 7.0.0, use Bnd for OSGi properties (#473
) * Upgrade to Gradle 6.0.1, TestNG 7.0.0, use Bnd for OSGi properties * Fix TCK build under JDK 9 * Fix triggerFlowRequest wrong TestNG injection attempt * Remove wrong or unnecessary Import-Package restrictions
- Loading branch information
1 parent
92ffa50
commit 4db62a5
Showing
10 changed files
with
63 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,18 @@ | ||
description = 'reactive-streams-examples' | ||
dependencies { | ||
compile project(':reactive-streams') | ||
testCompile project(':reactive-streams-tck') | ||
implementation project(':reactive-streams') | ||
testImplementation project(':reactive-streams-tck') | ||
} | ||
|
||
jar { | ||
manifest { | ||
attributes('Automatic-Module-Name': 'org.reactivestreams.examples') | ||
} | ||
bnd ('Bundle-Name': 'reactive-streams-jvm', | ||
'Bundle-Vendor': 'Reactive Streams SIG', | ||
'Bundle-Description': 'Reactive Streams Examples', | ||
'Bundle-DocURL': 'http://reactive-streams.org', | ||
'Bundle-Version': project.version, | ||
'Export-Package': 'org.reactivestreams.example.*', | ||
'Automatic-Module-Name': 'org.reactivestreams.examples' | ||
) | ||
} | ||
|
||
test.useTestNG() |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,18 @@ | ||
description = 'reactive-streams-tck-flow' | ||
dependencies { | ||
compile group: 'org.testng', name: 'testng', version:'5.14.10' | ||
compile project(':reactive-streams-tck') | ||
api project(':reactive-streams-tck') | ||
implementation project(':reactive-streams-examples') | ||
} | ||
|
||
jar { | ||
manifest { | ||
attributes('Automatic-Module-Name': 'org.reactivestreams.tckflow') | ||
} | ||
bnd ('Bundle-Name': 'reactive-streams-jvm', | ||
'Bundle-Vendor': 'Reactive Streams SIG', | ||
'Bundle-Description': 'Reactive Streams TCK Flow', | ||
'Bundle-DocURL': 'http://reactive-streams.org', | ||
'Bundle-Version': project.version, | ||
'Export-Package': 'org.reactivestreams.tck.flow.*', | ||
'Automatic-Module-Name': 'org.reactivestreams.tckflow' | ||
) | ||
} | ||
|
||
test.useTestNG() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,19 @@ | ||
description = 'reactive-streams-tck' | ||
dependencies { | ||
compile group: 'org.testng', name: 'testng', version:'5.14.10' | ||
compile project(':reactive-streams') | ||
compile project(':reactive-streams-examples') | ||
api group: 'org.testng', name: 'testng', version:'7.0.0' | ||
api project(':reactive-streams') | ||
implementation project(':reactive-streams-examples') | ||
} | ||
|
||
jar { | ||
manifest { | ||
attributes('Automatic-Module-Name': 'org.reactivestreams.tck') | ||
} | ||
bnd ('Bundle-Name': 'reactive-streams-jvm', | ||
'Bundle-Vendor': 'Reactive Streams SIG', | ||
'Bundle-Description': 'Reactive Streams TCK', | ||
'Bundle-DocURL': 'http://reactive-streams.org', | ||
'Bundle-Version': project.version, | ||
'Export-Package': 'org.reactivestreams.tck.*', | ||
'Automatic-Module-Name': 'org.reactivestreams.tck' | ||
) | ||
} | ||
|
||
test.useTestNG() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters