Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build with jdk14 and gradle 6.3 #2088

Merged
merged 3 commits into from
Mar 30, 2020
Merged

Build with jdk14 and gradle 6.3 #2088

merged 3 commits into from
Mar 30, 2020

Conversation

simonbasle
Copy link
Member

No description provided.

@simonbasle simonbasle added the type/chores A task not related to code (build, formatting, process, ...) label Mar 30, 2020
@simonbasle simonbasle added this to the 3.2.17.RELEASE milestone Mar 30, 2020
@simonbasle simonbasle requested review from aneveu and bsideup March 30, 2020 12:48
@codecov-io
Copy link

codecov-io commented Mar 30, 2020 •
edited
Loading

Codecov Report

Merging #2088 into 3.2.x will decrease coverage by 0.17%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##              3.2.x    #2088      +/-   ##
============================================
- Coverage     84.78%   84.61%   -0.18%     
+ Complexity     3983     3977       -6     
============================================
  Files           364      364              
  Lines         30271    30267       -4     
  Branches       5615     5607       -8     
============================================
- Hits          25666    25609      -57     
- Misses         3000     3042      +42     
- Partials       1605     1616      +11
Impacted Files Coverage Δ Complexity Δ
...e/src/main/java/reactor/core/publisher/Traces.java 56.55% <0%> (-13.11%) 25% <0%> (ø)
.../java/reactor/core/publisher/BlockingIterable.java 71.87% <0%> (-7.3%) 7% <0%> (ø)
...in/java/reactor/core/publisher/FluxWindowWhen.java 80.28% <0%> (-4.33%) 2% <0%> (ø)
...ain/java/reactor/core/publisher/MonoCacheTime.java 87.83% <0%> (-3.38%) 18% <0%> (-1%)
...ain/java/reactor/core/scheduler/SchedulerTask.java 65.78% <0%> (-2.64%) 10% <0%> (-2%)
...ain/java/reactor/util/concurrent/WaitStrategy.java 50.42% <0%> (-1.71%) 11% <0%> (ø)
...a/reactor/core/publisher/QueueDrainSubscriber.java 20.68% <0%> (-0.87%) 14% <0%> (-2%)
...rc/main/java/reactor/core/publisher/Operators.java 82.67% <0%> (-0.82%) 133% <0%> (ø)
...eactor/core/publisher/ParallelMergeSequential.java 84.97% <0%> (-0.52%) 7% <0%> (ø)
...src/main/java/reactor/core/publisher/FluxTake.java 93.51% <0%> (-0.47%) 5% <0%> (ø)
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e4fe960...fc80479. Read the comment docs.

@simonbasle
[build] Remove Gradle 6.x deprecations (#2088)
2b3851f 
 - Bump Kotlin plugin to 1.3.71
 - Remove osgi plugin and replace with BND
 - Add explicit jar task to reactor-test to apply bnd
 - Improve BND import/export configuration
 - Bump jacoco to 0.8.5 for minimal JDK 14 compatibility
@simonbasle
[build] Upgrade to Gradle 6.3 (#2088)
195c165
@simonbasle
[build] Add opendjk14 to Travis build matrix (#2088)
fc80479
@simonbasle
Copy link
Member Author

Note that the BND manifest output was compared to old osgi output, with the following caveats:

  • reactor.* not present in core's Import-Package
  • core imports javax.annotation.meta and uses it in export of reactor.util.annotation

@simonbasle simonbasle merged commit 1e260dc into 3.2.x Mar 30, 2020
simonbasle added a commit that referenced this pull request Mar 30, 2020
@simonbasle
[build] Remove Gradle 6.x deprecations (#2088)
725a986 
 - Bump Kotlin plugin to 1.3.71
 - Remove osgi plugin and replace with BND
 - Add explicit jar task to reactor-test to apply bnd
 - Improve BND import/export configuration
 - Bump jacoco to 0.8.5 for minimal JDK 14 compatibility
@reactorbot
Copy link

@simonbasle this PR seems to have been merged on a maintenance branch, please ensure the change is merge-forwarded to intermediate maintenance branches and up to master 🙇

simonbasle added a commit that referenced this pull request Mar 30, 2020
@simonbasle
[build] Upgrade to Gradle 6.3 (#2088)
b3a7c28
@simonbasle simonbasle deleted the buildJdk14Gradle6 branch March 30, 2020 15:03
simonbasle added a commit that referenced this pull request Mar 30, 2020
@simonbasle
Merge #2088 into 3.3, adapt Gradle 6.3 bump
4758d57 
 - OSGI helper is also removed from buildSrc
 - BND configuration is updated to add blockhound
simonbasle added a commit that referenced this pull request Mar 30, 2020
@simonbasle
[build] Follow-up to #2088 : 3.3 specifics of bump to Gradle 6.3
57bbcd5 
 - build-scan plugin (added in 3.3) has been upgraded but must now be
 applied in settings.gradle
 - unbroken-dome.test-sets plugin must be bumped to version 3.0.0 for
 Gradle 6.3 compatibility
 - core BND export-package gets confused by 3.3.x "java9stubs", so we
 get more explicit about the packages we export (one level of detail
 beyond `reactor.*`)
simonbasle added a commit that referenced this pull request Mar 31, 2020
@simonbasle
[build] Follow-up to #2088 : 3.3 specifics of bump to Gradle 6.3
2515ce1 
 - build-scan plugin (added in 3.3) has been upgraded but must now be
 applied in settings.gradle
 - unbroken-dome.test-sets plugin must be bumped to version 3.0.0 for
 Gradle 6.3 compatibility
 - Bump of blockhound to 1.0.3 to avoid `reactor.shaded` version of
 bytebuddy (which confuses BND)
 - Exclude blockhound in core's BDN Export-Package
simonbasle added a commit that referenced this pull request Mar 31, 2020
@simonbasle
[build] Follow-up to #2088 : 3.3 specifics of bump to Gradle 6.3
81b8924 
 - build-scan plugin (added in 3.3) has been upgraded but must now be
 applied in settings.gradle
 - unbroken-dome.test-sets plugin must be bumped to version 3.0.0 for
 Gradle 6.3 compatibility
 - Bump of blockhound to 1.0.3 to avoid `reactor.shaded` version of
 bytebuddy (which confuses BND)
 - Exclude blockhound in core's BDN Export-Package
simonbasle added a commit that referenced this pull request Mar 31, 2020
@simonbasle
[build] Follow-up to #2088 bump to Gradle 6.3 : 3.3 specifics (#2089)
aa58404 
The specifics include:

 - build-scan plugin (added in 3.3) has been upgraded but must now be
 applied in settings.gradle
 - unbroken-dome.test-sets plugin must be bumped to version 3.0.0 for
 Gradle 6.3 compatibility
 - Bump of blockhound to 1.0.3 to avoid `reactor.shaded` version of
 bytebuddy (which confuses BND)
 - Exclude blockhound in core's BDN Export-Package
 - fix a flakky GC test
simonbasle pushed a commit that referenced this pull request Jun 20, 2020
@gurkerl83
Fix input package rule for OSGi metadata generator (#2185)
d5d101a 
In #2088 a refactoring relocated OSGi metadata generation from the base
build file to the respective modules. There was a mistake during that
transition where the javax.annotation.meta was missed in the exclusions
of the reactor-core bundle.

Co-authored-by: gurkerl83 <markus_gritsch@gmx.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsideup bsideup bsideup approved these changes

@aneveu aneveu aneveu approved these changes

Assignees
No one assigned
Labels
type/chores A task not related to code (build, formatting, process, ...)
Projects
None yet
Milestone
3.2.17.RELEASE
Development

Successfully merging this pull request may close these issues.
5 participants
@simonbasle @codecov-io @reactorbot @aneveu @bsideup