From 75feeb18c97b22a68d38a5cacc55d50dc98db71a Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Wed, 17 Aug 2022 14:40:52 -0600 Subject: [PATCH 1/5] Gradle repository maintenence Cleanup repository references and limit scope of non-mavenCentral repositories. Signed-off-by: Danno Ferrin --- build.gradle | 22 ++++++++++++++++++---- settings.gradle | 9 +++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 356a7290114..5f6ff15dce3 100644 --- a/build.gradle +++ b/build.gradle @@ -103,11 +103,25 @@ allprojects { targetCompatibility = 11 repositories { + maven { + url "https://hyperledger.jfrog.io/hyperledger/besu-maven" + content { + includeGroupByRegex("org\\.hyperledger\\..*") + } + } + maven { + url "https://artifacts.consensys.net/public/maven/maven/" + content { + includeGroupByRegex("tech\\.pegasys\\..*") + } + } + maven { + url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/" + content { + includeGroupByRegex("net\\.consensys\\..*") + } + } mavenCentral() - maven { url "https://hyperledger.jfrog.io/hyperledger/besu-maven" } - maven { url "https://artifacts.consensys.net/public/maven/maven/" } - maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" } - maven { url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/"} } dependencies { errorprone "com.google.errorprone:error_prone_core" } diff --git a/settings.gradle b/settings.gradle index 86346e03959..37563491e4f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,13 +16,18 @@ pluginManagement { repositories { - gradlePluginPortal() /* * Temporary repository to host the improved version of the * com.github.hierynomus.license plugin. Can be removed when an * official version with the fix is release upstream */ - maven { url = uri("https://raw.githubusercontent.com/ConsenSys/license-gradle-plugin-fix-artifacts/main/") } + maven { + url = uri("https://raw.githubusercontent.com/ConsenSys/license-gradle-plugin-fix-artifacts/main/") + content { + includeGroup('com.github.hierynomus.license') + } + } + gradlePluginPortal() } } From 8e03a3cdca1a09b1ee0db4aa5e1f2ee68b194715 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Wed, 17 Aug 2022 15:00:47 -0600 Subject: [PATCH 2/5] tweak plugin groups Signed-off-by: Danno Ferrin --- settings.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/settings.gradle b/settings.gradle index 37563491e4f..0379f40d727 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,6 +25,7 @@ pluginManagement { url = uri("https://raw.githubusercontent.com/ConsenSys/license-gradle-plugin-fix-artifacts/main/") content { includeGroup('com.github.hierynomus.license') + includeGroup('com.hierynomus.gradle.plugins') } } gradlePluginPortal() From 0930053346e5ce99fa66fb6dbababc2a24159474 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Wed, 17 Aug 2022 15:24:51 -0600 Subject: [PATCH 3/5] splunk and quotes Signed-off-by: Danno Ferrin --- build.gradle | 20 +++++++++++++------- settings.gradle | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 5f6ff15dce3..cf955aa1d34 100644 --- a/build.gradle +++ b/build.gradle @@ -104,27 +104,33 @@ allprojects { repositories { maven { - url "https://hyperledger.jfrog.io/hyperledger/besu-maven" + url 'https://hyperledger.jfrog.io/hyperledger/besu-maven' content { - includeGroupByRegex("org\\.hyperledger\\..*") + includeGroupByRegex('org\\.hyperledger\\..*') } } maven { - url "https://artifacts.consensys.net/public/maven/maven/" + url 'https://artifacts.consensys.net/public/maven/maven/' content { - includeGroupByRegex("tech\\.pegasys\\..*") + includeGroupByRegex('tech\\.pegasys\\..*') } } maven { - url "https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/" + url 'https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/' content { - includeGroupByRegex("net\\.consensys\\..*") + includeGroupByRegex('net\\.consensys\\..*') + } + } + maven { + url 'https://splunk.jfrog.io/splunk/ext-releases-local' + content { + includesGroupByRegex('com\\.splunk\\..*') } } mavenCentral() } - dependencies { errorprone "com.google.errorprone:error_prone_core" } + dependencies { errorprone 'com.google.errorprone:error_prone_core' } apply plugin: 'com.diffplug.spotless' spotless { diff --git a/settings.gradle b/settings.gradle index 0379f40d727..68ad95f90dd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,7 +22,7 @@ pluginManagement { * official version with the fix is release upstream */ maven { - url = uri("https://raw.githubusercontent.com/ConsenSys/license-gradle-plugin-fix-artifacts/main/") + url = uri('https://raw.githubusercontent.com/ConsenSys/license-gradle-plugin-fix-artifacts/main/') content { includeGroup('com.github.hierynomus.license') includeGroup('com.hierynomus.gradle.plugins') From 1df1ea4b3706761de00a7e4bc53df3022c716454 Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Wed, 17 Aug 2022 15:30:24 -0600 Subject: [PATCH 4/5] a letter Signed-off-by: Danno Ferrin --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cf955aa1d34..9856823182f 100644 --- a/build.gradle +++ b/build.gradle @@ -124,7 +124,7 @@ allprojects { maven { url 'https://splunk.jfrog.io/splunk/ext-releases-local' content { - includesGroupByRegex('com\\.splunk\\..*') + includeGroupByRegex('com\\.splunk\\..*') } } mavenCentral() From bc2811709c53008dd88d9ee581b38ccaaa3d754e Mon Sep 17 00:00:00 2001 From: Danno Ferrin Date: Wed, 17 Aug 2022 15:36:48 -0600 Subject: [PATCH 5/5] spotless Signed-off-by: Danno Ferrin --- build.gradle | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 9856823182f..a4e5651b89f 100644 --- a/build.gradle +++ b/build.gradle @@ -105,27 +105,19 @@ allprojects { repositories { maven { url 'https://hyperledger.jfrog.io/hyperledger/besu-maven' - content { - includeGroupByRegex('org\\.hyperledger\\..*') - } + content { includeGroupByRegex('org\\.hyperledger\\..*') } } maven { - url 'https://artifacts.consensys.net/public/maven/maven/' - content { - includeGroupByRegex('tech\\.pegasys\\..*') - } + url 'https://artifacts.consensys.net/public/maven/maven/' + content { includeGroupByRegex('tech\\.pegasys\\..*') } } maven { url 'https://dl.cloudsmith.io/public/consensys/quorum-mainnet-launcher/maven/' - content { - includeGroupByRegex('net\\.consensys\\..*') - } + content { includeGroupByRegex('net\\.consensys\\..*') } } maven { url 'https://splunk.jfrog.io/splunk/ext-releases-local' - content { - includeGroupByRegex('com\\.splunk\\..*') - } + content { includeGroupByRegex('com\\.splunk\\..*') } } mavenCentral() }