Skip to content

Commit

Permalink
fix(gradle): add dependency-verification to gradle commands (#25195)
Browse files Browse the repository at this point in the history 
Co-authored-by: Rhys Arkins <rhys@arkins.net>
  • Loading branch information
@lsrocha @rarkins
lsrocha and rarkins committed Oct 15, 2023
1 parent 880ce0b commit 805e727
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
46 changes: 23 additions & 23 deletions lib/modules/manager/gradle/artifacts.spec.ts
View file
Expand Up @@ -159,13 +159,13 @@ describe('modules/manager/gradle/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
cmd: './gradlew --console=plain -q properties',
cmd: './gradlew --console=plain --dependency-verification lenient -q properties',
options: {
cwd: '/tmp/github/some/repo',
},
},
{
cmd: './gradlew --console=plain -q :dependencies --update-locks org.junit.jupiter:junit-jupiter-api,org.junit.jupiter:junit-jupiter-engine',
cmd: './gradlew --console=plain --dependency-verification lenient -q :dependencies --update-locks org.junit.jupiter:junit-jupiter-api,org.junit.jupiter:junit-jupiter-engine',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down Expand Up @@ -202,13 +202,13 @@ describe('modules/manager/gradle/artifacts', () => {
// In win32, gradle.bat will be used and /dev/null redirection isn't used yet
expect(execSnapshots).toMatchObject([
{
cmd: 'gradlew.bat --console=plain -q properties',
cmd: 'gradlew.bat --console=plain --dependency-verification lenient -q properties',
options: {
cwd: '/tmp/github/some/repo',
},
},
{
cmd: 'gradlew.bat --console=plain -q :dependencies --update-locks org.junit.jupiter:junit-jupiter-api,org.junit.jupiter:junit-jupiter-engine',
cmd: 'gradlew.bat --console=plain --dependency-verification lenient -q :dependencies --update-locks org.junit.jupiter:junit-jupiter-api,org.junit.jupiter:junit-jupiter-engine',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down Expand Up @@ -245,13 +245,13 @@ describe('modules/manager/gradle/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
cmd: './gradlew --console=plain -q properties',
cmd: './gradlew --console=plain --dependency-verification lenient -q properties',
options: {
cwd: '/tmp/github/some/repo',
},
},
{
cmd: './gradlew --console=plain -q :dependencies --update-locks org.springframework.boot:org.springframework.boot.gradle.plugin',
cmd: './gradlew --console=plain --dependency-verification lenient -q :dependencies --update-locks org.springframework.boot:org.springframework.boot.gradle.plugin',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down Expand Up @@ -296,13 +296,13 @@ describe('modules/manager/gradle/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
cmd: './gradlew --console=plain -q properties',
cmd: './gradlew --console=plain --dependency-verification lenient -q properties',
options: {
cwd: '/tmp/github/some/repo',
},
},
{
cmd: './gradlew --console=plain -q :dependencies --write-locks',
cmd: './gradlew --console=plain --dependency-verification lenient -q :dependencies --write-locks',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down Expand Up @@ -346,7 +346,7 @@ describe('modules/manager/gradle/artifacts', () => {
' bash -l -c "' +
'install-tool java 16.0.1' +
' && ' +
'./gradlew --console=plain -q properties' +
'./gradlew --console=plain --dependency-verification lenient -q properties' +
'"',
options: { cwd: '/tmp/github/some/repo' },
},
Expand All @@ -363,7 +363,7 @@ describe('modules/manager/gradle/artifacts', () => {
' bash -l -c "' +
'install-tool java 16.0.1' +
' && ' +
'./gradlew --console=plain -q :dependencies --write-locks' +
'./gradlew --console=plain --dependency-verification lenient -q :dependencies --write-locks' +
'"',
options: {
cwd: '/tmp/github/some/repo',
Expand Down Expand Up @@ -396,12 +396,12 @@ describe('modules/manager/gradle/artifacts', () => {
expect(execSnapshots).toMatchObject([
{ cmd: 'install-tool java 16.0.1' },
{
cmd: './gradlew --console=plain -q properties',
cmd: './gradlew --console=plain --dependency-verification lenient -q properties',
options: { cwd: '/tmp/github/some/repo' },
},
{ cmd: 'install-tool java 16.0.1' },
{
cmd: './gradlew --console=plain -q :dependencies --write-locks',
cmd: './gradlew --console=plain --dependency-verification lenient -q :dependencies --write-locks',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down Expand Up @@ -437,13 +437,13 @@ describe('modules/manager/gradle/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
cmd: './gradlew --console=plain -q properties',
cmd: './gradlew --console=plain --dependency-verification lenient -q properties',
options: {
cwd: '/tmp/github/some/repo',
},
},
{
cmd: './gradlew --console=plain -q :dependencies :sub1:dependencies :sub2:dependencies --write-locks',
cmd: './gradlew --console=plain --dependency-verification lenient -q :dependencies :sub1:dependencies :sub2:dependencies --write-locks',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down Expand Up @@ -487,7 +487,7 @@ describe('modules/manager/gradle/artifacts', () => {

expect(execSnapshots).toMatchObject([
{
cmd: './gradlew --console=plain -q properties',
cmd: './gradlew --console=plain --dependency-verification lenient -q properties',
options: {
cwd: '/tmp/github/some/repo',
},
Expand Down Expand Up @@ -540,12 +540,12 @@ describe('modules/manager/gradle/artifacts', () => {
expect(execSnapshots).toMatchObject([
{ cmd: 'install-tool java 11.0.1' },
{
cmd: './gradlew --console=plain -q properties',
cmd: './gradlew --console=plain --dependency-verification lenient -q properties',
options: { cwd: '/tmp/github/some/repo' },
},
{ cmd: 'install-tool java 11.0.1' },
{
cmd: './gradlew --console=plain -q :dependencies --write-locks',
cmd: './gradlew --console=plain --dependency-verification lenient -q :dependencies --write-locks',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down Expand Up @@ -592,7 +592,7 @@ describe('modules/manager/gradle/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
cmd: './gradlew --console=plain -q --write-verification-metadata sha256 help',
cmd: './gradlew --console=plain --dependency-verification lenient -q --write-verification-metadata sha256 help',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down Expand Up @@ -649,20 +649,20 @@ describe('modules/manager/gradle/artifacts', () => {
]);
expect(execSnapshots).toMatchObject([
{
cmd: './gradlew --console=plain -q properties',
cmd: './gradlew --console=plain --dependency-verification lenient -q properties',
options: {
cwd: '/tmp/github/some/repo',
},
},
{
cmd: './gradlew --console=plain -q :dependencies --update-locks org.junit.jupiter:junit-jupiter-api,org.junit.jupiter:junit-jupiter-engine',
cmd: './gradlew --console=plain --dependency-verification lenient -q :dependencies --update-locks org.junit.jupiter:junit-jupiter-api,org.junit.jupiter:junit-jupiter-engine',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
},
},
{
cmd: './gradlew --console=plain -q --write-verification-metadata sha256 help',
cmd: './gradlew --console=plain --dependency-verification lenient -q --write-verification-metadata sha256 help',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down Expand Up @@ -705,7 +705,7 @@ describe('modules/manager/gradle/artifacts', () => {

expect(execSnapshots).toMatchObject([
{
cmd: './gradlew --console=plain -q --write-verification-metadata sha256 help',
cmd: './gradlew --console=plain --dependency-verification lenient -q --write-verification-metadata sha256 help',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down Expand Up @@ -747,7 +747,7 @@ describe('modules/manager/gradle/artifacts', () => {

expect(execSnapshots).toMatchObject([
{
cmd: './gradlew --console=plain -q --write-verification-metadata sha256,pgp help',
cmd: './gradlew --console=plain --dependency-verification lenient -q --write-verification-metadata sha256,pgp help',
options: {
cwd: '/tmp/github/some/repo',
stdio: ['pipe', 'ignore', 'pipe'],
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/gradle/artifacts.ts
View file
Expand Up @@ -177,7 +177,7 @@ export async function updateArtifacts({
const oldLockFileContentMap = await getFiles(lockFiles);
await prepareGradleCommand(gradlewFile);

const baseCmd = `${gradlewName} --console=plain -q`;
const baseCmd = `${gradlewName} --console=plain --dependency-verification lenient -q`;
const execOptions: ExecOptions = {
cwdFile: gradlewFile,
docker: {},
Expand Down

0 comments on commit 805e727

Please sign in to comment.