Dependency management refactor (#200)

* Remove centralised version control * Define dependency versions per app * Add missing countryCode * Define dependency versions per app
adyen-examples · Sep 12, 2024 · 040ce12 · 040ce12
1 parent e7add55
commit 040ce12
Show file tree

Hide file tree

Showing 18 changed files with 103 additions and 163 deletions.
diff --git 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
@@ -1,9 +1 @@
 rootProject.name = 'adyen-java-spring-online-payments-authorisation-adjustment'
-
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}
diff --git a/checkout-example-advanced/build.gradle b/checkout-example-advanced/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/checkout-example-advanced/settings.gradle b/checkout-example-advanced/settings.gradle
@@ -1,9 +1,2 @@
 rootProject.name = 'adyen-java-spring-online-payments-checkout-advanced'
 
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}
diff --git a/checkout-example-advanced/src/main/java/com/adyen/checkout/api/CheckoutResource.java b/checkout-example-advanced/src/main/java/com/adyen/checkout/api/CheckoutResource.java
@@ -84,7 +84,8 @@ public ResponseEntity<PaymentResponse> payments(@RequestHeader String host, @Req
         paymentRequest.setReturnUrl(request.getScheme() + "://" + host + "/api/handleShopperRedirect?orderRef=" + orderRef);
 
         paymentRequest.setAmount(amount);
-        // set lineItems required for some payment methods (ie Klarna)
+        // set countryCode and lineItems required for some payment methods (ie Klarna)
+        paymentRequest.setCountryCode("NL");
         paymentRequest.setLineItems(Arrays.asList(
             new LineItem().quantity(1L).amountIncludingTax(5000L).description("Sunglasses"),
             new LineItem().quantity(1L).amountIncludingTax(5000L).description("Headphones"))

diff --git a/checkout-example/build.gradle b/checkout-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'
 }
@@ -16,11 +16,15 @@ repositories {
 }
 
 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'
     }
 
 }

diff --git a/checkout-example/settings.gradle b/checkout-example/settings.gradle
@@ -1,9 +1 @@
 rootProject.name = 'adyen-java-spring-online-payments-checkout'
-
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}
diff --git a/giftcard-example/build.gradle b/giftcard-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/giftcard-example/settings.gradle b/giftcard-example/settings.gradle
@@ -1,9 +1,2 @@
 rootProject.name = 'adyen-java-spring-online-payments-giftcard'
 
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}
diff --git a/giving-example/build.gradle b/giving-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'
 }
@@ -16,12 +16,17 @@ repositories {
 }
 
 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 {

diff --git a/giving-example/settings.gradle b/giving-example/settings.gradle
@@ -1,9 +1,2 @@
 rootProject.name = 'giving-example'
 
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/in-person-payments-example/build.gradle b/in-person-payments-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/in-person-payments-example/settings.gradle b/in-person-payments-example/settings.gradle
@@ -1,9 +1,2 @@
 rootProject.name = 'adyen-java-spring-in-person-payments'
 
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}
diff --git a/paybylink-example/build.gradle b/paybylink-example/build.gradle
@@ -1,48 +1,34 @@
 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'
-
-    id "com.moowork.node" version "1.3.1"
 }
 
 group = 'com.adyen'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '17'
+
+sourceCompatibility = 17
+targetCompatibility = 17
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation libs.adyen.java
-    implementation libs.bundles.spring
-}
-
-tasks.named('test') {
-    useJUnitPlatform()
-}
+    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'
 
+    developmentOnly 'org.springframework.boot:spring-boot-devtools'
 
-tasks.register('myNpmInstall', Exec) {
-    workingDir 'src/main/js'
-    commandLine 'npm', 'install'
-}
-
-tasks.register('myNpmRun', Exec) {
-    workingDir 'src/main/js'
-    commandLine 'npm', 'run', 'dist'
-}
+    testImplementation('org.springframework.boot:spring-boot-starter-test') {
+        exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
+    }
 
-myNpmInstall {
-    dependsOn nodeSetup
 }
 
-myNpmRun {
-    dependsOn myNpmInstall
-}
-
-jar {
-    dependsOn myNpmRun
+test {
+    useJUnitPlatform()
 }
diff --git a/paybylink-example/settings.gradle b/paybylink-example/settings.gradle
@@ -1,9 +1 @@
 rootProject.name = 'paybylink-example'
-
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            from(files("../gradle/libs.versions.toml"))
-        }
-    }
-}