Skip to content

Prepare build for Java16#598

Merged
artursouza merged 13 commits into
dapr:masterfrom
mthmulders:prepare-build-java16
Aug 30, 2021
Merged

Prepare build for Java16#598
artursouza merged 13 commits into
dapr:masterfrom
mthmulders:prepare-build-java16

Conversation

@mthmulders

@mthmulders mthmulders commented Aug 18, 2021

Copy link
Copy Markdown
Contributor

Description

This pull request allows building the Dapr SDK for Java on Java 16. Things that have changed:

  • Upgrade to latest version of Mockito. It has a more recent version of ByteBuddy, which in turn adds support for Java 16. This reduces the number of failed test cases in dapr-sdk from 228 to 11.
  • Modify the GitHub Actions to run on Java 11 and Java 16. This is a change from the current jobs, which only run on Java 13. It uses a "build matrix" so we can run multiple versions in parallel.
  • The remaining 11 failing test cases in dapr-sdk seem to be caused by the fact that the System Rules JUnit rules. These rules use some reflective code that no longer works on Java 16. To fix this, I have added an --add-opens statement to the Surefire configuration.

Issue reference

This PR will close #594

Checklist

Please make sure you've completed the relevant tasks for this PR, out of the following list:

  • Code compiles correctly
  • Created/updated tests
  • Extended the documentation

@mthmulders mthmulders requested review from a team as code owners August 18, 2021 20:29
@mthmulders mthmulders changed the title [WIP] Prepare build for Java16 Prepare build for Java16 Aug 18, 2021
@mthmulders

Copy link
Copy Markdown
Contributor Author

I see that this change might also require a change in the GitHub project setup: it waits for the 'build' job to be completed, but there is no longer a job by that name.

@artursouza

Copy link
Copy Markdown
Contributor

I see that this change might also require a change in the GitHub project setup: it waits for the 'build' job to be completed, but there is no longer a job by that name.

I can force merge and then the build step will not be required going forward. It is just that the 'build' job is present in master branch.

Comment thread sdk/pom.xml
artursouza and others added 9 commits August 20, 2021 14:58
Co-authored-by: Artur Souza <artursouza.ms@outlook.com>
* Add Automerge workflow

The automerge workflow will check for complete and approved pull requests and will merge them automatically.

Sources:
- For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge")
- https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue.

Resolves dapr#603

* Update automerge-bot.yml

* Update automerge-bot.yml

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>
Added fixed versions for maven-deploy-plugin & spring-boot-maven-plugin as this would otherwise break in a future maven version.

Also fixed some indenting and removed duplicate declarations.

Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com>
…apr#583)

* Remove duplicate dependency

* Transform into managed dependencies

* Remove old JUnit version from dependencies

* Add tests for DaprBeanPostProcessor

* Also register PostMappings that use value

* Modify existing pub/sub test to no use @PostMapping(path="...")

* Remove added dependencies on AssertJ, Spring Test and Servlet API

* Remove test in favour of the sdk-tests one

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>
@artursouza artursouza self-assigned this Aug 24, 2021
@codecov

codecov Bot commented Aug 24, 2021

Copy link
Copy Markdown

Codecov Report

Merging #598 (a076f66) into master (93dbbbb) will decrease coverage by 0.13%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #598      +/-   ##
============================================
- Coverage     77.16%   77.03%   -0.14%     
+ Complexity      942      941       -1     
============================================
  Files            88       88              
  Lines          3009     3009              
  Branches        334      334              
============================================
- Hits           2322     2318       -4     
- Misses          525      528       +3     
- Partials        162      163       +1     
Impacted Files Coverage Δ
sdk/src/main/java/io/dapr/utils/Retry.java 50.00% <0.00%> (-25.00%) ⬇️

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 93dbbbb...a076f66. Read the comment docs.

@artursouza artursouza merged commit 70e18d8 into dapr:master Aug 30, 2021
fackee pushed a commit to fackee/java-sdk that referenced this pull request Mar 28, 2022
* Upgrade Mockito to latest version

* Run GitHub Actions on Java 11 and 16

* Run JUnit tests with `--add-opens java.base/java.util=ALL-UNNAMED`

* Move Surefire JVM arguments to Maven property

* Update build.yml

* Update validate.yml

* simplily build singleton dapr http (dapr#590)

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>

* Add Automerge workflow (dapr#605)

* Add Automerge workflow

The automerge workflow will check for complete and approved pull requests and will merge them automatically.

Sources:
- For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge")
- https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue.

Resolves dapr#603

* Update automerge-bot.yml

* Update automerge-bot.yml

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>

* Cleanup Maven POM files (dapr#604)

Added fixed versions for maven-deploy-plugin & spring-boot-maven-plugin as this would otherwise break in a future maven version.

Also fixed some indenting and removed duplicate declarations.

Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com>

* Add support for @PostMapping("/path") to pub/sub topic subscriptions (dapr#583)

* Remove duplicate dependency

* Transform into managed dependencies

* Remove old JUnit version from dependencies

* Add tests for DaprBeanPostProcessor

* Also register PostMappings that use value

* Modify existing pub/sub test to no use @PostMapping(path="...")

* Remove added dependencies on AssertJ, Spring Test and Servlet API

* Remove test in favour of the sdk-tests one

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>

* Run JUnit tests in all modules with java.base/java.util and java.base/java.lang opened to all modules

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>
Co-authored-by: 浩 <inf2inf2@outlook.com>
Co-authored-by: Tom Cools <tom.cools@live.be>
Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com>
Signed-off-by: zjx244729 <zjx244729@alibaba-inc.com>
fackee pushed a commit to fackee/java-sdk that referenced this pull request Mar 28, 2022
* Upgrade Mockito to latest version

* Run GitHub Actions on Java 11 and 16

* Run JUnit tests with `--add-opens java.base/java.util=ALL-UNNAMED`

* Move Surefire JVM arguments to Maven property

* Update build.yml

* Update validate.yml

* simplily build singleton dapr http (dapr#590)

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>

* Add Automerge workflow (dapr#605)

* Add Automerge workflow

The automerge workflow will check for complete and approved pull requests and will merge them automatically.

Sources:
- For the python script to execute the merge: https://raw.githubusercontent.com/dapr/dapr/master/.github/scripts/automerge.py (only changed the label from "automerge" to "auto-merge")
- https://raw.githubusercontent.com/dapr/dapr/master/.github/workflows/dapr-bot-schedule.yml (only copied the automerge part, not the prune_stale part as that was not part of the issue.

Resolves dapr#603

* Update automerge-bot.yml

* Update automerge-bot.yml

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>

* Cleanup Maven POM files (dapr#604)

Added fixed versions for maven-deploy-plugin & spring-boot-maven-plugin as this would otherwise break in a future maven version.

Also fixed some indenting and removed duplicate declarations.

Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com>

* Add support for @PostMapping("/path") to pub/sub topic subscriptions (dapr#583)

* Remove duplicate dependency

* Transform into managed dependencies

* Remove old JUnit version from dependencies

* Add tests for DaprBeanPostProcessor

* Also register PostMappings that use value

* Modify existing pub/sub test to no use @PostMapping(path="...")

* Remove added dependencies on AssertJ, Spring Test and Servlet API

* Remove test in favour of the sdk-tests one

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>

* Run JUnit tests in all modules with java.base/java.util and java.base/java.lang opened to all modules

Co-authored-by: Artur Souza <artursouza.ms@outlook.com>
Co-authored-by: 浩 <inf2inf2@outlook.com>
Co-authored-by: Tom Cools <tom.cools@live.be>
Co-authored-by: Dapr Bot <56698301+dapr-bot@users.noreply.github.com>
Signed-off-by: zjx244729 <zjx244729@alibaba-inc.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Allow development with JDK 16 + add build with multiple JDK versions

4 participants