Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade Gradle to 7.5, workaround nohttp, update gradle action (#3127)
- Upgrade to Gradle 7.5 (including binaries) - Adapt `nohttp` configuration: add an explicit `checkstyle.xml` that doesn't use `nohttp.checkstyle.allowlistFileName` property but rather `config_loc`. The previous one is set to a relative folder which doesn't work anymore since 7.5 checkstyle now runs on a Gradle Worker. - Upgrade gradle-build-action to v2.2.2 (sha `cd3cedc`) This supersedes and closes #3118. This supersedes and closes #3126.
- Loading branch information
1 parent
d694966
commit 394c3ae
Showing
7 changed files
with
81 additions
and
14 deletions.
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
<?xml version="1.0"?> | ||
<!-- | ||
~ Copyright (c) 2022 VMware Inc. or its affiliates, All Rights Reserved. | ||
~ | ||
~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
~ 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 | ||
~ | ||
~ Unless required by applicable law or agreed to in writing, software | ||
~ distributed under the License is distributed on an "AS IS" BASIS, | ||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
~ See the License for the specific language governing permissions and | ||
~ limitations under the License. | ||
--> | ||
|
||
<!-- | ||
~ Copyright 2002-2019 the original author or authors. | ||
~ | ||
~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
~ 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 | ||
~ | ||
~ Unless required by applicable law or agreed to in writing, software | ||
~ distributed under the License is distributed on an "AS IS" BASIS, | ||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
~ See the License for the specific language governing permissions and | ||
~ limitations under the License. | ||
--> | ||
|
||
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" | ||
"https://www.puppycrawl.com/dtds/configuration_1_3.dtd"> | ||
<module name="Checker"> | ||
|
||
<!-- Configure checker to use UTF-8 encoding --> | ||
<property name="charset" value="UTF-8"/> | ||
<!-- Configure checker to run on files with these extensions --> | ||
<property name="fileExtensions" value=""/> | ||
|
||
<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck"> | ||
<!-- WORKAROUND FOR https://github.com/spring-io/nohttp/issues/55 --> | ||
<property name="allowlistFileName" value="${config_loc}/allowlist.lines" default=""/> | ||
</module> | ||
|
||
<module name="SuppressionFilter"> | ||
<property name="file" value="${config_loc}/suppressions.xml" default=""/> | ||
<property name="optional" value="true"/> | ||
</module> | ||
|
||
<!-- Allow suppression with comments | ||
// CHECKSTYLE:OFF | ||
... ignored content ... | ||
// CHECKSTYLE:ON | ||
--> | ||
<module name="SuppressWithPlainTextCommentFilter"/> | ||
</module> |
Binary file not shown.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
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
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