From 63601ee418121a4a2981370906b249f185545b97 Mon Sep 17 00:00:00 2001 From: thiriondan Date: Fri, 22 Mar 2024 15:04:46 +0100 Subject: [PATCH 1/4] Upgrade Spring Boot 3.2 and Spring Cloud 2023 --- cse-cc-export-runner-app/pom.xml | 7 +++++++ .../app/configurations/PiSaConfiguration.java | 2 -- cse-cc-import-runner-app/pom.xml | 7 +++++++ .../configurations/MendrisioConfiguration.java | 2 -- .../app/configurations/PiSaConfiguration.java | 2 -- .../src/main/resources/application.yml | 4 ++-- .../main/resources/META-INF/spring.factories | 1 - ...oot.autoconfigure.AutoConfiguration.imports | 1 + pom.xml | 18 +++++++++--------- 9 files changed, 26 insertions(+), 18 deletions(-) delete mode 100644 cse-runner-spring-boot-starter/src/main/resources/META-INF/spring.factories create mode 100644 cse-runner-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/cse-cc-export-runner-app/pom.xml b/cse-cc-export-runner-app/pom.xml index 5818152c..4db1fa6e 100644 --- a/cse-cc-export-runner-app/pom.xml +++ b/cse-cc-export-runner-app/pom.xml @@ -20,6 +20,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + true + + diff --git a/cse-cc-export-runner-app/src/main/java/com/farao_community/farao/cse/export_runner/app/configurations/PiSaConfiguration.java b/cse-cc-export-runner-app/src/main/java/com/farao_community/farao/cse/export_runner/app/configurations/PiSaConfiguration.java index 70133254..ef580c98 100644 --- a/cse-cc-export-runner-app/src/main/java/com/farao_community/farao/cse/export_runner/app/configurations/PiSaConfiguration.java +++ b/cse-cc-export-runner-app/src/main/java/com/farao_community/farao/cse/export_runner/app/configurations/PiSaConfiguration.java @@ -8,14 +8,12 @@ import com.farao_community.farao.cse.network_processing.pisa_change.PiSaLinkConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.ConstructorBinding; import org.springframework.context.annotation.Bean; /** * @author Joris Mancini {@literal } */ @ConfigurationProperties(prefix = "cse-cc-runner.pisa") -@ConstructorBinding public class PiSaConfiguration { private final PisaLinkProperties link1; private final PisaLinkProperties link2; diff --git a/cse-cc-import-runner-app/pom.xml b/cse-cc-import-runner-app/pom.xml index 81a8761b..f12ba0cc 100644 --- a/cse-cc-import-runner-app/pom.xml +++ b/cse-cc-import-runner-app/pom.xml @@ -29,6 +29,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + true + + diff --git a/cse-cc-import-runner-app/src/main/java/com/farao_community/farao/cse/import_runner/app/configurations/MendrisioConfiguration.java b/cse-cc-import-runner-app/src/main/java/com/farao_community/farao/cse/import_runner/app/configurations/MendrisioConfiguration.java index 944f2091..1a81f3cb 100644 --- a/cse-cc-import-runner-app/src/main/java/com/farao_community/farao/cse/import_runner/app/configurations/MendrisioConfiguration.java +++ b/cse-cc-import-runner-app/src/main/java/com/farao_community/farao/cse/import_runner/app/configurations/MendrisioConfiguration.java @@ -8,13 +8,11 @@ package com.farao_community.farao.cse.import_runner.app.configurations; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.ConstructorBinding; /** * @author Joris Mancini {@literal } */ @ConfigurationProperties(prefix = "cse-cc-runner.mendrisio") -@ConstructorBinding public class MendrisioConfiguration { private final MendrisioCagnoLineProperties mendrisioCagnoLine; private final String mendrisioVoltageLevel; diff --git a/cse-cc-import-runner-app/src/main/java/com/farao_community/farao/cse/import_runner/app/configurations/PiSaConfiguration.java b/cse-cc-import-runner-app/src/main/java/com/farao_community/farao/cse/import_runner/app/configurations/PiSaConfiguration.java index f58a31f4..fd2477cd 100644 --- a/cse-cc-import-runner-app/src/main/java/com/farao_community/farao/cse/import_runner/app/configurations/PiSaConfiguration.java +++ b/cse-cc-import-runner-app/src/main/java/com/farao_community/farao/cse/import_runner/app/configurations/PiSaConfiguration.java @@ -9,14 +9,12 @@ import com.farao_community.farao.cse.network_processing.pisa_change.PiSaLinkConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.ConstructorBinding; import org.springframework.context.annotation.Bean; /** * @author Joris Mancini {@literal } */ @ConfigurationProperties(prefix = "cse-cc-runner.pisa") -@ConstructorBinding public class PiSaConfiguration { private final PisaLinkProperties link1; private final PisaLinkProperties link2; diff --git a/cse-cc-import-runner-app/src/main/resources/application.yml b/cse-cc-import-runner-app/src/main/resources/application.yml index eed02b33..45f1139b 100644 --- a/cse-cc-import-runner-app/src/main/resources/application.yml +++ b/cse-cc-import-runner-app/src/main/resources/application.yml @@ -9,9 +9,9 @@ spring: template: reply-timeout: 2400000 cloud: + function: + definition: interrupt;request stream: - function: - definition: interrupt;request default: binder: rabbit bindings: diff --git a/cse-runner-spring-boot-starter/src/main/resources/META-INF/spring.factories b/cse-runner-spring-boot-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 7925dfa0..00000000 --- a/cse-runner-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.farao_community.farao.cse.runner.starter.CseClientAutoConfiguration \ No newline at end of file diff --git a/cse-runner-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cse-runner-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..899f66f6 --- /dev/null +++ b/cse-runner-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.farao_community.farao.cse.runner.starter.CseClientAutoConfiguration \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5181c2bf..e570b882 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ farao-parent-ws com.farao-community.farao - 1.7.0 + 1.8.0-SNAPSHOT gridcapa-cse @@ -34,9 +34,9 @@ 5.1.0 - 2.11.0 - 2.11.0 - 2.13.0 + 2.15.1 + 2.14.0 + 2.17.0 2.4.0-b180830.0359 2.4.0-b180830.0438 4.0.0 @@ -50,11 +50,11 @@ 3.0.0 - 1.26.0 - 4.14.2 - 1.18.1 - 1.21.0 - 1.1.0 + 1.27.0-SNAPSHOT + 4.15.0-SNAPSHOT + 1.21.0-SNAPSHOT + 1.26.1-SNAPSHOT + 1.1.2-SNAPSHOT From da72861b751ece9c312d84070b411b33a5fc984e Mon Sep 17 00:00:00 2001 From: thiriondan Date: Tue, 2 Apr 2024 14:21:06 +0200 Subject: [PATCH 2/4] Moved maven compiler plugin parameters to farao-parent --- cse-cc-export-runner-app/pom.xml | 8 +------- cse-cc-import-runner-app/pom.xml | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/cse-cc-export-runner-app/pom.xml b/cse-cc-export-runner-app/pom.xml index 4db1fa6e..c2be1832 100644 --- a/cse-cc-export-runner-app/pom.xml +++ b/cse-cc-export-runner-app/pom.xml @@ -20,13 +20,7 @@ org.springframework.boot spring-boot-maven-plugin - - org.apache.maven.plugins - maven-compiler-plugin - - true - - + diff --git a/cse-cc-import-runner-app/pom.xml b/cse-cc-import-runner-app/pom.xml index f12ba0cc..944be3cf 100644 --- a/cse-cc-import-runner-app/pom.xml +++ b/cse-cc-import-runner-app/pom.xml @@ -29,13 +29,7 @@ org.springframework.boot spring-boot-maven-plugin - - org.apache.maven.plugins - maven-compiler-plugin - - true - - + From ead8134bb7b4ecff580b00db1e777fd663dea6ef Mon Sep 17 00:00:00 2001 From: thiriondan Date: Wed, 3 Apr 2024 14:00:07 +0200 Subject: [PATCH 3/4] Delete snapshot from dependencies in pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1dc897b..08ac12ea 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ farao-parent-ws com.farao-community.farao - 1.8.0-SNAPSHOT + 1.8.0 gridcapa-cse From fa6540742086261a373f9750dccf423dfc14c75f Mon Sep 17 00:00:00 2001 From: thiriondan Date: Thu, 4 Apr 2024 17:32:44 +0200 Subject: [PATCH 4/4] Remove added space --- cse-cc-export-runner-app/pom.xml | 1 - cse-cc-import-runner-app/pom.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/cse-cc-export-runner-app/pom.xml b/cse-cc-export-runner-app/pom.xml index 68ba364e..f9c84393 100644 --- a/cse-cc-export-runner-app/pom.xml +++ b/cse-cc-export-runner-app/pom.xml @@ -20,7 +20,6 @@ org.springframework.boot spring-boot-maven-plugin - diff --git a/cse-cc-import-runner-app/pom.xml b/cse-cc-import-runner-app/pom.xml index 71a66a46..f0c97a59 100644 --- a/cse-cc-import-runner-app/pom.xml +++ b/cse-cc-import-runner-app/pom.xml @@ -29,7 +29,6 @@ org.springframework.boot spring-boot-maven-plugin -