This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 398b66f27ad IGNITE-28462 Upgrade remaining Maven plugins (#12982)
398b66f27ad is described below
commit 398b66f27ad4736c859ac33f2a4ec713ccfe66be
Author: Kirill Anisimov <[email protected]>
AuthorDate: Tue May 19 18:02:29 2026 +0700
IGNITE-28462 Upgrade remaining Maven plugins (#12982)
---
docs/_docs/code-snippets/java/pom.xml | 6 +-
modules/benchmarks/pom.xml | 18 ++---
modules/binary/api/pom.xml | 2 +-
.../ignite/internal/binary/BinaryContext.java | 6 +-
modules/binary/impl/pom.xml | 2 +-
modules/calcite/pom.xml | 2 +-
modules/checkstyle/pom.xml | 4 +-
modules/clients/pom.xml | 4 +-
modules/commons/pom.xml | 2 +-
modules/compatibility/pom.xml | 9 ++-
modules/compress/pom.xml | 2 +-
.../CacheObjectCompressionConsumptionTest.java | 3 +-
modules/control-utility/pom.xml | 2 +-
modules/core/pom.xml | 8 +--
.../java/org/apache/ignite/GridTestIoUtils.java | 21 ++++++
.../apache/ignite/testframework/GridTestUtils.java | 28 ++++++++
.../junits/multijvm/JavaVersionCommand.java | 25 ++-----
modules/dev-utils/pom.xml | 4 +-
modules/direct-io/pom.xml | 2 +-
modules/extdata/pluggable/pom.xml | 2 +-
modules/extdata/uri/config/signeddeploy/keystore | Bin 1191 -> 2716 bytes
modules/extdata/uri/pom.xml | 2 +-
modules/indexing/pom.xml | 9 +--
.../snapshot/IgniteClusterSnapshotMetricsTest.java | 3 +-
modules/jcl/pom.xml | 2 +-
modules/json/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kubernetes/pom.xml | 2 +-
modules/log4j2/pom.xml | 2 +-
modules/numa-allocator/pom.xml | 4 +-
modules/opencensus/pom.xml | 2 +-
modules/rest-http/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
.../org/apache/ignite/IgniteClientSpringBean.java | 2 +-
.../java/org/apache/ignite/IgniteSpringBean.java | 2 +-
modules/sqlline/pom.xml | 2 +-
modules/tools/pom.xml | 6 +-
modules/unsafe/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/web/ignite-websphere-test/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom-standalone.xml | 4 +-
modules/yardstick/pom.xml | 8 +--
modules/zookeeper/pom.xml | 2 +-
parent-internal/pom.xml | 2 +-
parent/pom.xml | 76 ++++++++-------------
pom.xml | 2 +-
48 files changed, 157 insertions(+), 145 deletions(-)
diff --git a/docs/_docs/code-snippets/java/pom.xml
b/docs/_docs/code-snippets/java/pom.xml
index dcdd2daa8d5..3a152c4edba 100644
--- a/docs/_docs/code-snippets/java/pom.xml
+++ b/docs/_docs/code-snippets/java/pom.xml
@@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.14.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -109,7 +109,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.5.4</version>
<configuration>
<includes>
<include>**/*.java</include>
@@ -118,7 +118,7 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.5.4</version>
</plugin>
</plugins>
</build>
diff --git a/modules/benchmarks/pom.xml b/modules/benchmarks/pom.xml
index b7c15dab10e..60bd3f0e768 100644
--- a/modules/benchmarks/pom.xml
+++ b/modules/benchmarks/pom.xml
@@ -117,7 +117,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.2</version>
+ <version>${maven.shade.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -131,19 +131,19 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
+ <version>${maven.clean.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
+ <version>${maven.deploy.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.1</version>
+ <version>${maven.install.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>${maven.jar.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -151,19 +151,19 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <version>${maven.resources.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>${maven.site.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
+ <version>${maven.source.plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20.1</version>
+ <version>${maven.surefire.plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
diff --git a/modules/binary/api/pom.xml b/modules/binary/api/pom.xml
index 65d79c7a212..15076732e4b 100644
--- a/modules/binary/api/pom.xml
+++ b/modules/binary/api/pom.xml
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
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 ac3cc172814..fa4bd41cc2c 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 @@ public class BinaryContext {
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 @@ public class BinaryContext {
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 b56dbf5b739..90e7a35a5a8 100644
--- a/modules/binary/impl/pom.xml
+++ b/modules/binary/impl/pom.xml
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml
index 538997e7241..fb42c00c240 100644
--- a/modules/calcite/pom.xml
+++ b/modules/calcite/pom.xml
@@ -256,7 +256,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/checkstyle/pom.xml b/modules/checkstyle/pom.xml
index e9df508336c..589a354960c 100644
--- a/modules/checkstyle/pom.xml
+++ b/modules/checkstyle/pom.xml
@@ -93,7 +93,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.4.0</version>
<executions>
<execution>
<id>copy-checkstyle-config</id>
@@ -117,7 +117,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
- <version>1.7.1</version>
+ <version>1.7.3</version>
<executions>
<execution>
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 851c763fd32..e299873bba9 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -145,7 +145,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>${maven.jar.plugin.version}</version>
<executions>
<execution>
<goals>
@@ -158,7 +158,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 92373097f47..750ecbc601a 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/compatibility/pom.xml b/modules/compatibility/pom.xml
index b1b95ec960c..cd6bdf794de 100644
--- a/modules/compatibility/pom.xml
+++ b/modules/compatibility/pom.xml
@@ -110,6 +110,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Note: when adding new Ignite module dependency please register it
in
org.apache.ignite.compatibility.testframework.junits.IgniteCompatibilityAbstractTest.getDependencies()
method. This will allow to use original version dependency instead
current code base. -->
@@ -138,7 +145,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/compress/pom.xml b/modules/compress/pom.xml
index b9250b7dc8d..2e970919efa 100644
--- a/modules/compress/pom.xml
+++ b/modules/compress/pom.xml
@@ -171,7 +171,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
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 ff05e7a205f..ae6de95cf1d 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.HashMap;
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 @@ public class CacheObjectCompressionConsumptionTest extends
AbstractCacheObjectCo
File nodeFolder =
((IgniteEx)node).context().pdsFolderResolver().fileTree().nodeStorage();
if (nodeFolder != null)
- pers += FileUtils.sizeOfDirectory(nodeFolder);
+ pers += GridTestUtils.sizeOfDirectory(nodeFolder);
if (mode != ConsumptionTestMode.PERSISTENT)
assertEquals(0, pers);
diff --git a/modules/control-utility/pom.xml b/modules/control-utility/pom.xml
index 51b9abc8123..908ae4e97ec 100644
--- a/modules/control-utility/pom.xml
+++ b/modules/control-utility/pom.xml
@@ -165,7 +165,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index ccb994b73a7..8737f696374 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -328,7 +328,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
@@ -337,7 +337,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.6.0</version>
+ <version>${maven.shade.plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
@@ -363,7 +363,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.4.0</version>
+ <version>${build.helper.maven.plugin.version}</version>
<executions>
<execution>
<id>add-generated-sources</id>
@@ -546,7 +546,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven.dependency.plugin.version}</version>
<executions>
<!--Required because JUnit will not detect tests
simply included in a dep-->
<execution>
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 9a3bf9c3112..3a77f5cb01d 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.ObjectInputStream;
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 @@ public final class GridTestIoUtils {
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 a26ebb80d17..cd6b30d84de 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.lang.reflect.Modifier;
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 final class GridTestUtils {
throw new RuntimeException("Unable to find serializer for message:
" + msgCls, e);
}
}
+
+ /**
+ * Calculates directory size, tolerating files that disappear during
traversal.
+ *
+ * @param dir Directory.
+ * @return Size.
+ * @throws IOException If failed.
+ */
+ public static long sizeOfDirectory(File dir) throws IOException {
+ long[] size = {0L};
+
+ Files.walkFileTree(dir.toPath(), new SimpleFileVisitor<Path>() {
+ @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 e3a2fa91924..29ed053d482 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 @@ class JavaVersionCommand {
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 c51ccdc9e29..815baa3d389 100644
--- a/modules/dev-utils/pom.xml
+++ b/modules/dev-utils/pom.xml
@@ -79,7 +79,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -88,7 +88,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4.1</version>
+ <version>${maven.assembly.plugin.version}</version>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/modules/direct-io/pom.xml b/modules/direct-io/pom.xml
index 9700fe802ec..c66ba1db4c9 100644
--- a/modules/direct-io/pom.xml
+++ b/modules/direct-io/pom.xml
@@ -134,7 +134,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/extdata/pluggable/pom.xml
b/modules/extdata/pluggable/pom.xml
index fa93410f4bc..fa5306f52a3 100644
--- a/modules/extdata/pluggable/pom.xml
+++ b/modules/extdata/pluggable/pom.xml
@@ -114,7 +114,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
diff --git a/modules/extdata/uri/config/signeddeploy/keystore
b/modules/extdata/uri/config/signeddeploy/keystore
index dc51a0fcd22..412e5784ed7 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 a146b11b123..28d0078a27e 100644
--- a/modules/extdata/uri/pom.xml
+++ b/modules/extdata/uri/pom.xml
@@ -205,7 +205,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
- <version>3.0.0</version>
+ <version>${maven.jarsigner.plugin.version}</version>
<executions>
<execution>
<id>sign-well</id>
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index e6a2554d56e..e718be452c0 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -96,13 +96,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -197,7 +190,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
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 e4dcf1c2624..9f0142cd82c 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.AttributeNotFoundException;
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 class IgniteClusterSnapshotMetricsTest extends
IgniteClusterSnapshotResto
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<Serializable> rateProp =
diff --git a/modules/jcl/pom.xml b/modules/jcl/pom.xml
index f948eecade0..1ccf7975bba 100644
--- a/modules/jcl/pom.xml
+++ b/modules/jcl/pom.xml
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/json/pom.xml b/modules/json/pom.xml
index b0e218dc37b..ae3c28928a8 100644
--- a/modules/json/pom.xml
+++ b/modules/json/pom.xml
@@ -88,7 +88,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/jta/pom.xml b/modules/jta/pom.xml
index 1346a1e9765..5a031057f2a 100644
--- a/modules/jta/pom.xml
+++ b/modules/jta/pom.xml
@@ -128,7 +128,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/kubernetes/pom.xml b/modules/kubernetes/pom.xml
index 0f6e115b65c..94c8973edb7 100644
--- a/modules/kubernetes/pom.xml
+++ b/modules/kubernetes/pom.xml
@@ -118,7 +118,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/log4j2/pom.xml b/modules/log4j2/pom.xml
index 2cba3ad2291..c5bfd3b3393 100644
--- a/modules/log4j2/pom.xml
+++ b/modules/log4j2/pom.xml
@@ -69,7 +69,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/numa-allocator/pom.xml b/modules/numa-allocator/pom.xml
index ab9f53bbf2b..8876e426c17 100644
--- a/modules/numa-allocator/pom.xml
+++ b/modules/numa-allocator/pom.xml
@@ -106,7 +106,7 @@
<plugin>
<groupId>com.googlecode.cmake-maven-project</groupId>
<artifactId>cmake-maven-plugin</artifactId>
- <version>3.31.5-b1</version>
+ <version>${cmake.maven.plugin.version}</version>
<executions>
<execution>
<id>cmake-generate</id>
@@ -198,7 +198,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/opencensus/pom.xml b/modules/opencensus/pom.xml
index 9c0abe958e1..8bd8bf01e28 100644
--- a/modules/opencensus/pom.xml
+++ b/modules/opencensus/pom.xml
@@ -147,7 +147,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index f6f86b1ae3b..daa0a831524 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -132,7 +132,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/slf4j/pom.xml b/modules/slf4j/pom.xml
index 69e4917ee75..807df528b21 100644
--- a/modules/slf4j/pom.xml
+++ b/modules/slf4j/pom.xml
@@ -76,7 +76,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/spring/pom.xml b/modules/spring/pom.xml
index a8c11444928..c08848124fd 100644
--- a/modules/spring/pom.xml
+++ b/modules/spring/pom.xml
@@ -140,7 +140,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
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 ae98397bfbb..458cf287a72 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 @@ import
org.springframework.context.event.ContextRefreshedEvent;
* 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 07934a8dc16..886b9c62bd4 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 @@ import
org.springframework.context.event.ContextRefreshedEvent;
* 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 bc43c6a241b..bcf99674bab 100644
--- a/modules/sqlline/pom.xml
+++ b/modules/sqlline/pom.xml
@@ -67,7 +67,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 8d4673070f0..08f9d569717 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -66,7 +66,7 @@
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${maven.resources.plugin.version}</version>
<executions>
<execution>
<id>copy-resources</id>
@@ -105,7 +105,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>${build.helper.maven.plugin.version}</version>
<executions>
<execution>
<id>add-source</id>
@@ -125,7 +125,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/unsafe/pom.xml b/modules/unsafe/pom.xml
index d5ddf75a605..49ff468519e 100644
--- a/modules/unsafe/pom.xml
+++ b/modules/unsafe/pom.xml
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/urideploy/pom.xml b/modules/urideploy/pom.xml
index 8927c9d5b4b..eae05153183 100644
--- a/modules/urideploy/pom.xml
+++ b/modules/urideploy/pom.xml
@@ -154,7 +154,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/web/ignite-websphere-test/pom.xml
b/modules/web/ignite-websphere-test/pom.xml
index 12027ded655..e317911b254 100644
--- a/modules/web/ignite-websphere-test/pom.xml
+++ b/modules/web/ignite-websphere-test/pom.xml
@@ -66,7 +66,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.5.1</version>
</plugin>
</plugins>
</build>
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index f5e12069f83..d75e7d45420 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -103,7 +103,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/modules/yardstick/pom-standalone.xml
b/modules/yardstick/pom-standalone.xml
index c667650c325..eb8fc763d46 100644
--- a/modules/yardstick/pom-standalone.xml
+++ b/modules/yardstick/pom-standalone.xml
@@ -129,7 +129,7 @@
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>3.9.0</version>
<executions>
<execution>
<phase>package</phase>
@@ -205,7 +205,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>3.1.4</version>
<configuration>
<skip>true</skip>
</configuration>
diff --git a/modules/yardstick/pom.xml b/modules/yardstick/pom.xml
index d6818b52eef..2cbe81c6932 100644
--- a/modules/yardstick/pom.xml
+++ b/modules/yardstick/pom.xml
@@ -125,7 +125,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>2.8</version>
+ <version>5.0.0</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -133,7 +133,7 @@
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven.dependency.plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
@@ -170,7 +170,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>${maven.jar.plugin.version}</version>
<configuration>
<outputDirectory>${basedir}/target/assembly/libs</outputDirectory>
</configuration>
@@ -208,7 +208,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml
index 7f0b6003755..28605774472 100644
--- a/modules/zookeeper/pom.xml
+++ b/modules/zookeeper/pom.xml
@@ -229,7 +229,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
+ <version>${maven.deploy.plugin.version}</version>
<configuration>
<skip>false</skip>
</configuration>
diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml
index f2128baf52c..2d802e6a236 100644
--- a/parent-internal/pom.xml
+++ b/parent-internal/pom.xml
@@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
+ <version>3.2.0</version>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 5cd61890ab5..d9108c8dd55 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -96,9 +96,9 @@
<lucene.bundle.version>7.4.0_1</lucene.bundle.version>
<lucene.version>8.11.2</lucene.version>
<lz4.version>1.10.1</lz4.version>
- <maven.bundle.plugin.version>3.5.1</maven.bundle.plugin.version>
-
<maven.checkstyle.plugin.version>3.1.2</maven.checkstyle.plugin.version>
- <maven.flatten.plugin.version>1.7.1</maven.flatten.plugin.version>
+ <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
+
<maven.checkstyle.plugin.version>3.6.0</maven.checkstyle.plugin.version>
+ <maven.flatten.plugin.version>1.7.3</maven.flatten.plugin.version>
<maven.flatten.file.name>pom-installed.xml</maven.flatten.file.name>
<maven.model.version>3.8.9</maven.model.version>
<checkstyle.puppycrawl.version>8.45</checkstyle.puppycrawl.version>
@@ -108,7 +108,7 @@
<slf4j.version>2.0.17</slf4j.version>
<snappy.version>1.1.10.7</snappy.version>
<spring.version>5.3.39</spring.version>
- <surefire.version>3.1.2</surefire.version>
+ <surefire.version>3.5.4</surefire.version>
<tomcat.version>10.0.27</tomcat.version>
<yardstick.version>0.8.3</yardstick.version>
<zookeeper.version>3.9.5</zookeeper.version>
@@ -119,8 +119,24 @@
<xstream.version>1.4.17</xstream.version>
<!-- Maven plugins versions -->
- <maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
+ <maven.javadoc.plugin.version>3.12.0</maven.javadoc.plugin.version>
<maven.enforcer.plugin.version>3.6.2</maven.enforcer.plugin.version>
+ <maven.compiler.plugin.version>3.14.1</maven.compiler.plugin.version>
+ <maven.surefire.plugin.version>3.5.4</maven.surefire.plugin.version>
+ <maven.failsafe.plugin.version>3.5.4</maven.failsafe.plugin.version>
+ <maven.shade.plugin.version>3.6.1</maven.shade.plugin.version>
+ <maven.clean.plugin.version>3.5.0</maven.clean.plugin.version>
+ <maven.deploy.plugin.version>3.1.4</maven.deploy.plugin.version>
+ <maven.install.plugin.version>3.1.4</maven.install.plugin.version>
+ <maven.jar.plugin.version>3.5.0</maven.jar.plugin.version>
+ <maven.resources.plugin.version>3.4.0</maven.resources.plugin.version>
+ <maven.site.plugin.version>3.21.0</maven.site.plugin.version>
+ <maven.source.plugin.version>3.4.0</maven.source.plugin.version>
+ <maven.assembly.plugin.version>3.8.0</maven.assembly.plugin.version>
+
<maven.dependency.plugin.version>3.9.0</maven.dependency.plugin.version>
+ <maven.jarsigner.plugin.version>3.1.0</maven.jarsigner.plugin.version>
+
<build.helper.maven.plugin.version>3.6.1</build.helper.maven.plugin.version>
+ <cmake.maven.plugin.version>3.31.5-b1</cmake.maven.plugin.version>
<sonar.organization>apache</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -259,38 +275,6 @@
</dependencies>
</plugin>
- <plugin>
- <groupId>net.alchim31.maven</groupId>
- <artifactId>scala-maven-plugin</artifactId>
- <version>3.3.2</version>
- <configuration>
- <jvmArgs>
- <jvmArg>-Xms512m</jvmArg>
- <jvmArg>-Xmx1024m</jvmArg>
- </jvmArgs>
- <args>
- <arg>-nobootcp</arg>
- </args>
- </configuration>
- <executions>
- <execution>
- <id>scala-compile-first</id>
- <phase>process-resources</phase>
- <goals>
- <goal>add-source</goal>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>scala-test-compile</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -476,13 +460,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
+ <version>${maven.resources.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
+ <version>${build.helper.maven.plugin.version}</version>
</plugin>
<plugin>
@@ -501,13 +485,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.3.2</version>
+ <version>3.6.3</version>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -575,7 +559,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
+ <version>${maven.source.plugin.version}</version>
<executions>
<execution>
<id>source</id>
@@ -609,9 +593,6 @@
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
<flattenedPomFilename>${maven.flatten.file.name}</flattenedPomFilename>
- <pomElements>
- <properties>resolve</properties>
- </pomElements>
</configuration>
<phase>process-resources</phase>
<goals>
@@ -936,7 +917,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
<compilerArgs>
<arg>--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED</arg>
@@ -1015,7 +996,6 @@
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>15</maven.compiler.target>
- <scala.library.version>2.12.15</scala.library.version>
</properties>
<dependencies/>
<build>
@@ -1023,7 +1003,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>${maven.compiler.plugin.version}</version>
<configuration>
<compilerArgs>
<arg>--add-exports</arg>
diff --git a/pom.xml b/pom.xml
index 02103bcccd0..97f40222cc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -402,7 +402,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>${maven.assembly.plugin.version}</version>
<inherited>false</inherited>
<executions>
<execution>
