From 4cd89ba793f6d33602fc71da6c587e7f0bb874d6 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Tue, 23 Jul 2024 16:45:22 +0200 Subject: [PATCH 01/16] feat: log available memory at startup --- src/main/java/fr/insee/pogues/Pogues.java | 9 ++++++ .../configuration/PropertiesLogger.java | 29 +++++++++++++------ .../db/changelog/100_index_pogues.xml | 4 +-- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/main/java/fr/insee/pogues/Pogues.java b/src/main/java/fr/insee/pogues/Pogues.java index 543ef03f..39e97a88 100644 --- a/src/main/java/fr/insee/pogues/Pogues.java +++ b/src/main/java/fr/insee/pogues/Pogues.java @@ -1,15 +1,19 @@ package fr.insee.pogues; +import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.context.event.EventListener; import org.springframework.transaction.annotation.EnableTransactionManagement; @SpringBootApplication(scanBasePackages = "fr.insee.pogues") @EnableTransactionManagement @ConfigurationPropertiesScan +@Slf4j public class Pogues extends SpringBootServletInitializer { @Override @@ -20,4 +24,9 @@ protected SpringApplicationBuilder configure(SpringApplicationBuilder applicatio public static void main(String[] args) { SpringApplication.run(Pogues.class, args); } + + @EventListener + public void handleApplicationReady(ApplicationReadyEvent event) { + log.info("=============== Pogues Back-Office has successfully started. ==============="); + } } diff --git a/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java b/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java index dd7afada..b750cdbb 100644 --- a/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java +++ b/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java @@ -1,12 +1,12 @@ package fr.insee.pogues.configuration; -import lombok.NonNull; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; -import org.springframework.context.ApplicationListener; +import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.context.event.EventListener; import org.springframework.core.env.AbstractEnvironment; import org.springframework.core.env.EnumerablePropertySource; import org.springframework.core.env.Environment; +import org.springframework.stereotype.Component; import java.util.Arrays; import java.util.Objects; @@ -18,15 +18,28 @@ * Display props in logs * */ +@Component @Slf4j -public class PropertiesLogger implements ApplicationListener { +public class PropertiesLogger { private static final Set hiddenWords = Set.of("password", "pwd", "jeton", "token", "secret"); - @Override - public void onApplicationEvent(@NonNull ApplicationEnvironmentPreparedEvent event) { - Environment environment = event.getEnvironment(); + @EventListener + public void handleContextRefreshed(ContextRefreshedEvent event) { + log.info("==============================================================================================="); + log.info(" Java memory "); + log.info("==============================================================================================="); + Runtime runtime = Runtime.getRuntime(); + final long maxMemory = runtime.maxMemory(); + final long allocatedMemory = runtime.totalMemory(); + final long freeMemory = runtime.freeMemory(); + final long mb = 1024 * 1024; + log.info("Free memory: {} MB", (freeMemory / mb)); + log.info("Allocated memory: {} MB", (allocatedMemory / mb)); + log.info("Max memory: {} MB", (maxMemory / mb)); + log.info("Total free memory: {} MB",((freeMemory + (maxMemory - allocatedMemory)) / mb)); + Environment environment = event.getApplicationContext().getEnvironment(); log.info("==============================================================================================="); log.info(" Properties "); log.info("==============================================================================================="); @@ -45,7 +58,6 @@ public void onApplicationEvent(@NonNull ApplicationEnvironmentPreparedEvent even .filter(Objects::nonNull) .forEach(key -> log.info(key + " = " + resolveValueWithSecretAttribute(key, environment))); log.info("============================================================================"); - } private static Object resolveValueWithSecretAttribute(String key, Environment environment) { @@ -55,5 +67,4 @@ private static Object resolveValueWithSecretAttribute(String key, Environment en return environment.getProperty(key); } - } diff --git a/src/main/resources/db/changelog/100_index_pogues.xml b/src/main/resources/db/changelog/100_index_pogues.xml index 982adec7..be71f3a5 100644 --- a/src/main/resources/db/changelog/100_index_pogues.xml +++ b/src/main/resources/db/changelog/100_index_pogues.xml @@ -6,12 +6,12 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - CREATE INDEX idx_pogues_owner ON pogues ((data ->> 'owner')); + CREATE INDEX IF NOT EXISTS idx_pogues_owner ON pogues ((data ->> 'owner')); - CREATE INDEX idx_pogues_multi_owner ON pogues ((data ->> 'owner'), (data -> 'Name'), (data -> 'TargetMode'), (data -> 'flowLogic'), (data -> 'formulasLanguage')); + CREATE INDEX IF NOT EXISTS idx_pogues_multi_owner ON pogues ((data ->> 'owner'), (data -> 'Name'), (data -> 'TargetMode'), (data -> 'flowLogic'), (data -> 'formulasLanguage')); From ec15a58288bfd68959d4d803cc96bd159f639784 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Tue, 23 Jul 2024 16:46:19 +0200 Subject: [PATCH 02/16] build: bump version to 4.7.6-SNAPSHOT.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e8d724b1..b8f45046 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ fr.insee Pogues-BO jar - 4.7.5 + 4.7.6-SNAPSHOT.1 Pogues-Back-Office From 3351c868a1aa6606f540fc0dfe1ede68efc60ed5 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 10:25:11 +0200 Subject: [PATCH 03/16] fix: liquibase (DO NOT change existing changeset) --- src/main/resources/db/changelog/100_index_pogues.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/db/changelog/100_index_pogues.xml b/src/main/resources/db/changelog/100_index_pogues.xml index be71f3a5..8c8a58f2 100644 --- a/src/main/resources/db/changelog/100_index_pogues.xml +++ b/src/main/resources/db/changelog/100_index_pogues.xml @@ -6,12 +6,12 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - CREATE INDEX IF NOT EXISTS idx_pogues_owner ON pogues ((data ->> 'owner')); + CREATE INDEX idx_pogues_owner ON pogues ((data ->> 'owner')); - + - CREATE INDEX IF NOT EXISTS idx_pogues_multi_owner ON pogues ((data ->> 'owner'), (data -> 'Name'), (data -> 'TargetMode'), (data -> 'flowLogic'), (data -> 'formulasLanguage')); + CREATE INDEX idx_pogues_multi_owner ON pogues ((data ->> 'owner'), (data -> 'Name'), (data -> 'TargetMode'), (data -> 'flowLogic'), (data -> 'formulasLanguage')); From 800c1beafa1cb7cee763a947cbc9f1c7264735c0 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 10:32:46 +0200 Subject: [PATCH 04/16] fix: logging properties at startup --- src/main/java/fr/insee/pogues/Pogues.java | 9 ++-- .../configuration/PropertiesLogger.java | 53 ++++++++++++------- .../db/changelog/100_index_pogues.xml | 8 +-- 3 files changed, 44 insertions(+), 26 deletions(-) diff --git a/src/main/java/fr/insee/pogues/Pogues.java b/src/main/java/fr/insee/pogues/Pogues.java index 39e97a88..80f20a2b 100644 --- a/src/main/java/fr/insee/pogues/Pogues.java +++ b/src/main/java/fr/insee/pogues/Pogues.java @@ -1,6 +1,8 @@ package fr.insee.pogues; +import fr.insee.pogues.configuration.PropertiesLogger; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -16,13 +18,12 @@ @Slf4j public class Pogues extends SpringBootServletInitializer { - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(Pogues.class); + public static SpringApplicationBuilder configureApplicationBuilder(SpringApplicationBuilder springApplicationBuilder){ + return springApplicationBuilder.sources(Pogues.class).listeners(new PropertiesLogger()); } public static void main(String[] args) { - SpringApplication.run(Pogues.class, args); + configureApplicationBuilder(new SpringApplicationBuilder()).build().run(args); } @EventListener diff --git a/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java b/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java index b750cdbb..633825bf 100644 --- a/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java +++ b/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java @@ -1,7 +1,13 @@ package fr.insee.pogues.configuration; import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; +import org.springframework.boot.context.event.ApplicationPreparedEvent; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.boot.context.event.ApplicationStartingEvent; +import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.context.event.ContextStartedEvent; import org.springframework.context.event.EventListener; import org.springframework.core.env.AbstractEnvironment; import org.springframework.core.env.EnumerablePropertySource; @@ -18,31 +24,41 @@ * Display props in logs * */ -@Component @Slf4j -public class PropertiesLogger { +public class PropertiesLogger implements ApplicationListener { private static final Set hiddenWords = Set.of("password", "pwd", "jeton", "token", "secret"); @EventListener - public void handleContextRefreshed(ContextRefreshedEvent event) { - log.info("==============================================================================================="); - log.info(" Java memory "); - log.info("==============================================================================================="); + public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) { + log.info(" Logging environment variables started "); + log.info("============================================================================"); + log.info(" Java memory "); + log.info("============================================================================"); Runtime runtime = Runtime.getRuntime(); - final long maxMemory = runtime.maxMemory(); - final long allocatedMemory = runtime.totalMemory(); - final long freeMemory = runtime.freeMemory(); final long mb = 1024 * 1024; - log.info("Free memory: {} MB", (freeMemory / mb)); - log.info("Allocated memory: {} MB", (allocatedMemory / mb)); - log.info("Max memory: {} MB", (maxMemory / mb)); - log.info("Total free memory: {} MB",((freeMemory + (maxMemory - allocatedMemory)) / mb)); - - Environment environment = event.getApplicationContext().getEnvironment(); - log.info("==============================================================================================="); - log.info(" Properties "); - log.info("==============================================================================================="); + final long maxMemoryInMb = runtime.maxMemory() / mb; + final long allocatedMemoryInMb = runtime.totalMemory() / mb; + final long freeMemoryInMb = runtime.freeMemory() / mb; + int maxStrLength = String.valueOf(maxMemoryInMb).length(); + log.info("+--------------------------------+-----{}+", "-".repeat(maxStrLength)); + log.info("| Type of memory | Size{}|", " ".repeat(maxStrLength)); + log.info("|--------------------------------|-----{}|", "-".repeat(maxStrLength)); + log.info("| Current Free memory | {}{} MB |", + " ".repeat(maxStrLength-String.valueOf(freeMemoryInMb).length()), + freeMemoryInMb); + log.info("| Current Allocated memory | {}{} MB |", + " ".repeat(maxStrLength-String.valueOf(allocatedMemoryInMb).length()), + allocatedMemoryInMb); + log.info("| Current total Free memory | {}{} MB |", + " ".repeat(maxStrLength-String.valueOf(freeMemoryInMb + (maxMemoryInMb - allocatedMemoryInMb)).length()), + freeMemoryInMb + (maxMemoryInMb - allocatedMemoryInMb)); + log.info("| Max available memory for JVM | {} MB |", maxMemoryInMb); + log.info("+--------------------------------+-----{}+", "-".repeat(maxStrLength)); + log.info("============================================================================"); + log.info(" Properties "); + log.info("============================================================================"); + Environment environment = event.getEnvironment(); ((AbstractEnvironment) environment).getPropertySources().stream() .map(propertySource -> { @@ -58,6 +74,7 @@ public void handleContextRefreshed(ContextRefreshedEvent event) { .filter(Objects::nonNull) .forEach(key -> log.info(key + " = " + resolveValueWithSecretAttribute(key, environment))); log.info("============================================================================"); + log.info(" Logging environment variables ended "); } private static Object resolveValueWithSecretAttribute(String key, Environment environment) { diff --git a/src/main/resources/db/changelog/100_index_pogues.xml b/src/main/resources/db/changelog/100_index_pogues.xml index 8c8a58f2..9d016dcb 100644 --- a/src/main/resources/db/changelog/100_index_pogues.xml +++ b/src/main/resources/db/changelog/100_index_pogues.xml @@ -4,14 +4,14 @@ xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + - CREATE INDEX idx_pogues_owner ON pogues ((data ->> 'owner')); + CREATE INDEX IF NOT EXISTS idx_pogues_owner ON pogues ((data ->> 'owner')); - + - CREATE INDEX idx_pogues_multi_owner ON pogues ((data ->> 'owner'), (data -> 'Name'), (data -> 'TargetMode'), (data -> 'flowLogic'), (data -> 'formulasLanguage')); + CREATE INDEX IF NOT EXISTS idx_pogues_multi_owner ON pogues ((data ->> 'owner'), (data -> 'Name'), (data -> 'TargetMode'), (data -> 'flowLogic'), (data -> 'formulasLanguage')); From 6a56c72b85c24cbc0780917d2926b9f8f172f232 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 10:48:05 +0200 Subject: [PATCH 05/16] chore: log cpu avalaible --- .../fr/insee/pogues/configuration/PropertiesLogger.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java b/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java index 633825bf..ad30c175 100644 --- a/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java +++ b/src/main/java/fr/insee/pogues/configuration/PropertiesLogger.java @@ -31,10 +31,11 @@ public class PropertiesLogger implements ApplicationListener Java memory"); Runtime runtime = Runtime.getRuntime(); final long mb = 1024 * 1024; final long maxMemoryInMb = runtime.maxMemory() / mb; @@ -55,8 +56,10 @@ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) { freeMemoryInMb + (maxMemoryInMb - allocatedMemoryInMb)); log.info("| Max available memory for JVM | {} MB |", maxMemoryInMb); log.info("+--------------------------------+-----{}+", "-".repeat(maxStrLength)); + log.info(" ----> CPU"); + log.info(" Available CPUs : {}", runtime.availableProcessors()); log.info("============================================================================"); - log.info(" Properties "); + log.info(" Properties"); log.info("============================================================================"); Environment environment = event.getEnvironment(); From aa5ac1703c402184b5a074391607d6dcfdfcd5e5 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 10:48:19 +0200 Subject: [PATCH 06/16] build: add JAVA_TOOL_OPTIONS var --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8ed08d18..2ee2a55e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,9 @@ FROM eclipse-temurin:21.0.3_9-jre WORKDIR application RUN rm -rf /application ADD ./target/pogues-bo.jar /application/pogues-bo.jar + + +ENV JAVA_TOOL_OPTIONS \ + -XX:MaxRAMPercentage=${JVM_MAX_RAM_PERCENTAGE:-75.0} + ENTRYPOINT ["java", "-jar", "/application/pogues-bo.jar"] From ae5a9b48f8ffc033ed24f0c4b8985cd0eb3dde14 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 10:49:10 +0200 Subject: [PATCH 07/16] build: bump version to 4.7.6-SNAPSHOT.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8f45046..d1e7269d 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ fr.insee Pogues-BO jar - 4.7.6-SNAPSHOT.1 + 4.7.6-SNAPSHOT.2 Pogues-Back-Office From 2f3d1dfc222330eede6bec673aaf796bfaacbc1d Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 15:32:33 +0200 Subject: [PATCH 08/16] build: can overload JAVA_TOOLS_OPTIONS (while keeping default value) --- Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ee2a55e..47d66272 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,14 @@ FROM eclipse-temurin:21.0.3_9-jre + +ENV PATH_TO_JAR=/application/pogues-bo.jar WORKDIR application RUN rm -rf /application -ADD ./target/pogues-bo.jar /application/pogues-bo.jar - +ADD ./target/pogues-bo.jar $PATH_TO_JAR -ENV JAVA_TOOL_OPTIONS \ - -XX:MaxRAMPercentage=${JVM_MAX_RAM_PERCENTAGE:-75.0} +ENV JAVA_TOOL_OPTIONS_DEFAULT \ + -XX:MaxRAMPercentage=75 \ + -XX:+UseParallelGC -ENTRYPOINT ["java", "-jar", "/application/pogues-bo.jar"] +ENTRYPOINT [ "/bin/sh", "-c", \ + "JAVA_TOOL_OPTIONS=\"$JAVA_TOOL_OPTIONS_DEFAULT $JAVA_TOOL_OPTIONS\"; \ + exec java -jar $PATH_TO_JAR" ] From 010066a095adad074916a4fdedb0a1fc448154fb Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 15:36:33 +0200 Subject: [PATCH 09/16] build: bump version to 4.7.6-SNAPSHOT.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1e7269d..8dade102 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ fr.insee Pogues-BO jar - 4.7.6-SNAPSHOT.2 + 4.7.6-SNAPSHOT.3 Pogues-Back-Office From 11eacca00f67be593c82d8eaa57f0c975c47dc23 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 15:57:13 +0200 Subject: [PATCH 10/16] build: fix JVM TOOLS --- Dockerfile | 3 ++- pom.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47d66272..0715a412 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,5 +10,6 @@ ENV JAVA_TOOL_OPTIONS_DEFAULT \ -XX:+UseParallelGC ENTRYPOINT [ "/bin/sh", "-c", \ - "JAVA_TOOL_OPTIONS=\"$JAVA_TOOL_OPTIONS_DEFAULT $JAVA_TOOL_OPTIONS\"; \ + "export JAVA_TOOL_OPTIONS=\"$JAVA_TOOL_OPTIONS_DEFAULT $JAVA_TOOL_OPTIONS\"; \ + echo \"Jvm OPTS $JAVA_TOOL_OPTIONS\"; \ exec java -jar $PATH_TO_JAR" ] diff --git a/pom.xml b/pom.xml index 8dade102..fa499927 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ fr.insee Pogues-BO jar - 4.7.6-SNAPSHOT.3 + 4.7.6-SNAPSHOT.4 Pogues-Back-Office From ee6b57a998740ab4d1e034e64097df2cb15b6aa8 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 16:23:04 +0200 Subject: [PATCH 11/16] build: upgrade base image --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0715a412..2470f430 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:21.0.3_9-jre +FROM eclipse-temurin:21.0.4_7-jre ENV PATH_TO_JAR=/application/pogues-bo.jar WORKDIR application @@ -11,5 +11,4 @@ ENV JAVA_TOOL_OPTIONS_DEFAULT \ ENTRYPOINT [ "/bin/sh", "-c", \ "export JAVA_TOOL_OPTIONS=\"$JAVA_TOOL_OPTIONS_DEFAULT $JAVA_TOOL_OPTIONS\"; \ - echo \"Jvm OPTS $JAVA_TOOL_OPTIONS\"; \ exec java -jar $PATH_TO_JAR" ] From 100e3f333b493bbb5037e5c3954721571eb6453c Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 16:23:33 +0200 Subject: [PATCH 12/16] chore: liquibase failOnError="false" --- src/main/resources/db/changelog/100_index_pogues.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/db/changelog/100_index_pogues.xml b/src/main/resources/db/changelog/100_index_pogues.xml index 9d016dcb..89d94a9f 100644 --- a/src/main/resources/db/changelog/100_index_pogues.xml +++ b/src/main/resources/db/changelog/100_index_pogues.xml @@ -4,12 +4,12 @@ xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + CREATE INDEX IF NOT EXISTS idx_pogues_owner ON pogues ((data ->> 'owner')); - + CREATE INDEX IF NOT EXISTS idx_pogues_multi_owner ON pogues ((data ->> 'owner'), (data -> 'Name'), (data -> 'TargetMode'), (data -> 'flowLogic'), (data -> 'formulasLanguage')); From 2f2bd288664122679ad9c3955b2953ab5a06acfa Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 16:24:02 +0200 Subject: [PATCH 13/16] bump version to 4.7.6-SNAPSHOT.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa499927..cd3a59be 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ fr.insee Pogues-BO jar - 4.7.6-SNAPSHOT.4 + 4.7.6-SNAPSHOT.5 Pogues-Back-Office From 45c383b5928973a1f2a7f424de22b7105f0008d0 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 17:01:54 +0200 Subject: [PATCH 14/16] chore: restore old liquibase --- src/main/resources/db/changelog/100_index_pogues.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/db/changelog/100_index_pogues.xml b/src/main/resources/db/changelog/100_index_pogues.xml index 89d94a9f..982adec7 100644 --- a/src/main/resources/db/changelog/100_index_pogues.xml +++ b/src/main/resources/db/changelog/100_index_pogues.xml @@ -4,14 +4,14 @@ xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + - CREATE INDEX IF NOT EXISTS idx_pogues_owner ON pogues ((data ->> 'owner')); + CREATE INDEX idx_pogues_owner ON pogues ((data ->> 'owner')); - + - CREATE INDEX IF NOT EXISTS idx_pogues_multi_owner ON pogues ((data ->> 'owner'), (data -> 'Name'), (data -> 'TargetMode'), (data -> 'flowLogic'), (data -> 'formulasLanguage')); + CREATE INDEX idx_pogues_multi_owner ON pogues ((data ->> 'owner'), (data -> 'Name'), (data -> 'TargetMode'), (data -> 'flowLogic'), (data -> 'formulasLanguage')); From 67cd80bc40491d1c531c9cbddd956ac5c2aac6a6 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 17:02:57 +0200 Subject: [PATCH 15/16] bump: minor version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cd3a59be..fb39a18b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.1 + 3.3.2 @@ -24,7 +24,7 @@ 2.9 2.6.0 0.8.12 - 12.4 + 12.5 4.28.0 3.1.8 From 181443ef8b05ef726bb80ebe9711fc64c5d92a62 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Wed, 24 Jul 2024 17:05:00 +0200 Subject: [PATCH 16/16] build: bump version to 4.7.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb39a18b..b5108c11 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ fr.insee Pogues-BO jar - 4.7.6-SNAPSHOT.5 + 4.7.6 Pogues-Back-Office