Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Spring Boot 3.2 and Spring Cloud 2023 #179

Merged
merged 5 commits into from
Apr 5, 2024
Merged

Upgrade Spring Boot 3.2 and Spring Cloud 2023 #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63601ee
Upgrade Spring Boot 3.2 and Spring Cloud 2023
danielthirion Mar 22, 2024
da72861
Moved maven compiler plugin parameters to farao-parent
danielthirion Apr 2, 2024
ffd17fd
Merge remote-tracking branch 'origin/master' into upgrade_spring_boot…
danielthirion Apr 3, 2024
ead8134
Delete snapshot from dependencies in pom.xml
danielthirion Apr 3, 2024
fa65407
Remove added space
danielthirion Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...ava/com/farao_community/farao/cse/export_runner/app/configurations/PiSaConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <joris.mancini at rte-france.com>}
*/
@ConfigurationProperties(prefix = "cse-cc-runner.pisa")
@ConstructorBinding
public class PiSaConfiguration {
private final PisaLinkProperties link1;
private final PisaLinkProperties link2;
Expand Down
2 changes: 0 additions & 2 deletions ...om/farao_community/farao/cse/import_runner/app/configurations/MendrisioConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <joris.mancini at rte-france.com>}
*/
@ConfigurationProperties(prefix = "cse-cc-runner.mendrisio")
@ConstructorBinding
public class MendrisioConfiguration {
private final MendrisioCagnoLineProperties mendrisioCagnoLine;
private final String mendrisioVoltageLevel;
Expand Down
2 changes: 0 additions & 2 deletions ...ava/com/farao_community/farao/cse/import_runner/app/configurations/PiSaConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <joris.mancini at rte-france.com>}
*/
@ConfigurationProperties(prefix = "cse-cc-runner.pisa")
@ConstructorBinding
public class PiSaConfiguration {
private final PisaLinkProperties link1;
private final PisaLinkProperties link2;
Expand Down
4 changes: 2 additions & 2 deletions cse-cc-import-runner-app/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ spring:
template:
reply-timeout: 2400000
cloud:
function:
definition: interrupt;request
stream:
function:
definition: interrupt;request
default:
binder: rabbit
bindings:
Expand Down
1 change: 0 additions & 1 deletion cse-runner-spring-boot-starter/src/main/resources/META-INF/spring.factories
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
com.farao_community.farao.cse.runner.starter.CseClientAutoConfiguration
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>farao-parent-ws</artifactId>
<groupId>com.farao-community.farao</groupId>
<version>1.7.0</version>
<version>1.8.0</version>
</parent>

<artifactId>gridcapa-cse</artifactId>
Expand All @@ -34,9 +34,9 @@
<properties>
<!-- TECHNICAL DEPENDENCIES -->
<apache.poi.version>5.1.0</apache.poi.version>
<commons.io.version>2.11.0</commons.io.version>
<jackson.databind.version>2.11.0</jackson.databind.version>
<jackson.datatype.version>2.13.0</jackson.datatype.version>
<commons.io.version>2.15.1</commons.io.version>
<jackson.databind.version>2.14.0</jackson.databind.version>
<jackson.datatype.version>2.17.0</jackson.datatype.version>
<jaxb-api.version>2.4.0-b180830.0359</jaxb-api.version>
<jaxb-runtime.version>2.4.0-b180830.0438</jaxb-runtime.version>
<jaxb-impl.version>4.0.0</jaxb-impl.version>
Expand All @@ -50,11 +50,11 @@
<awaitility.version>3.0.0</awaitility.version>

<!-- BUSINESS DEPENDENCIES -->
<farao.dependencies.version>1.27.0</farao.dependencies.version>
<farao.dichotomy.version>4.15.0</farao.dichotomy.version>
<gridcapa.rao.runner.version>1.21.0</gridcapa.rao.runner.version>
<gridcapa.task-manager.version>1.21.0</gridcapa.task-manager.version>
<gridcapa.starter.minio.adapter.version>1.1.0</gridcapa.starter.minio.adapter.version>
<farao.dependencies.version>1.28.0</farao.dependencies.version>
<farao.dichotomy.version>4.16.0</farao.dichotomy.version>
<gridcapa.rao.runner.version>1.22.0</gridcapa.rao.runner.version>
<gridcapa.task-manager.version>1.26.1</gridcapa.task-manager.version>
<gridcapa.starter.minio.adapter.version>1.1.2</gridcapa.starter.minio.adapter.version>
</properties>

<build>
Expand Down
Loading