From d96232d7ff123ed0f7fd527d07f183b32ce09795 Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <mkammerer@vmware.com>
Date: Thu, 21 Jul 2022 16:28:40 +0200
Subject: [PATCH] Clean up gradle build scripts

---
 build.gradle    |  5 ++++-
 settings.gradle | 29 +++--------------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5ce2d1a9..30a230b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,8 @@
 plugins {
-	id "io.spring.javaformat" apply false
+	id "io.spring.javaformat" version "0.0.34" apply false
+	id "org.graalvm.buildtools.native" version "0.9.13" apply false
+	id "org.springframework.boot" version "3.0.0-SNAPSHOT" apply false
+	id "org.springframework.boot.aot" version "3.0.0-SNAPSHOT" apply false
 }
 
 subprojects {
diff --git a/settings.gradle b/settings.gradle
index b79b934e..2f1ed65c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,32 +2,6 @@ pluginManagement {
 	includeBuild "gradle-plugins/aot-smoke-test-plugin"
 	repositories {
 		gradlePluginPortal()
-		maven {
-			url "https://repo.spring.io/release"
-			content {
-				includeGroup "io.spring.ge.conventions"
-			}
-		}
-	}
-}
-
-// This is needed to prevent gradle from checking for newer versions of the Spring Boot
-// plugin on every build in every sub-project
-buildscript {
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:3.0.0-SNAPSHOT")
-		classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.34")
-		classpath("org.graalvm.buildtools:native-gradle-plugin:0.9.13")
-	}
-	configurations.classpath {
-		resolutionStrategy {
-			cacheDynamicVersionsFor 24, 'hours'
-			cacheChangingModulesFor 24, 'hours'
-		}
-	}
-	repositories {
-		gradlePluginPortal()
-		mavenCentral()
 		maven {
 			url "https://repo.spring.io/snapshot"
 		}
@@ -36,6 +10,9 @@ buildscript {
 		}
 		maven {
 			url "https://repo.spring.io/release"
+			content {
+				includeGroup "io.spring.ge.conventions"
+			}
 		}
 	}
 }