From e46069fd6e6563a5278ea7a9b3174202d9fa0570 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Wed, 19 Feb 2025 17:26:47 +0100 Subject: [PATCH] Added includeBuilds to settings.gradle based on contents of build.settings. --- apps/synt-sykemelding-api/settings.gradle | 1 + libs/commands/settings.gradle | 4 ++-- libs/integration-test/settings.gradle | 4 ++-- libs/kafka-producers/settings.gradle | 6 +++--- libs/reactive-frontend/settings.gradle | 4 ++-- libs/reactive-proxy/settings.gradle | 4 ++-- libs/reactive-security/settings.gradle | 4 ++-- libs/reactive-session-security/settings.gradle | 4 ++-- libs/servlet-insecure-security/settings.gradle | 4 ++-- libs/servlet-security/settings.gradle | 4 ++-- proxies/skjermingsregister-proxy/settings.gradle | 2 ++ proxies/sykemelding-proxy/settings.gradle | 2 ++ 12 files changed, 24 insertions(+), 19 deletions(-) diff --git a/apps/synt-sykemelding-api/settings.gradle b/apps/synt-sykemelding-api/settings.gradle index 99dbd417db..5181e1f0c8 100644 --- a/apps/synt-sykemelding-api/settings.gradle +++ b/apps/synt-sykemelding-api/settings.gradle @@ -9,6 +9,7 @@ includeBuild "../../plugins/java" includeBuild "../../libs/commands" includeBuild "../../libs/data-transfer-objects" includeBuild "../../libs/reactive-core" +includeBuild "../../libs/security-core" includeBuild "../../libs/servlet-core" includeBuild "../../libs/servlet-security" includeBuild "../../libs/testing" diff --git a/libs/commands/settings.gradle b/libs/commands/settings.gradle index 1824862f69..0bae20ab1a 100644 --- a/libs/commands/settings.gradle +++ b/libs/commands/settings.gradle @@ -2,11 +2,11 @@ plugins { id "com.gradle.develocity" version "3.19" } -rootProject.name = 'commands' +rootProject.name = "commands" includeBuild "../../plugins/java" -includeBuild '../data-transfer-objects' +includeBuild "../../libs/data-transfer-objects" develocity { buildScan { diff --git a/libs/integration-test/settings.gradle b/libs/integration-test/settings.gradle index a0ee65f03a..f5462f6a80 100644 --- a/libs/integration-test/settings.gradle +++ b/libs/integration-test/settings.gradle @@ -2,11 +2,11 @@ plugins { id "com.gradle.develocity" version "3.19" } -rootProject.name = 'integration-test' +rootProject.name = "integration-test" includeBuild "../../plugins/java" -includeBuild '../security-core' +includeBuild "../../libs/security-core" develocity { buildScan { diff --git a/libs/kafka-producers/settings.gradle b/libs/kafka-producers/settings.gradle index e9617299bc..140910486c 100644 --- a/libs/kafka-producers/settings.gradle +++ b/libs/kafka-producers/settings.gradle @@ -2,12 +2,12 @@ plugins { id "com.gradle.develocity" version "3.19" } -rootProject.name = 'kafka-producers' +rootProject.name = "kafka-producers" includeBuild "../../plugins/java" -includeBuild '../kafka-config' -includeBuild '../avro-schema' +includeBuild "../../libs/kafka-config" +includeBuild "../../libs/avro-schema" develocity { buildScan { diff --git a/libs/reactive-frontend/settings.gradle b/libs/reactive-frontend/settings.gradle index 31200e3455..2894d86288 100644 --- a/libs/reactive-frontend/settings.gradle +++ b/libs/reactive-frontend/settings.gradle @@ -2,11 +2,11 @@ plugins { id "com.gradle.develocity" version "3.19" } -rootProject.name = 'reactive-frontend' +rootProject.name = "reactive-frontend" includeBuild "../../plugins/java" -includeBuild '../security-core' +includeBuild "../../libs/security-core" develocity { buildScan { diff --git a/libs/reactive-proxy/settings.gradle b/libs/reactive-proxy/settings.gradle index 97e519a9be..e3184cef0c 100644 --- a/libs/reactive-proxy/settings.gradle +++ b/libs/reactive-proxy/settings.gradle @@ -2,11 +2,11 @@ plugins { id "com.gradle.develocity" version "3.19" } -rootProject.name = 'reactive-proxy' +rootProject.name = "reactive-proxy" includeBuild "../../plugins/java" -includeBuild '../reactive-security' +includeBuild "../../libs/reactive-security" develocity { buildScan { diff --git a/libs/reactive-security/settings.gradle b/libs/reactive-security/settings.gradle index 2f48adb191..4159227210 100644 --- a/libs/reactive-security/settings.gradle +++ b/libs/reactive-security/settings.gradle @@ -2,11 +2,11 @@ plugins { id "com.gradle.develocity" version "3.19" } -rootProject.name = 'reactive-security' +rootProject.name = "reactive-security" includeBuild "../../plugins/java" -includeBuild '../security-core' +includeBuild "../../libs/security-core" develocity { buildScan { diff --git a/libs/reactive-session-security/settings.gradle b/libs/reactive-session-security/settings.gradle index ea1d08f02f..7d396b347b 100644 --- a/libs/reactive-session-security/settings.gradle +++ b/libs/reactive-session-security/settings.gradle @@ -2,11 +2,11 @@ plugins { id "com.gradle.develocity" version "3.19" } -rootProject.name = 'reactive-session-security' +rootProject.name = "reactive-session-security" includeBuild "../../plugins/java" -includeBuild '../security-core' +includeBuild "../../libs/security-core" develocity { buildScan { diff --git a/libs/servlet-insecure-security/settings.gradle b/libs/servlet-insecure-security/settings.gradle index e16fc70b2e..a95deb2042 100644 --- a/libs/servlet-insecure-security/settings.gradle +++ b/libs/servlet-insecure-security/settings.gradle @@ -2,11 +2,11 @@ plugins { id "com.gradle.develocity" version "3.19" } -rootProject.name = 'servlet-insecure-security' +rootProject.name = "servlet-insecure-security" includeBuild "../../plugins/java" -includeBuild '../security-core' +includeBuild "../../libs/security-core" develocity { buildScan { diff --git a/libs/servlet-security/settings.gradle b/libs/servlet-security/settings.gradle index 9b49652004..83d1cd2b6c 100644 --- a/libs/servlet-security/settings.gradle +++ b/libs/servlet-security/settings.gradle @@ -2,11 +2,11 @@ plugins { id "com.gradle.develocity" version "3.19" } -rootProject.name = 'servlet-security' +rootProject.name = "servlet-security" includeBuild "../../plugins/java" -includeBuild '../security-core' +includeBuild "../../libs/security-core" develocity { buildScan { diff --git a/proxies/skjermingsregister-proxy/settings.gradle b/proxies/skjermingsregister-proxy/settings.gradle index 5d93671403..22dd31418b 100644 --- a/proxies/skjermingsregister-proxy/settings.gradle +++ b/proxies/skjermingsregister-proxy/settings.gradle @@ -9,6 +9,8 @@ includeBuild "../../plugins/java" includeBuild "../../libs/data-transfer-objects" includeBuild "../../libs/reactive-core" includeBuild "../../libs/reactive-proxy" +includeBuild "../../libs/reactive-security" +includeBuild "../../libs/security-core" includeBuild "../../libs/security-token-service" includeBuild "../../libs/testing" diff --git a/proxies/sykemelding-proxy/settings.gradle b/proxies/sykemelding-proxy/settings.gradle index 3d2128b21d..7279b78d06 100644 --- a/proxies/sykemelding-proxy/settings.gradle +++ b/proxies/sykemelding-proxy/settings.gradle @@ -9,6 +9,8 @@ includeBuild "../../plugins/java" includeBuild "../../libs/data-transfer-objects" includeBuild "../../libs/reactive-core" includeBuild "../../libs/reactive-proxy" +includeBuild "../../libs/reactive-security" +includeBuild "../../libs/security-core" includeBuild "../../libs/security-token-service" includeBuild "../../libs/testing"