diff --git a/docs/_docs/code-snippets/java/pom.xml b/docs/_docs/code-snippets/java/pom.xml index dcdd2daa8d541..3a152c4edbad7 100644 --- a/docs/_docs/code-snippets/java/pom.xml +++ b/docs/_docs/code-snippets/java/pom.xml @@ -101,7 +101,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.14.1 1.8 1.8 @@ -109,7 +109,7 @@ maven-surefire-plugin - 2.22.2 + 3.5.4 **/*.java @@ -118,7 +118,7 @@ maven-failsafe-plugin - 2.22.2 + 3.5.4 diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml index b7c15dab10efd..60bd3f0e768e3 100644 --- a/modules/benchmarks/pom.xml +++ b/modules/benchmarks/pom.xml @@ -117,7 +117,7 @@ org.apache.maven.plugins maven-shade-plugin - 2.2 + ${maven.shade.plugin.version} org.apache.maven.plugins @@ -131,19 +131,19 @@ maven-clean-plugin - 2.5 + ${maven.clean.plugin.version} maven-deploy-plugin - 2.8.1 + ${maven.deploy.plugin.version} maven-install-plugin - 2.5.1 + ${maven.install.plugin.version} maven-jar-plugin - 2.4 + ${maven.jar.plugin.version} maven-javadoc-plugin @@ -151,19 +151,19 @@ maven-resources-plugin - 2.6 + ${maven.resources.plugin.version} maven-site-plugin - 3.3 + ${maven.site.plugin.version} maven-source-plugin - 2.2.1 + ${maven.source.plugin.version} maven-surefire-plugin - 2.20.1 + ${maven.surefire.plugin.version} diff --git a/modules/binary/api/pom.xml b/modules/binary/api/pom.xml index 65d79c7a212b5..15076732e4b05 100644 --- a/modules/binary/api/pom.xml +++ b/modules/binary/api/pom.xml @@ -53,7 +53,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java index ac3cc172814d2..fa4bd41cc2c17 100644 --- a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java +++ b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java @@ -490,7 +490,8 @@ private static Iterable classesInPackage(String pkgName) { for (File file : pkgDir.listFiles()) { String fileName = file.getName(); - if (file.isFile() && fileName.toLowerCase().endsWith(".class")) + if (file.isFile() && fileName.toLowerCase().endsWith(".class") + && !fileName.equalsIgnoreCase("package-info.class")) clsNames.add(pkgName + '.' + fileName.substring(0, fileName.length() - 6)); } } @@ -507,7 +508,8 @@ else if (cpElement.isFile()) { if (entry.startsWith(pkgPath) && entry.endsWith(".class")) { String clsName = entry.substring(pkgPath.length() + 1, entry.length() - 6); - if (!clsName.contains("/") && !clsName.contains("\\")) + if (!clsName.contains("/") && !clsName.contains("\\") + && !clsName.equalsIgnoreCase("package-info")) clsNames.add(pkgName + '.' + clsName); } } diff --git a/modules/binary/impl/pom.xml b/modules/binary/impl/pom.xml index b56dbf5b73939..90e7a35a5a81b 100644 --- a/modules/binary/impl/pom.xml +++ b/modules/binary/impl/pom.xml @@ -65,7 +65,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml index 538997e72418d..fb42c00c24094 100644 --- a/modules/calcite/pom.xml +++ b/modules/calcite/pom.xml @@ -256,7 +256,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/checkstyle/pom.xml b/modules/checkstyle/pom.xml index e9df508336c7e..589a354960cab 100644 --- a/modules/checkstyle/pom.xml +++ b/modules/checkstyle/pom.xml @@ -93,7 +93,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.2.0 + 3.4.0 copy-checkstyle-config @@ -117,7 +117,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.7.1 + 1.7.3 diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 851c763fd3228..e299873bba9ac 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -145,7 +145,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.2 + ${maven.jar.plugin.version} @@ -158,7 +158,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 92373097f4712..750ecbc601a52 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -53,7 +53,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/compatibility/pom.xml b/modules/compatibility/pom.xml index b1b95ec960cba..cd6bdf794dec6 100644 --- a/modules/compatibility/pom.xml +++ b/modules/compatibility/pom.xml @@ -110,6 +110,13 @@ test + + commons-io + commons-io + ${commons.io.version} + test + + @@ -138,7 +145,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/compress/pom.xml b/modules/compress/pom.xml index b9250b7dc8d14..2e970919efabb 100644 --- a/modules/compress/pom.xml +++ b/modules/compress/pom.xml @@ -171,7 +171,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/transform/CacheObjectCompressionConsumptionTest.java b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/transform/CacheObjectCompressionConsumptionTest.java index ff05e7a205f62..ae6de95cf1d48 100644 --- a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/transform/CacheObjectCompressionConsumptionTest.java +++ b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/transform/CacheObjectCompressionConsumptionTest.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import org.apache.commons.io.FileUtils; import org.apache.ignite.DataRegionMetrics; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; @@ -363,7 +362,7 @@ private Consumption doTest(int cnt, Function keyGen, Function org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/core/pom.xml b/modules/core/pom.xml index ccb994b73a74b..8737f69637427 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -328,7 +328,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false @@ -337,7 +337,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.6.0 + ${maven.shade.plugin.version} package @@ -363,7 +363,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.4.0 + ${build.helper.maven.plugin.version} add-generated-sources @@ -546,7 +546,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.8 + ${maven.dependency.plugin.version} diff --git a/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java b/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java index 9a3bf9c3112a4..3a77f5cb01d40 100644 --- a/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/GridTestIoUtils.java @@ -27,6 +27,7 @@ import java.io.ObjectOutputStream; import java.io.ObjectStreamClass; import java.io.Serializable; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import org.apache.commons.io.IOUtils; import org.apache.ignite.marshaller.Marshaller; @@ -317,4 +318,24 @@ private static void close(Closeable c) throws IOException { private GridTestIoUtils() { // No-op. } + + /** + * Reads whole stream content and returns it as a string. + * Uses JDK-only implementation to avoid external dependencies. + * + * @param inputStream Stream to read. + * @return Stream content as a string. + * @throws IOException If something goes wrong. + */ + public static String readStream(InputStream inputStream) throws IOException { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + byte[] buf = new byte[4096]; + int len; + + while ((len = inputStream.read(buf)) != -1) + baos.write(buf, 0, len); + + return new String(baos.toByteArray(), StandardCharsets.UTF_8); + } } diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index a26ebb80d1702..cd6b30d84de49 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -35,8 +35,11 @@ import java.net.InetAddress; import java.net.MulticastSocket; import java.net.ServerSocket; +import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.PosixFilePermission; import java.security.GeneralSecurityException; import java.security.KeyStore; @@ -2658,4 +2661,29 @@ public static MessageSerializer loadSerializer(Class() { + @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { + size[0] += attrs.size(); + + return FileVisitResult.CONTINUE; + } + + @Override public FileVisitResult visitFileFailed(Path file, IOException exc) { + return FileVisitResult.CONTINUE; + } + }); + + return size[0]; + } } diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommand.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommand.java index e3a2fa919247d..29ed053d48232 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommand.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/JavaVersionCommand.java @@ -17,14 +17,10 @@ package org.apache.ignite.testframework.junits.multijvm; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; import java.util.concurrent.TimeUnit; -import org.apache.commons.io.IOUtils; +import org.apache.ignite.GridTestIoUtils; import org.apache.ignite.internal.util.GridJavaProcess; - -import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertTrue; /** @@ -44,25 +40,12 @@ int majorVersion(String javaHome) throws IOException, InterruptedException { if (proc.exitValue() != 0) { throw new IllegalStateException("'java -version' failed, stdin '" + - readStream(proc.getInputStream()) + "', stdout '" + - readStream(proc.getErrorStream()) + "'"); + GridTestIoUtils.readStream(proc.getInputStream()) + "', stdout '" + + GridTestIoUtils.readStream(proc.getErrorStream()) + "'"); } - String verOutput = readStream(proc.getErrorStream()); + String verOutput = GridTestIoUtils.readStream(proc.getErrorStream()); return JavaVersionCommandParser.extractMajorVersion(verOutput); } - - /** - * Reads whole stream content and returns it as a string. UTF-8 is used to convert from bytes to string. - * - * @param inputStream Stream to read. - * @return Stream content as a string. - * @throws IOException If something goes wrong. - */ - private String readStream(InputStream inputStream) throws IOException { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - IOUtils.copy(inputStream, baos); - return new String(baos.toByteArray(), UTF_8); - } } diff --git a/modules/dev-utils/pom.xml b/modules/dev-utils/pom.xml index c51ccdc9e29e3..815baa3d38988 100644 --- a/modules/dev-utils/pom.xml +++ b/modules/dev-utils/pom.xml @@ -79,7 +79,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} true @@ -88,7 +88,7 @@ org.apache.maven.plugins maven-assembly-plugin - 2.4.1 + ${maven.assembly.plugin.version} jar-with-dependencies diff --git a/modules/direct-io/pom.xml b/modules/direct-io/pom.xml index 9700fe802ec60..c66ba1db4c918 100644 --- a/modules/direct-io/pom.xml +++ b/modules/direct-io/pom.xml @@ -134,7 +134,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/extdata/pluggable/pom.xml b/modules/extdata/pluggable/pom.xml index fa93410f4bc39..fa5306f52a301 100644 --- a/modules/extdata/pluggable/pom.xml +++ b/modules/extdata/pluggable/pom.xml @@ -114,7 +114,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} true diff --git a/modules/extdata/uri/config/signeddeploy/keystore b/modules/extdata/uri/config/signeddeploy/keystore index dc51a0fcd22bb..412e5784ed7c9 100644 Binary files a/modules/extdata/uri/config/signeddeploy/keystore and b/modules/extdata/uri/config/signeddeploy/keystore differ diff --git a/modules/extdata/uri/pom.xml b/modules/extdata/uri/pom.xml index a146b11b123d7..28d0078a27e44 100644 --- a/modules/extdata/uri/pom.xml +++ b/modules/extdata/uri/pom.xml @@ -205,7 +205,7 @@ org.apache.maven.plugins maven-jarsigner-plugin - 3.0.0 + ${maven.jarsigner.plugin.version} sign-well diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml index e6a2554d56e57..e718be452c06d 100644 --- a/modules/indexing/pom.xml +++ b/modules/indexing/pom.xml @@ -96,13 +96,6 @@ test - - commons-io - commons-io - ${commons.io.version} - test - - commons-collections commons-collections @@ -197,7 +190,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotMetricsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotMetricsTest.java index e4dcf1c2624a9..9f0142cd82c97 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotMetricsTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteClusterSnapshotMetricsTest.java @@ -33,7 +33,6 @@ import javax.management.DynamicMBean; import javax.management.MBeanException; import javax.management.ReflectionException; -import org.apache.commons.io.FileUtils; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheMode; @@ -286,7 +285,7 @@ public void testCreateSnapshotProgress() throws Exception { assertEquals(-1, processedSize.value()); // Calculate transfer rate limit. - long rate = FileUtils.sizeOfDirectory(ignite.context().pdsFolderResolver().fileTree().nodeStorage()) / 5; + long rate = GridTestUtils.sizeOfDirectory(ignite.context().pdsFolderResolver().fileTree().nodeStorage()) / 5; // Limit snapshot transfer rate. DistributedChangeableProperty rateProp = diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml index f948eecade021..1ccf7975bba14 100644 --- a/modules/jcl/pom.xml +++ b/modules/jcl/pom.xml @@ -65,7 +65,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/json/pom.xml b/modules/json/pom.xml index b0e218dc37bcb..ae3c28928a89a 100644 --- a/modules/json/pom.xml +++ b/modules/json/pom.xml @@ -88,7 +88,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml index 1346a1e9765e0..5a031057f2aeb 100644 --- a/modules/jta/pom.xml +++ b/modules/jta/pom.xml @@ -128,7 +128,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/kubernetes/pom.xml b/modules/kubernetes/pom.xml index 0f6e115b65c61..94c8973edb74e 100644 --- a/modules/kubernetes/pom.xml +++ b/modules/kubernetes/pom.xml @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/log4j2/pom.xml b/modules/log4j2/pom.xml index 2cba3ad2291ed..c5bfd3b33932b 100644 --- a/modules/log4j2/pom.xml +++ b/modules/log4j2/pom.xml @@ -69,7 +69,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/numa-allocator/pom.xml b/modules/numa-allocator/pom.xml index ab9f53bbf2b63..8876e426c1765 100644 --- a/modules/numa-allocator/pom.xml +++ b/modules/numa-allocator/pom.xml @@ -106,7 +106,7 @@ com.googlecode.cmake-maven-project cmake-maven-plugin - 3.31.5-b1 + ${cmake.maven.plugin.version} cmake-generate @@ -198,7 +198,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/opencensus/pom.xml b/modules/opencensus/pom.xml index 9c0abe958e195..8bd8bf01e28aa 100644 --- a/modules/opencensus/pom.xml +++ b/modules/opencensus/pom.xml @@ -147,7 +147,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml index f6f86b1ae3bed..daa0a83152415 100644 --- a/modules/rest-http/pom.xml +++ b/modules/rest-http/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml index 69e4917ee7517..807df528b21ed 100644 --- a/modules/slf4j/pom.xml +++ b/modules/slf4j/pom.xml @@ -76,7 +76,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml index a8c11444928ec..c08848124fdd6 100644 --- a/modules/spring/pom.xml +++ b/modules/spring/pom.xml @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteClientSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteClientSpringBean.java index ae98397bfbb04..458cf287a7295 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteClientSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteClientSpringBean.java @@ -49,7 +49,7 @@ * A note should be taken that Ignite client instance is started after all other * Spring beans have been initialized and right before Spring context is refreshed. * That implies that it's not valid to reference {@link IgniteClientSpringBean} from - * any kind of Spring bean init methods like {@link javax.annotation.PostConstruct}. + * any kind of Spring bean init methods like {@code @PostConstruct}. * If it's required to reference {@link IgniteClientSpringBean} for other bean * initialization purposes, it should be done from a {@link ContextRefreshedEvent} * listener method declared in that bean. diff --git a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java index 07934a8dc164a..886b9c62bd446 100644 --- a/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java +++ b/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java @@ -62,7 +62,7 @@ * A note should be taken that Ignite instance is started after all other * Spring beans have been initialized and right before Spring context is refreshed. * That implies that it's not valid to reference IgniteSpringBean from - * any kind of Spring bean init methods like {@link javax.annotation.PostConstruct}. + * any kind of Spring bean init methods like {@code @PostConstruct}. * If it's required to reference IgniteSpringBean for other bean * initialization purposes, it should be done from a {@link ContextRefreshedEvent} * listener method declared in that bean. diff --git a/modules/sqlline/pom.xml b/modules/sqlline/pom.xml index bc43c6a241b6a..bcf99674bab21 100644 --- a/modules/sqlline/pom.xml +++ b/modules/sqlline/pom.xml @@ -67,7 +67,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} true diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml index 8d4673070f032..08f9d5697179b 100644 --- a/modules/tools/pom.xml +++ b/modules/tools/pom.xml @@ -66,7 +66,7 @@ maven-resources-plugin - 3.2.0 + ${maven.resources.plugin.version} copy-resources @@ -105,7 +105,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + ${build.helper.maven.plugin.version} add-source @@ -125,7 +125,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/unsafe/pom.xml b/modules/unsafe/pom.xml index d5ddf75a6059a..49ff468519e9a 100644 --- a/modules/unsafe/pom.xml +++ b/modules/unsafe/pom.xml @@ -53,7 +53,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml index 8927c9d5b4b1a..eae05153183a6 100644 --- a/modules/urideploy/pom.xml +++ b/modules/urideploy/pom.xml @@ -154,7 +154,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/web/ignite-websphere-test/pom.xml b/modules/web/ignite-websphere-test/pom.xml index 12027ded655aa..e317911b254bf 100644 --- a/modules/web/ignite-websphere-test/pom.xml +++ b/modules/web/ignite-websphere-test/pom.xml @@ -66,7 +66,7 @@ org.apache.maven.plugins maven-war-plugin - 3.2.2 + 3.5.1 diff --git a/modules/web/pom.xml b/modules/web/pom.xml index f5e12069f834b..d75e7d4542091 100644 --- a/modules/web/pom.xml +++ b/modules/web/pom.xml @@ -103,7 +103,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/modules/yardstick/pom-standalone.xml b/modules/yardstick/pom-standalone.xml index c667650c325ab..eb8fc763d465f 100644 --- a/modules/yardstick/pom-standalone.xml +++ b/modules/yardstick/pom-standalone.xml @@ -129,7 +129,7 @@ maven-dependency-plugin - 2.8 + 3.9.0 package @@ -205,7 +205,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + 3.1.4 true diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml index d6818b52eef17..2cbe81c69322c 100644 --- a/modules/yardstick/pom.xml +++ b/modules/yardstick/pom.xml @@ -125,7 +125,7 @@ com.mycila license-maven-plugin - 2.8 + 5.0.0 true @@ -133,7 +133,7 @@ maven-dependency-plugin - 2.8 + ${maven.dependency.plugin.version} package @@ -170,7 +170,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + ${maven.jar.plugin.version} ${basedir}/target/assembly/libs @@ -208,7 +208,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} true diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml index 7f0b6003755cb..28605774472d7 100644 --- a/modules/zookeeper/pom.xml +++ b/modules/zookeeper/pom.xml @@ -229,7 +229,7 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + ${maven.deploy.plugin.version} false diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml index f2128baf52cf5..2d802e6a236c7 100644 --- a/parent-internal/pom.xml +++ b/parent-internal/pom.xml @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 + 3.2.0 ${project.groupId} diff --git a/parent/pom.xml b/parent/pom.xml index bba4e3ac078d8..4af3f872354da 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -96,9 +96,9 @@ 7.4.0_1 8.11.2 1.10.1 - 3.5.1 - 3.1.2 - 1.7.1 + 5.1.9 + 3.6.0 + 1.7.3 pom-installed.xml 3.8.9 8.45 @@ -108,7 +108,7 @@ 2.0.17 1.1.10.7 5.3.39 - 3.1.2 + 3.5.4 10.0.27 0.8.3 3.9.5 @@ -119,8 +119,24 @@ 1.4.17 - 3.6.3 + 3.12.0 3.6.2 + 3.14.1 + 3.5.4 + 3.5.4 + 3.6.1 + 3.5.0 + 3.1.4 + 3.1.4 + 3.5.0 + 3.4.0 + 3.21.0 + 3.4.0 + 3.8.0 + 3.9.0 + 3.1.0 + 3.6.1 + 3.31.5-b1 apache https://sonarcloud.io @@ -259,38 +275,6 @@ - - net.alchim31.maven - scala-maven-plugin - 3.3.2 - - - -Xms512m - -Xmx1024m - - - -nobootcp - - - - - scala-compile-first - process-resources - - add-source - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - - org.apache.maven.plugins maven-jar-plugin @@ -476,13 +460,13 @@ org.apache.maven.plugins maven-resources-plugin - 3.2.0 + ${maven.resources.plugin.version} org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + ${build.helper.maven.plugin.version} @@ -501,13 +485,13 @@ org.apache.maven.plugins maven-antrun-plugin - 1.8 + 3.2.0 org.codehaus.mojo exec-maven-plugin - 1.3.2 + 3.6.3 ${project.groupId} @@ -575,7 +559,7 @@ org.apache.maven.plugins maven-source-plugin - 2.2.1 + ${maven.source.plugin.version} source @@ -609,9 +593,6 @@ true resolveCiFriendliesOnly ${maven.flatten.file.name} - - resolve - process-resources @@ -935,7 +916,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + ${maven.compiler.plugin.version} --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED @@ -1014,7 +995,6 @@ 11 15 - 2.12.15 @@ -1022,7 +1002,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + ${maven.compiler.plugin.version} --add-exports diff --git a/pom.xml b/pom.xml index 02103bcccd055..97f40222cc8b1 100644 --- a/pom.xml +++ b/pom.xml @@ -402,7 +402,7 @@ org.apache.maven.plugins maven-assembly-plugin - 2.4 + ${maven.assembly.plugin.version} false