You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/09/21 03:33:15 UTC

[groovy] 03/05: Configure all maven repos in dependencyResolutionManagement

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit cbd62855b14db3cf0fe70413aed43cc0a8babf46
Author: Goooler <wa...@gmail.com>
AuthorDate: Sat Sep 3 13:07:06 2022 +0800

    Configure all maven repos in dependencyResolutionManagement
---
 build-logic/src/main/groovy/org.apache.groovy-common.gradle      | 4 ----
 build-logic/src/main/groovy/org.apache.groovy-performance.gradle | 6 ------
 build.gradle                                                     | 5 -----
 settings.gradle                                                  | 8 ++++++++
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/build-logic/src/main/groovy/org.apache.groovy-common.gradle b/build-logic/src/main/groovy/org.apache.groovy-common.gradle
index 2db32283a2..d518274011 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-common.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-common.gradle
@@ -41,10 +41,6 @@ if (project == rootProject) {
 group = 'org.apache.groovy'
 version = sharedConfiguration.groovyVersion.get()
 
-repositories {
-    mavenCentral()
-}
-
 tasks.named('rat') {
     inputDir = projectDir
     excludes = ['subprojects/**', // covered above
diff --git a/build-logic/src/main/groovy/org.apache.groovy-performance.gradle b/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
index f868ff1375..271217b9a4 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-performance.gradle
@@ -34,12 +34,6 @@ configurations {
     testImplementation.extendsFrom(stats)
 }
 
-repositories {
-    mavenCentral()
-    maven{ url('https://repository.ow2.org/nexus/content/repositories/public/')}
-    mavenLocal()
-}
-
 dependencies {
     jmh project(":")
     testImplementation project(":")
diff --git a/build.gradle b/build.gradle
index 34657ca847..85643bd41c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,11 +35,6 @@ buildScanRecipes {
 
 archivesBaseName = 'groovy'
 
-repositories {
-    // todo Some repos are needed only for some configs. Declare them just for the configuration once Gradle allows this.
-    maven { url 'https://repository.jboss.org/nexus/content/groups/m2-release-proxy' } // tools
-}
-
 groovyLibrary {
     registerOptionalFeature 'gpars'
     registerOptionalFeature 'grapes'
diff --git a/settings.gradle b/settings.gradle
index d28757c6fb..76047b49bc 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -40,6 +40,14 @@ gradleEnterprise {
     }
 }
 
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        maven{ url('https://repository.ow2.org/nexus/content/repositories/public/')}
+        mavenLocal()
+    }
+}
+
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 def subprojects = [