Upgrade to Gradle 6.8.3 and various minor fixes #724
Merged
Conversation
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
- Upgrade Gradle wrapper from version 3.3 to version 6.8.3. Not possible to upgrade to version 7.0 due to incompatible plugin (see aim42/htmlSanityCheck#282 should be fixed in htmlSanityCheck plugin version 1.1.4). - Keep only Xalan as build script dependency. - Include plugins using the `plugins` block instead of `apply` approach. - Added `baseDirFollowsSourceFile()` to asciidoctor configuration to fix issue relate to `include` directive with the new plugin version. - Update `asciidoctorj` to latest version. - Bump plugins to latest versions. - Removed unused repository. - Fix links in `reference.adoc` to "Customize the service section" (was missing path to the HTML file). - Fix link (invalid character) in `ProActiveAdminGuide.adoc`. - Fix links (avoid HTTP -> HTTPS redirection) and update URL for PyTorch torchvision documentation in `PMLUserGuide.adoc`. - Use `maven-publish` plugin instead of `maven` (can probably be removed). - IMPORTANT: replaced in `PMLUserGuide.adoc` https://s3.eu-west-2.amazonaws.com/activeeon-public/datasets/pascal_coco.zip by https://s3.eu-west-2.amazonaws.com/activeeon-public/datasets/ as `pascal_coco.zip` seems to be missing.
|
Can one of the admins verify this patch? |
|
Retest this please |
|
@amottier unfortunately, the change has been applied on the master by another developper, can you fix the conflict ? |
@mboussaa I fix the link as requested but it seems it was also already update as part of bb780cb |
|
@amottier yes, a lack of communication in our team, sorry for the inconvenience ! |
Fix the link to download COCO dataset.
amottier
force-pushed
the
update-gradle-6.8
branch
from
411ce71
to
2fd16f4
Compare
No worries and on my side I didn't properly fix the link on my first commit so I just amend it. |
|
Retest this please |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an attempt to update to more recent version of Gradle to be able to use Java 11 to run Gradle.
pluginsblock instead ofapplyapproach.baseDirFollowsSourceFile()to asciidoctor configuration to fix issue relate toincludedirective with the new plugin version.asciidoctorjto latest version.reference.adocto "Customize the service section" (was missing path to the HTML file).ProActiveAdminGuide.adoc.PMLUserGuide.adoc.maven-publishplugin instead ofmaven(can probably be removed).PMLUserGuide.adochttps://s3.eu-west-2.amazonaws.com/activeeon-public/datasets/pascal_coco.zip by https://s3.eu-west-2.amazonaws.com/activeeon-public/datasets/ aspascal_coco.zipseems to be missing.