diff --git a/action/action-dsl-spi/pom.xml b/action/action-dsl-spi/pom.xml index 4b98a1fcbde..b6aa2cff3f7 100644 --- a/action/action-dsl-spi/pom.xml +++ b/action/action-dsl-spi/pom.xml @@ -41,7 +41,7 @@ - org.codehaus.groovy + org.apache.groovy groovy diff --git a/action/action-dsl/pom.xml b/action/action-dsl/pom.xml index 60c7d87e700..b3fc3b4cedb 100644 --- a/action/action-dsl/pom.xml +++ b/action/action-dsl/pom.xml @@ -49,7 +49,7 @@ commons-io - org.codehaus.groovy + org.apache.groovy groovy diff --git a/action/action-util/pom.xml b/action/action-util/pom.xml index 7a19352d6a7..ba7d45aba03 100644 --- a/action/action-util/pom.xml +++ b/action/action-util/pom.xml @@ -45,7 +45,7 @@ - org.codehaus.groovy + org.apache.groovy groovy diff --git a/config-test/src/main/java/com/powsybl/config/test/TestPlatformConfigProvider.java b/config-test/src/main/java/com/powsybl/config/test/TestPlatformConfigProvider.java index ada10671915..344944f179d 100644 --- a/config-test/src/main/java/com/powsybl/config/test/TestPlatformConfigProvider.java +++ b/config-test/src/main/java/com/powsybl/config/test/TestPlatformConfigProvider.java @@ -61,11 +61,7 @@ public PlatformConfig getPlatformConfig() { InputStream resourceList = TestPlatformConfigProvider.class.getResourceAsStream(FILELIST_PATH); List 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(); } diff --git a/dsl/pom.xml b/dsl/pom.xml index 29062d6f9f7..f9044341939 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -47,7 +47,7 @@ commons-io - org.codehaus.groovy + org.apache.groovy groovy diff --git a/dynamic-simulation/dynamic-simulation-dsl/pom.xml b/dynamic-simulation/dynamic-simulation-dsl/pom.xml index cef2c5fbadf..9fa70d7e5df 100644 --- a/dynamic-simulation/dynamic-simulation-dsl/pom.xml +++ b/dynamic-simulation/dynamic-simulation-dsl/pom.xml @@ -43,7 +43,7 @@ - org.codehaus.groovy + org.apache.groovy groovy diff --git a/iidm/iidm-scripting/pom.xml b/iidm/iidm-scripting/pom.xml index 6d85c27a9d9..488725081a9 100644 --- a/iidm/iidm-scripting/pom.xml +++ b/iidm/iidm-scripting/pom.xml @@ -45,7 +45,7 @@ - org.codehaus.groovy + org.apache.groovy groovy diff --git a/pom.xml b/pom.xml index 808cf28caf9..670c787fd2b 100644 --- a/pom.xml +++ b/pom.xml @@ -95,48 +95,48 @@ ../../../distribution-core/target/site/jacoco-aggregate/jacoco.xml - 3.11.0 - 1.0-rc2 - 1.3.1 - 1.21 - 2.8.0 - 2.7 - 3.4 + 3.24.2 + 1.1.1 + 1.5.0 + 1.24.0 + 2.9.0 + 2.13.0 + 3.13.0 3.6.1 1.10.0 3.0.1 3.0.2 - 1.41.1_1 + 1.47.1_1 1.0.12 - 3.0.15 - 32.0.1-jre - 2.14.1 - 2.14.1 + 4.0.14 + 32.1.2-jre + 2.15.2 + 2.15.2 1.0.3 - 1.5.1 - 1.1 - 2.9.7 - 5.5.2 - 1.2.10 + 1.5.2 + 1.3.0 + 2.12.5 + 5.10.0 + 1.4.11 3.8.5 - 3.6.0 - 0.5.9 - 5.1.1 + 3.9.0 + 0.5.15 + 5.5.0 2.4.0 5.2.3 - 4.2.2 + 4.3.2 1.0 - 1.7.22 - 2.0 + 2.0.9 + 2.2 20070216 4.3.4 - 1.17.6 - 1.5.0 + 1.19.0 + 1.7.2 3.0.3 - 2.8.3 - 2.3.0 + 2.9.0 + 2.9.1 1.9 - 1.5.2-5 + 1.5.5-5 1.2.1 @@ -766,22 +766,22 @@ ${gdata.version} - org.codehaus.groovy + org.apache.groovy groovy ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-console ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-groovysh ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-nio ${groovy.version} diff --git a/scripting/pom.xml b/scripting/pom.xml index 04387ebab50..e78a4744cdc 100644 --- a/scripting/pom.xml +++ b/scripting/pom.xml @@ -45,7 +45,7 @@ - org.codehaus.groovy + org.apache.groovy groovy @@ -65,7 +65,7 @@ - org.codehaus.groovy + org.apache.groovy groovy-nio runtime diff --git a/security-analysis/security-analysis-api/src/test/java/com/powsybl/security/tools/SecurityAnalysisToolTest.java b/security-analysis/security-analysis-api/src/test/java/com/powsybl/security/tools/SecurityAnalysisToolTest.java index 228cfbb2b93..055c2037281 100644 --- a/security-analysis/security-analysis-api/src/test/java/com/powsybl/security/tools/SecurityAnalysisToolTest.java +++ b/security-analysis/security-analysis-api/src/test/java/com/powsybl/security/tools/SecurityAnalysisToolTest.java @@ -98,14 +98,14 @@ void test() { private static CommandLine mockCommandLine(Map options, Set 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; } diff --git a/time-series/time-series-dsl/pom.xml b/time-series/time-series-dsl/pom.xml index b71617e41c4..137a6e0c8c4 100644 --- a/time-series/time-series-dsl/pom.xml +++ b/time-series/time-series-dsl/pom.xml @@ -45,7 +45,7 @@ - org.codehaus.groovy + org.apache.groovy groovy