From 1a786ededed07a5763e35c13425df7f95224c4e9 Mon Sep 17 00:00:00 2001
From: Beppe Catanese <gcatanese@yahoo.com>
Date: Thu, 12 Sep 2024 17:18:29 +0200
Subject: [PATCH] Define dependency versions per app

---
 authorisation-adjustment-example/build.gradle | 21 ++++++++++++-------
 .../settings.gradle                           |  8 -------
 subscription-example/build.gradle             | 21 ++++++++++++-------
 subscription-example/settings.gradle          |  8 -------
 4 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/authorisation-adjustment-example/build.gradle b/authorisation-adjustment-example/build.gradle
index 212a21bb..10c2d943 100644
--- a/authorisation-adjustment-example/build.gradle
+++ b/authorisation-adjustment-example/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    alias(libs.plugins.spring.framework)
-    alias(libs.plugins.spring.dependency)
+    id 'org.springframework.boot' version '3.1.4'
+    id 'io.spring.dependency-management' version '1.1.3'
 
     id 'java'
 }
@@ -12,18 +12,23 @@ sourceCompatibility = 17
 targetCompatibility = 17
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
-    implementation libs.adyen.java
-    implementation libs.bundles.spring
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
+    implementation 'com.adyen:adyen-java-api-library:23.0.1'
 
-    testImplementation(libs.bundles.spring.test){
-        exclude (group: 'org.junit.vintage', module: 'junit-vintage-engine')
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'
+
+    testImplementation('org.springframework.boot:spring-boot-starter-test') {
+        exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
     }
+
 }
 
 test {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
diff --git a/authorisation-adjustment-example/settings.gradle b/authorisation-adjustment-example/settings.gradle
index c796e85c..08b9ce7b 100644
--- a/authorisation-adjustment-example/settings.gradle
+++ b/authorisation-adjustment-example/settings.gradle
@@ -1,9 +1 @@
 rootProject.name = 'adyen-java-spring-online-payments-authorisation-adjustment'
-
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}
diff --git a/subscription-example/build.gradle b/subscription-example/build.gradle
index 212a21bb..10c2d943 100644
--- a/subscription-example/build.gradle
+++ b/subscription-example/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    alias(libs.plugins.spring.framework)
-    alias(libs.plugins.spring.dependency)
+    id 'org.springframework.boot' version '3.1.4'
+    id 'io.spring.dependency-management' version '1.1.3'
 
     id 'java'
 }
@@ -12,18 +12,23 @@ sourceCompatibility = 17
 targetCompatibility = 17
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
-    implementation libs.adyen.java
-    implementation libs.bundles.spring
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
+    implementation 'com.adyen:adyen-java-api-library:23.0.1'
 
-    testImplementation(libs.bundles.spring.test){
-        exclude (group: 'org.junit.vintage', module: 'junit-vintage-engine')
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'
+
+    testImplementation('org.springframework.boot:spring-boot-starter-test') {
+        exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
     }
+
 }
 
 test {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
diff --git a/subscription-example/settings.gradle b/subscription-example/settings.gradle
index 6a998e48..ab4d70d1 100644
--- a/subscription-example/settings.gradle
+++ b/subscription-example/settings.gradle
@@ -1,9 +1 @@
 rootProject.name = 'adyen-java-spring-online-payments-subscription'
-
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}