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.

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

[build] Backport last relevant build changes from 3.3 #2156

Merged
merged 2 commits into from
May 14, 2020

Conversation

simonbasle
Copy link
Member

@simonbasle simonbasle commented May 14, 2020

This includes:

  • using local buildSrc plugins rather than adhoc code blocks (detecting
    ci, java conventions, custom version)
  • splitting out javadoc/asciidoc gradle files
  • fixing the directory into which asciidocs are built
  • avoid building pdf reference guide locally (unless release)
  • remove spring-io-plugin / platform
  • bump asciidoctor.convert plugin
  • micrometer version defined in gradle.properties and pinned
  • reactiveStream version defined in gradle.properties
  • junit, awaitility, jol and testNg versions defined in properties
    rather than inline
  • use gradle enterprise plugin for buildScan
  • removed hamcrest-library dependency
  • automatic module names (see Declare an Java9 JPMS Automatic-Module-Name for core and test #1692)

This includes:
 - using local buildSrc plugins rather than adhoc code blocks (detecting
 ci, java conventions, custom version)
 - splitting out javadoc/asciidoc gradle files
 - fixing the directory into which asciidocs are built
 - avoid building pdf reference guide locally (unless release)
 - remove spring-io-plugin / platform
 - bump asciidoctor.convert plugin
 - micrometer version defined in gradle.properties and pinned
 - reactiveStream version defined in gradle.properties
 - junit, awaitility, jol and testNg versions defined in properties
 rather than inline
 - use gradle enterprise plugin for buildScan
 - removed hamcrest-library dependency
 - automatic module names
@simonbasle simonbasle added the type/chores A task not related to code (build, formatting, process, ...) label May 14, 2020
@simonbasle simonbasle added this to the 3.2.18.RELEASE milestone May 14, 2020
@simonbasle simonbasle requested a review from a team May 14, 2020 13:38
simonbasle added a commit that referenced this pull request May 14, 2020
Also use one testCompile instruction per line.

Reviewed-in: #2156
@simonbasle simonbasle force-pushed the alignCaliforniumBuild branch from a8ce716 to 2bd0738 Compare May 14, 2020 13:39
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll fix that, spaces are used in the license template

@simonbasle simonbasle force-pushed the alignCaliforniumBuild branch from 2bd0738 to 2f24bca Compare May 14, 2020 13:47
build.gradle Outdated Show resolved Hide resolved
Copy link
Contributor

@bsideup bsideup left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved with a question about the shadow plugin

@codecov-io
Copy link

codecov-io commented May 14, 2020

Codecov Report

Merging #2156 into 3.2.x will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##              3.2.x    #2156      +/-   ##
============================================
+ Coverage     84.87%   84.91%   +0.04%     
- Complexity     4012     4014       +2     
============================================
  Files           364      364              
  Lines         30475    30475              
  Branches       5663     5663              
============================================
+ Hits          25865    25879      +14     
+ Misses         3010     2996      -14     
  Partials       1600     1600              
Impacted Files Coverage Δ Complexity Δ
...va/reactor/core/publisher/ParallelMergeReduce.java 69.42% <0.00%> (-1.66%) 3.00% <0.00%> (ø%)
...in/java/reactor/core/publisher/FluxWindowWhen.java 80.28% <0.00%> (-1.45%) 2.00% <0.00%> (ø%)
.../java/reactor/core/publisher/UnicastProcessor.java 88.38% <0.00%> (-1.02%) 74.00% <0.00%> (-1.00%)
...in/java/reactor/core/publisher/TopicProcessor.java 74.25% <0.00%> (-0.60%) 16.00% <0.00%> (ø%)
...eactor/core/publisher/ParallelMergeSequential.java 84.97% <0.00%> (-0.52%) 7.00% <0.00%> (ø%)
.../main/java/reactor/core/publisher/FluxFlatMap.java 94.56% <0.00%> (+0.18%) 19.00% <0.00%> (ø%)
...main/java/reactor/core/publisher/FluxGenerate.java 82.20% <0.00%> (+0.61%) 7.00% <0.00%> (ø%)
...ava/reactor/core/publisher/EventLoopProcessor.java 80.82% <0.00%> (+1.03%) 52.00% <0.00%> (+1.00%)
...or-core/src/main/java/reactor/core/Exceptions.java 88.11% <0.00%> (+1.39%) 58.00% <0.00%> (+1.00%)
...ain/java/reactor/core/publisher/MonoPublishOn.java 88.88% <0.00%> (+3.17%) 3.00% <0.00%> (ø%)
... and 1 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 b3c6230...2f24bca. Read the comment docs.

@simonbasle simonbasle changed the title Align californium build with most changes from 3.3 [build] Backport last relevant build changes from 3.3 May 14, 2020
@simonbasle simonbasle merged commit 9a5f9cc into 3.2.x May 14, 2020
@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 simonbasle deleted the alignCaliforniumBuild branch May 14, 2020 14:22
simonbasle added a commit that referenced this pull request May 14, 2020
Also use one testCompile instruction per line.

Reviewed-in: #2156
simonbasle added a commit that referenced this pull request May 14, 2020
simonbasle added a commit that referenced this pull request May 14, 2020
Fixing conflicts mainly around the new versioning scheme.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/chores A task not related to code (build, formatting, process, ...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants