Merge pull request #17101 from glefloch/fix/failed-test

Update repository declaration order
quarkusio · May 10, 2021 · e410c8f · e410c8f
2 parents bdb2deb + 18ed9b3
commit e410c8f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/integration-tests/gradle/src/test/resources/bean-in-testsources-project/build.gradle b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/build.gradle
@@ -6,14 +6,14 @@ plugins {
 }
 
 repositories {
+    mavenCentral()
     if (System.properties.containsKey('maven.repo.local')) {
         maven {
             url System.properties.get('maven.repo.local')
         }
     } else {
         mavenLocal()
     }
-    mavenCentral()
 }
 
 dependencies {

diff --git a/integration-tests/gradle/src/test/resources/bean-in-testsources-project/settings.gradle b/integration-tests/gradle/src/test/resources/bean-in-testsources-project/settings.gradle
@@ -1,14 +1,14 @@
 pluginManagement {
     repositories {
+        mavenCentral()
+        gradlePluginPortal()
         if (System.properties.containsKey('maven.repo.local')) {
             maven {
                 url System.properties.get('maven.repo.local')
             }
         } else {
             mavenLocal()
         }
-        mavenCentral()
-        gradlePluginPortal()
     }
     plugins {
       id 'io.quarkus' version "${quarkusPluginVersion}"

diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/build.gradle b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/build.gradle
@@ -5,6 +5,7 @@ plugins {
 }
 
 repositories {
+    mavenCentral()
     // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
     if (System.properties.containsKey('maven.repo.local')) {
         maven {
@@ -13,7 +14,6 @@ repositories {
     } else {
         mavenLocal()
     }
-    mavenCentral()
 }
 
 dependencies {

diff --git a/integration-tests/gradle/src/test/resources/kotlin-grpc-project/settings.gradle b/integration-tests/gradle/src/test/resources/kotlin-grpc-project/settings.gradle
@@ -1,5 +1,7 @@
 pluginManagement {
     repositories {
+        mavenCentral()
+        gradlePluginPortal()
         // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
         if (System.properties.containsKey('maven.repo.local')) {
             maven {
@@ -8,8 +10,6 @@ pluginManagement {
         } else {
             mavenLocal()
         }
-        mavenCentral()
-        gradlePluginPortal()
     }
     plugins {
       id 'io.quarkus' version "${quarkusPluginVersion}"

diff --git a/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/build.gradle b/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/build.gradle
@@ -25,6 +25,7 @@ allprojects {
     }
 
     repositories {
+        mavenCentral()
         // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
         if (System.properties.containsKey('maven.repo.local')) {
             maven {
@@ -33,7 +34,6 @@ allprojects {
         } else {
             mavenLocal()
         }
-        mavenCentral()
     }
 
     dependencies {

diff --git a/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/settings.gradle b/integration-tests/gradle/src/test/resources/multi-module-kotlin-project/settings.gradle
@@ -1,5 +1,7 @@
 pluginManagement {
     repositories {
+        mavenCentral()
+        gradlePluginPortal()
         // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
         if (System.properties.containsKey('maven.repo.local')) {
             maven {
@@ -8,8 +10,6 @@ pluginManagement {
         } else {
             mavenLocal()
         }
-        mavenCentral()
-        gradlePluginPortal()
     }
     plugins {
       id 'io.quarkus' version "${quarkusPluginVersion}"

diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/build.gradle b/integration-tests/gradle/src/test/resources/multi-source-project/build.gradle
@@ -6,6 +6,7 @@ plugins {
 }
 
 repositories {
+    mavenCentral()
     // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
     if (System.properties.containsKey('maven.repo.local')) {
         maven {
@@ -14,7 +15,6 @@ repositories {
     } else {
         mavenLocal()
     }
-    mavenCentral()
 }
 
 dependencies {

diff --git a/integration-tests/gradle/src/test/resources/multi-source-project/settings.gradle b/integration-tests/gradle/src/test/resources/multi-source-project/settings.gradle
@@ -1,5 +1,7 @@
 pluginManagement {
     repositories {
+        mavenCentral()
+        gradlePluginPortal()
         // in case a custom local repo is configured we are going to use that instead of the default mavenLocal()
         if (System.properties.containsKey('maven.repo.local')) {
             maven {
@@ -8,8 +10,6 @@ pluginManagement {
         } else {
             mavenLocal()
         }
-        mavenCentral()
-        gradlePluginPortal()
     }
     plugins {
       id 'io.quarkus' version "${quarkusPluginVersion}"