Merge remote-tracking branch 'origin/master' into ignite-26584

# Conflicts:
#	modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiDiscoverySelfTestSuite.java

Author: anton-vinogradov

modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/plugins/DisabledRollingUpgradeProcessor.java

@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.compatibility.testframework.plugins;
+
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeProcessor;
+import org.apache.ignite.spi.IgniteNodeValidationResult;
+import org.jetbrains.annotations.Nullable;
+
+/** Disabled rolling upgrade processor. */
+public class DisabledRollingUpgradeProcessor extends RollingUpgradeProcessor {
+    /**
+     * @param ctx Kernal context.
+     */
+    public DisabledRollingUpgradeProcessor(GridKernalContext ctx) {
+        super(ctx);
+    }
+
+    /** {@inheritDoc} */
+    @Nullable @Override public IgniteNodeValidationResult validateNode(ClusterNode node) {
+        return null;
+    }
+}

modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/plugins/TestCompatibilityPluginProvider.java

@@ -105,7 +105,14 @@ public class TestCompatibilityPluginProvider implements PluginProvider {
     /** {@inheritDoc} */
     @Nullable @Override public Object createComponent(PluginContext ctx, Class cls) {
         if (DiscoveryNodeValidationProcessor.class == cls)
-            return new DisabledValidationProcessor(kCtx);
+            try {
+                Class.forName("org.apache.ignite.internal.processors.rollingupgrade.RollingUpgradeProcessor");
+
+                return new DisabledRollingUpgradeProcessor(kCtx);
+            }
+            catch (ClassNotFoundException ignore) {
+                return new DisabledValidationProcessor(kCtx);
+            }
 
         return null;
     }

modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtils.java

@@ -165,7 +165,8 @@ private static Collection<String> mavenProjectRepositories() throws Exception {
             return F.transform(model.getRepositories(), RepositoryBase::getUrl);
         }
         finally {
-            Files.deleteIfExists(outPath);
+            if (!U.isWindows())
+                Files.deleteIfExists(outPath);
         }
     }
 
@@ -191,7 +192,7 @@ private static void downloadArtifact(String artifact) throws Exception {
     }
 
     /**
-     * Executes given command in operation system.
+     * Executes given command in operating system.
      *
      * @param cmd Command to execute.
      * @return Output of result of executed command.
@@ -238,12 +239,48 @@ private static String exec(String cmd) throws Exception {
         }
     }
 
+    /**
+     * Adds escape characters to path elements that contain spaces.
+     *
+     * @param path Original path with unescaped elements.
+     * @return Path with escaped elements.
+     */
+    public static String escapeSpaceCharsInPath(String path) {
+        int startBSlashIdx = path.indexOf('\\');
+        int endBSlashIdx = path.indexOf('\\', startBSlashIdx + 1);
+
+        if (endBSlashIdx < 0)
+            return path;
+
+        StringBuilder res = new StringBuilder(path.substring(0, startBSlashIdx));
+
+        while (endBSlashIdx > 0) {
+            String substring = path.substring(startBSlashIdx + 1, endBSlashIdx);
+
+            if (substring.contains(" "))
+                res.append("\\\"").append(substring).append("\"");
+            else
+                res.append("\\").append(substring);
+
+            startBSlashIdx = endBSlashIdx;
+            endBSlashIdx = path.indexOf('\\', startBSlashIdx + 1);
+        }
+
+        res.append("\\")
+            .append(path.substring(startBSlashIdx + 1));
+
+        return res.toString();
+    }
+
     /**
      * @return Maven executable command.
      */
     private static String buildMvnCommand() {
         String mvnCmd = resolveMavenApplicationPath();
 
+        if (U.isWindows())
+            mvnCmd = escapeSpaceCharsInPath(mvnCmd);
+
         Path mvnSettingsFilePath = resolveMavenSettingsFilePath();
 
         if (Files.exists(mvnSettingsFilePath))

modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/util/MavenUtilsTest.java

@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.compatibility.testframework.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.apache.ignite.compatibility.testframework.util.MavenUtils.escapeSpaceCharsInPath;
+
+/**
+ * Test class for {@link MavenUtils}.
+ */
+public class MavenUtilsTest {
+    /** Remains the same. */
+    private static final String NO_NEED_TO_ESCAPE_PATH_0 = "C:\\maven\\mvn.bat clean install";
+
+    /** Remains the same. */
+    private static final String NO_NEED_TO_ESCAPE_PATH_1 = "C:\\mvn.bat clean install";
+
+    /** Space chars in the middle of the path require escaping. */
+    private static final String UNESCAPED_PATH_0 = "C:\\software\\Apache Software Foundation\\maven\\bin\\mvn.bat dependency:tree";
+
+    /** Path with space chars escaped. */
+    private static final String ESCAPED_PATH_0 = "C:\\software\\\"Apache Software Foundation\"\\maven\\bin\\mvn.bat dependency:tree";
+
+    /** Space chars in several elements of the path require escaping. */
+    private static final String UNESCAPED_PATH_1 = "C:\\Program Files\\Apache Software Foundation\\maven\\bin\\mvn.bat clean install";
+
+    /** Path with space chars escaped. */
+    private static final String ESCAPED_PATH_1 = "C:\\\"Program Files\"\\\"Apache Software Foundation\"\\maven\\bin\\mvn.bat clean install";
+
+    /** */
+    @Test
+    public void testPathsWithoutSpacesStayUnchanged() {
+        Assert.assertEquals(NO_NEED_TO_ESCAPE_PATH_0, escapeSpaceCharsInPath(NO_NEED_TO_ESCAPE_PATH_0));
+
+        Assert.assertEquals(NO_NEED_TO_ESCAPE_PATH_1, escapeSpaceCharsInPath(NO_NEED_TO_ESCAPE_PATH_1));
+    }
+
+    /** */
+    @Test
+    public void testPathsWithSpaceCharsEscaped() {
+        Assert.assertEquals(ESCAPED_PATH_0, escapeSpaceCharsInPath(UNESCAPED_PATH_0));
+
+        Assert.assertEquals(ESCAPED_PATH_1, escapeSpaceCharsInPath(UNESCAPED_PATH_1));
+    }
+}

modules/compatibility/src/test/java/org/apache/ignite/compatibility/testsuites/IgniteCompatibilityBasicTestSuite.java

@@ -30,6 +30,7 @@
 import org.apache.ignite.compatibility.persistence.MoveBinaryMetadataCompatibility;
 import org.apache.ignite.compatibility.persistence.PersistenceBasicCompatibilityTest;
 import org.apache.ignite.compatibility.persistence.SnapshotCompatibilityTest;
+import org.apache.ignite.compatibility.testframework.util.MavenUtilsTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
@@ -38,6 +39,7 @@
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
+    MavenUtilsTest.class,
     PersistenceBasicCompatibilityTest.class,
     InlineJavaObjectCompatibilityTest.class,
     IndexTypesCompatibilityTest.class,