From d10b2f7df2d49821472ec30866caf6e7a975e64d Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Wed, 6 Dec 2023 17:58:42 +0200 Subject: [PATCH] RED-7404 - Exclude bootjar --- .../build.gradle.kts | 11 +++++- .../build.gradle.kts | 36 +++++++++++++++++++ .../build.gradle.kts | 9 +++++ .../build.gradle.kts | 9 +++++ .../build.gradle.kts | 9 +++++ .../build.gradle.kts | 9 +++++ .../build.gradle.kts | 9 +++++ .../build.gradle.kts | 9 +++++ 8 files changed, 100 insertions(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/build.gradle.kts b/persistence-service-v1/persistence-service-external-api-impl-v1/build.gradle.kts index 5f1da0a40..bd28ab91c 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/build.gradle.kts @@ -1,4 +1,5 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage +import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("com.iqser.red.service.java-conventions") @@ -14,6 +15,14 @@ dependencies { description = "persistence-service-external-api-impl-v1" +tasks.getByName("bootJar") { + enabled = false +} + +tasks.getByName("jar") { + enabled = true +} + tasks.named("bootBuildImage") { environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ") @@ -36,4 +45,4 @@ tasks.named("bootBuildImage") { url.set("https://nexus.knecon.com:5001/") } } -} \ No newline at end of file +} diff --git a/persistence-service-v1/persistence-service-external-api-impl-v2/build.gradle.kts b/persistence-service-v1/persistence-service-external-api-impl-v2/build.gradle.kts index 88086af39..f4cdbc956 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v2/build.gradle.kts +++ b/persistence-service-v1/persistence-service-external-api-impl-v2/build.gradle.kts @@ -1,6 +1,10 @@ +import org.springframework.boot.gradle.tasks.bundling.BootBuildImage +import org.springframework.boot.gradle.tasks.bundling.BootJar + plugins { id("com.iqser.red.service.java-conventions") id("io.freefair.lombok") version "8.4" + id("org.springframework.boot") version "3.1.3" } dependencies { @@ -10,3 +14,35 @@ dependencies { } description = "persistence-service-external-api-impl-v2" + +tasks.getByName("bootJar") { + enabled = false +} + +tasks.getByName("jar") { + enabled = true +} + +tasks.named("bootBuildImage") { + + environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ") + environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8") + + imageName.set("nexus.knecon.com:5001/red/${project.name}:${project.version}") + if (project.hasProperty("buildbootDockerHostNetwork")) { + network.set("host") + } + docker { + if (project.hasProperty("buildbootDockerHostNetwork")) { + bindHostToBuilder.set(true) + } + verboseLogging.set(true) + + publishRegistry { + username.set(providers.gradleProperty("mavenUser").getOrNull()) + password.set(providers.gradleProperty("mavenPassword").getOrNull()) + email.set(providers.gradleProperty("mavenEmail").getOrNull()) + url.set("https://nexus.knecon.com:5001/") + } + } +} \ No newline at end of file diff --git a/persistence-service-v1/persistence-service-external-api-v1/build.gradle.kts b/persistence-service-v1/persistence-service-external-api-v1/build.gradle.kts index 2f2cfe221..2521e5d8b 100644 --- a/persistence-service-v1/persistence-service-external-api-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-external-api-v1/build.gradle.kts @@ -1,4 +1,5 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage +import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("com.iqser.red.service.java-conventions") @@ -26,6 +27,14 @@ dependencies { description = "persistence-service-external-api-v1" +tasks.getByName("bootJar") { + enabled = false +} + +tasks.getByName("jar") { + enabled = true +} + tasks.named("bootBuildImage") { environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ") diff --git a/persistence-service-v1/persistence-service-external-api-v2/build.gradle.kts b/persistence-service-v1/persistence-service-external-api-v2/build.gradle.kts index 0ee6b14bb..53893f631 100644 --- a/persistence-service-v1/persistence-service-external-api-v2/build.gradle.kts +++ b/persistence-service-v1/persistence-service-external-api-v2/build.gradle.kts @@ -1,4 +1,5 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage +import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("com.iqser.red.service.java-conventions") @@ -28,6 +29,14 @@ dependencies { description = "persistence-service-external-api-v2" +tasks.getByName("bootJar") { + enabled = false +} + +tasks.getByName("jar") { + enabled = true +} + tasks.named("bootBuildImage") { environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ") diff --git a/persistence-service-v1/persistence-service-internal-api-impl-v1/build.gradle.kts b/persistence-service-v1/persistence-service-internal-api-impl-v1/build.gradle.kts index 637e44271..0b791537c 100644 --- a/persistence-service-v1/persistence-service-internal-api-impl-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-internal-api-impl-v1/build.gradle.kts @@ -1,4 +1,5 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage +import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("com.iqser.red.service.java-conventions") @@ -13,6 +14,14 @@ dependencies { description = "persistence-service-internal-api-impl-v1" +tasks.getByName("bootJar") { + enabled = false +} + +tasks.getByName("jar") { + enabled = true +} + tasks.named("bootBuildImage") { environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ") diff --git a/persistence-service-v1/persistence-service-internal-api-v1/build.gradle.kts b/persistence-service-v1/persistence-service-internal-api-v1/build.gradle.kts index 8eb7bd064..ea8554613 100644 --- a/persistence-service-v1/persistence-service-internal-api-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-internal-api-v1/build.gradle.kts @@ -1,4 +1,5 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage +import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("com.iqser.red.service.java-conventions") @@ -16,6 +17,14 @@ dependencies { description = "persistence-service-internal-api-v1" +tasks.getByName("bootJar") { + enabled = false +} + +tasks.getByName("jar") { + enabled = true +} + tasks.named("bootBuildImage") { environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ") diff --git a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts index 110974ec9..73dea65d8 100644 --- a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts @@ -1,4 +1,5 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage +import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("com.iqser.red.service.java-conventions") @@ -50,6 +51,14 @@ dependencies { description = "persistence-service-processor-v1" +tasks.getByName("bootJar") { + enabled = false +} + +tasks.getByName("jar") { + enabled = true +} + tasks.named("bootBuildImage") { environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ") diff --git a/persistence-service-v1/persistence-service-shared-api-v1/build.gradle.kts b/persistence-service-v1/persistence-service-shared-api-v1/build.gradle.kts index 86fe5dff0..154a775f4 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-shared-api-v1/build.gradle.kts @@ -1,4 +1,5 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage +import org.springframework.boot.gradle.tasks.bundling.BootJar plugins { id("com.iqser.red.service.java-conventions") @@ -21,6 +22,14 @@ dependencies { description = "persistence-service-shared-api-v1" +tasks.getByName("bootJar") { + enabled = false +} + +tasks.getByName("jar") { + enabled = true +} + tasks.named("bootBuildImage") { environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")