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

[WIP] Upgrade all runtime dependencies to the most recent version #2702

Closed
wants to merge 1 commit into from
Closed

[WIP] Upgrade all runtime dependencies to the most recent version #2702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion action/action-dsl-spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependencies>
<!-- Compilation dependencies -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion action/action-dsl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion action/action-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependencies>
<!-- Compilation dependencies -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
Expand Down
6 changes: 1 addition & 5 deletions config-test/src/main/java/com/powsybl/config/test/TestPlatformConfigProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,7 @@ public PlatformConfig getPlatformConfig() {
InputStream resourceList = TestPlatformConfigProvider.class.getResourceAsStream(FILELIST_PATH);
List<String> resources;
if (resourceList != null) {
try {
resources = IOUtils.readLines(resourceList, StandardCharsets.UTF_8);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
resources = IOUtils.readLines(resourceList, StandardCharsets.UTF_8);
} else {
resources = Collections.emptyList();
}
Expand Down
2 changes: 1 addition & 1 deletion dsl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion dynamic-simulation/dynamic-simulation-dsl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependencies>
<!-- Compilation dependencies -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
Expand Down
7 changes: 4 additions & 3 deletions ieee-cdf/ieee-cdf-model/src/main/java/com/powsybl/ieeecdf/model/IeeeCdfBranch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
*/
package com.powsybl.ieeecdf.model;

import com.univocity.parsers.annotations.Convert;
import com.univocity.parsers.annotations.EnumOptions;
import com.univocity.parsers.annotations.FixedWidth;
import com.univocity.parsers.annotations.Parsed;
import com.univocity.parsers.conversions.EnumSelector;
import com.univocity.parsers.fixed.FieldAlignment;

/**
Expand Down Expand Up @@ -117,7 +118,7 @@ public enum Side {
*/
@FixedWidth(from = 18, to = 19)
@Parsed
@Convert(conversionClass = BranchTypeConversion.class)
@EnumOptions(selectors = EnumSelector.ORDINAL)
private Type type;

/**
Expand Down Expand Up @@ -174,7 +175,7 @@ public enum Side {
*/
@FixedWidth(from = 73, to = 74, alignment = FieldAlignment.RIGHT)
@Parsed
@Convert(conversionClass = BranchSideConversion.class)
@EnumOptions(selectors = EnumSelector.ORDINAL)
private Side side;

/**
Expand Down
5 changes: 3 additions & 2 deletions ieee-cdf/ieee-cdf-model/src/main/java/com/powsybl/ieeecdf/model/IeeeCdfBus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
*/
package com.powsybl.ieeecdf.model;

import com.univocity.parsers.annotations.Convert;
import com.univocity.parsers.annotations.EnumOptions;
import com.univocity.parsers.annotations.FixedWidth;
import com.univocity.parsers.annotations.Parsed;
import com.univocity.parsers.conversions.EnumSelector;
import com.univocity.parsers.fixed.FieldAlignment;

/**
Expand Down Expand Up @@ -91,7 +92,7 @@ public enum Type {
*/
@FixedWidth(from = 24, to = 26, alignment = FieldAlignment.RIGHT)
@Parsed
@Convert(conversionClass = BusTypeConversion.class)
@EnumOptions(selectors = EnumSelector.ORDINAL)
private Type type;

/**
Expand Down
2 changes: 1 addition & 1 deletion ieee-cdf/ieee-cdf-model/src/main/java/com/powsybl/ieeecdf/model/IeeeCdfTitle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public enum Season {
* Season
*/
@FixedWidth(from = 43, to = 44)
@Parsed
@Parsed(applyDefaultConversion = false)
@Convert(conversionClass = SeasonConversion.class)
private Season season;

Expand Down
19 changes: 6 additions & 13 deletions ieee-cdf/ieee-cdf-model/src/main/java/com/powsybl/ieeecdf/model/SeasonConversion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,23 @@
/**
* @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
*/
public class SeasonConversion extends ObjectConversion<IeeeCdfTitle.Season> {
public class SeasonConversion extends ObjectConversion<String> {

@Override
protected IeeeCdfTitle.Season fromString(String str) {
protected String fromString(String str) {
char season = str.charAt(0);
switch (season) {
case 'S':
return IeeeCdfTitle.Season.SUMMER;
return IeeeCdfTitle.Season.SUMMER.name();
case 'W':
return IeeeCdfTitle.Season.WINTER;
return IeeeCdfTitle.Season.WINTER.name();
default:
throw new IllegalStateException("Unknown season: " + season);
}
}

@Override
public String revert(IeeeCdfTitle.Season season) {
switch (season) {
case SUMMER:
return "S";
case WINTER:
return "W";
default:
throw new IllegalStateException("Unknown season: " + season);
}
public String revert(String str) {
return str.substring(0, 1);
}
}
2 changes: 1 addition & 1 deletion iidm/iidm-scripting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependencies>
<!-- Compile dependencies -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>

Expand Down
64 changes: 32 additions & 32 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,48 +95,48 @@
../../../distribution-core/target/site/jacoco-aggregate/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>

<assertj.version>3.11.0</assertj.version>
<autoservice.version>1.0-rc2</autoservice.version>
<commonscli.version>1.3.1</commonscli.version>
<commonscompress.version>1.21</commonscompress.version>
<commons-configuration2.version>2.8.0</commons-configuration2.version>
<commonsio.version>2.7</commonsio.version>
<commonslang3.version>3.4</commonslang3.version>
<assertj.version>3.24.2</assertj.version>
<autoservice.version>1.1.1</autoservice.version>
<commonscli.version>1.5.0</commonscli.version>
<commonscompress.version>1.24.0</commonscompress.version>
<commons-configuration2.version>2.9.0</commons-configuration2.version>
<commonsio.version>2.13.0</commonsio.version>
<commonslang3.version>3.13.0</commonslang3.version>
<commonsmath3.version>3.6.1</commonsmath3.version>
<commonstext.version>1.10.0</commonstext.version>
<findbugs-annotations.version>3.0.1</findbugs-annotations.version>
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
<gdata.version>1.41.1_1</gdata.version>
<gdata.version>1.47.1_1</gdata.version>
<graphviz-builder.version>1.0.12</graphviz-builder.version>
<groovy.version>3.0.15</groovy.version>
<guava.version>32.0.1-jre</guava.version>
<jackson.version>2.14.1</jackson.version>
<jackson-databind.version>2.14.1</jackson-databind.version>
<groovy.version>4.0.14</groovy.version>
<guava.version>32.1.2-jre</guava.version>
<jackson.version>2.15.2</jackson.version>
<jackson-databind.version>2.15.2</jackson-databind.version>
<jama.version>1.0.3</jama.version>
<jgrapht.version>1.5.1</jgrapht.version>
<jimfs.version>1.1</jimfs.version>
<jodatime.version>2.9.7</jodatime.version>
<junit-jupiter.version>5.5.2</junit-jupiter.version>
<logback.version>1.2.10</logback.version>
<jgrapht.version>1.5.2</jgrapht.version>
<jimfs.version>1.3.0</jimfs.version>
<jodatime.version>2.12.5</jodatime.version>
<junit-jupiter.version>5.10.0</junit-jupiter.version>
<logback.version>1.4.11</logback.version>
<maven.core.version>3.8.5</maven.core.version>
<maven.plugin.annotations.version>3.6.0</maven.plugin.annotations.version>
<mfl.version>0.5.9</mfl.version>
<mockito.version>5.1.1</mockito.version>
<maven.plugin.annotations.version>3.9.0</maven.plugin.annotations.version>
<mfl.version>0.5.15</mfl.version>
<mockito.version>5.5.0</mockito.version>
<nativelibloader.version>2.4.0</nativelibloader.version>
<poi.version>5.2.3</poi.version>
<rdf4j.version>4.2.2</rdf4j.version>
<rdf4j.version>4.3.6</rdf4j.version>
<sirocco.version>1.0</sirocco.version>
<slf4j.version>1.7.22</slf4j.version>
<snakeyaml.version>2.0</snakeyaml.version>
<slf4j.version>2.0.9</slf4j.version>
<snakeyaml.version>2.2</snakeyaml.version>
<staxutils.version>20070216</staxutils.version>
<stringtemplate.version>4.3.4</stringtemplate.version>
<testcontainers.version>1.17.6</testcontainers.version>
<threeten.version>1.5.0</threeten.version>
<testcontainers.version>1.19.0</testcontainers.version>
<threeten.version>1.7.2</threeten.version>
<trove4j.version>3.0.3</trove4j.version>
<univocity-parsers.version>2.8.3</univocity-parsers.version>
<xmlunit.version>2.3.0</xmlunit.version>
<univocity-parsers.version>2.9.1</univocity-parsers.version>
<xmlunit.version>2.9.1</xmlunit.version>
<xz.version>1.9</xz.version>
<zstdjni.version>1.5.2-5</zstdjni.version>
<zstdjni.version>1.5.5-5</zstdjni.version>

<powsyblmathnative.version>1.2.1</powsyblmathnative.version>
</properties>
Expand Down Expand Up @@ -766,22 +766,22 @@
<version>${gdata.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-console</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-groovysh</artifactId>
<version>${groovy.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-nio</artifactId>
<version>${groovy.version}</version>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions scripting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependencies>
<!-- Compilation dependencies -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>
<dependency>
Expand All @@ -65,7 +65,7 @@

<!-- Runtime dependencies -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-nio</artifactId>
<scope>runtime</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...urity-analysis-api/src/test/java/com/powsybl/security/tools/SecurityAnalysisToolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ void test() {

private static CommandLine mockCommandLine(Map<String, String> options, Set<String> flags) {
CommandLine cli = mock(CommandLine.class);
when(cli.hasOption(any())).thenReturn(false);
when(cli.getOptionValue(any())).thenReturn(null);
when(cli.hasOption(anyString())).thenReturn(false);
when(cli.getOptionValue(anyString())).thenReturn(null);
options.forEach((k, v) -> {
when(cli.getOptionValue(k)).thenReturn(v);
when(cli.hasOption(k)).thenReturn(true);
});
flags.forEach(f -> when(cli.hasOption(f)).thenReturn(true));
when(cli.getOptionProperties(any())).thenReturn(new Properties());
when(cli.getOptionProperties(anyString())).thenReturn(new Properties());
return cli;
}

Expand Down
2 changes: 1 addition & 1 deletion time-series/time-series-dsl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependencies>
<!-- Compilation dependencies -->
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
</dependency>

Expand Down
Loading