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

8263760: Update gradle to version 7.0.1 #49

Closed
wants to merge 3 commits into from

Conversation

@arapte
Copy link
Member

@arapte arapte commented Aug 20, 2021

There were two minor merge conflicts in build.gradle and one conflict in gradle/wrapper/gradle-wrapper.properties while cherry picking the change.
And it also required similar changes to be made for project fxpackager. The first commit is the original cherry pick and second commit is the additional changes for fxpackager.
Verified the build on all three platforms with gradle 7.0.1 and apache ant 1.10.5


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issues

  • JDK-8263760: Update gradle to version 7.0.1
  • JDK-8240336: JavaFX build uses deprecated features that will be removed in gradle 7
  • JDK-8262236: Configure Gradle checksum verification

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx11u pull/49/head:pull/49
$ git checkout pull/49

Update a local copy of the PR:
$ git checkout pull/49
$ git pull https://git.openjdk.java.net/jfx11u pull/49/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 49

View PR using the GUI difftool:
$ git pr show -t 49

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx11u/pull/49.diff

kevinrushforth and others added 2 commits Aug 20, 2021
8240336: JavaFX build uses deprecated features that will be removed in gradle 7

Reviewed-by: sykora, arapte
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 20, 2021

👋 Welcome back arapte! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 111bac4180a646662a81223bdbb56880789d5a90 8263760: Update gradle to version 7.0.1 Aug 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 20, 2021

This backport pull request has now been updated with issues from the original commit.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 20, 2021

Webrevs

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Aug 20, 2021

/reviewers 2

@openjdk
Copy link

@openjdk openjdk bot commented Aug 20, 2021

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks fine with a couple comments. I tested it with the older gradle 6.3 as well as 7.0.1.

build.gradle Outdated
@@ -2755,9 +2755,9 @@ project(":fxpackager") {
}

dependencies {
antpluginCompile group: "org.apache.ant", name: "ant", version: "1.8.2"
implementation group: "org.apache.ant", name: "ant", version: "1.8.2"
Copy link
Member

@kevinrushforth kevinrushforth Aug 21, 2021

Shouldn't this be antpluginImplementation? It may not matter as much, since we don't build fxpackager by default in FX 11, but I still think it should be fixed.

Copy link
Member Author

@arapte arapte Aug 22, 2021

This is corrected in next commit.

gradle/wrapper/gradle-wrapper.properties Show resolved Hide resolved
@arapte
Copy link
Member Author

@arapte arapte commented Aug 21, 2021

/issue add 8262236

@openjdk
Copy link

@openjdk openjdk bot commented Aug 21, 2021

@arapte
Adding additional issue to issue list: 8262236: Configure Gradle checksum verification.

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Aug 23, 2021

@johanvos can you also review this?

@johanvos
Copy link
Collaborator

@johanvos johanvos commented Aug 23, 2021

Already did, but forgot to look at the results. Looks good to me. We might remove the fxpackager part, but it doesn't hurt being there either.

@openjdk
Copy link

@openjdk openjdk bot commented Aug 23, 2021

@arapte This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8263760: Update gradle to version 7.0.1
8240336: JavaFX build uses deprecated features that will be removed in gradle 7
8262236: Configure Gradle checksum verification

Reviewed-by: kcr, jvos

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Aug 23, 2021
@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Aug 23, 2021

Thanks.

We might remove the fxpackager part, but it doesn't hurt being there either.

Since they aren't being built (and might no longer be buildable), we could consider backporting JDK-8203379 to jfx11u remove the sources in a future update release. As it is, these sources serve no purpose other than as a source of "technical debt".

@arapte
Copy link
Member Author

@arapte arapte commented Aug 23, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Aug 23, 2021

Going to push as commit 80c0670.

@openjdk openjdk bot closed this Aug 23, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 23, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 23, 2021

@arapte Pushed as commit 80c0670.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants