IGNITE-28462 Upgrade remaining Maven plugins

docs/_docs/code-snippets/java/pom.xml

@@ -101,15 +101,15 @@
             <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>
                 </configuration>
             </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>

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,39 +131,39 @@
             <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>
                     <version>${maven.javadoc.plugin.version}</version>
                 </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>

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>

modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java

@@ -490,7 +490,8 @@ private static Iterable<String> 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);
                                 }
                             }

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>

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>

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>

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>

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>

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>

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>

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<Integer, Object> keyGen, Function<I
                 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);

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>

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>

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);
+    }
 }

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 <T extends Message> MessageSerializer<T> loadSerializer(Class<? ex
             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];
+    }
 }

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);
-    }
 }