This is an automated email from the ASF dual-hosted git repository.
namelchev 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 1cb7784d9dc IGNITE-20145 Update maven surefire version (#10875)
1cb7784d9dc is described below
commit 1cb7784d9dcaa3cff0d737032cbe1a5577cb2c9b
Author: Nikita Amelchev <[email protected]>
AuthorDate: Wed Aug 9 18:22:41 2023 +0300
IGNITE-20145 Update maven surefire version (#10875)
---
.../StatisticsCommandDdlIntegrationTest.java | 2 +-
.../query/calcite/sql/SqlCustomParserTest.java | 2 +-
modules/tools/pom.xml | 2 +-
.../surefire/TestSuiteAwareTestsetReporter.java | 12 ++++-----
.../surefire/testsuites/IgniteTestsProvider.java | 30 ++++++++++++----------
...e.maven.surefire.api.provider.SurefireProvider} | 0
parent/pom.xml | 2 +-
7 files changed, 26 insertions(+), 24 deletions(-)
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java
index 5b6448f7c94..dca7529c544 100644
---
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java
+++
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java
@@ -18,7 +18,7 @@ package
org.apache.ignite.internal.processors.query.calcite.integration;
import java.util.List;
import java.util.function.Predicate;
-import com.google.inject.internal.util.Lists;
+import com.google.common.collect.Lists;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.IgniteEx;
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/SqlCustomParserTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/SqlCustomParserTest.java
index e8e0eebd52a..07da8894293 100644
---
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/SqlCustomParserTest.java
+++
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/sql/SqlCustomParserTest.java
@@ -24,7 +24,7 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import com.google.common.collect.ImmutableList;
-import com.google.inject.internal.util.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
import org.apache.calcite.sql.SqlCall;
import org.apache.calcite.sql.SqlIdentifier;
import org.apache.calcite.sql.SqlKind;
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 40a86d6b34b..f333f9af0a7 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -107,7 +107,7 @@
<resource>
<directory>src/main/resources</directory>
<excludes>
-
<exclude>META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider</exclude>
+
<exclude>META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider</exclude>
</excludes>
</resource>
</resources>
diff --git
a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/TestSuiteAwareTestsetReporter.java
b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/TestSuiteAwareTestsetReporter.java
index b02ea3423a5..677dd884e9d 100644
---
a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/TestSuiteAwareTestsetReporter.java
+++
b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/TestSuiteAwareTestsetReporter.java
@@ -23,13 +23,13 @@ import
org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugin.surefire.report.ConsoleReporter;
import org.apache.maven.plugin.surefire.report.TestSetStats;
import org.apache.maven.plugin.surefire.report.WrappedReportEntry;
+import org.apache.maven.surefire.api.report.ReportEntry;
+import org.apache.maven.surefire.api.report.TestSetReportEntry;
import
org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener;
-import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.TestSetReportEntry;
-import
org.apache.maven.surefire.shade.common.org.apache.maven.shared.utils.logging.MessageBuilder;
-import
org.apache.maven.surefire.shade.common.org.apache.maven.shared.utils.logging.MessageUtils;
+import org.apache.maven.surefire.shared.utils.logging.MessageBuilder;
+import org.apache.maven.surefire.shared.utils.logging.MessageUtils;
-import static
org.apache.maven.surefire.report.CategorizedReportEntry.GROUP_PREFIX;
+import static
org.apache.maven.surefire.api.report.CategorizedReportEntry.GROUP_PREFIX;
/** */
public class TestSuiteAwareTestsetReporter extends
SurefireStatelessTestsetInfoReporter {
@@ -38,7 +38,7 @@ public class TestSuiteAwareTestsetReporter extends
SurefireStatelessTestsetInfoR
ConsoleLogger log) {
return new ConsoleReporter(log, false, false) {
/** */
- public void testSetStarting(TestSetReportEntry report) {
+ @Override public void testSetStarting(TestSetReportEntry report) {
MessageBuilder builder = MessageUtils.buffer();
JUnitTeamcityReporter.suite =
concatenateWithTestGroup(builder, report);
diff --git
a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java
b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java
index 86417439edd..9967fd2bdf7 100644
---
a/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java
+++
b/modules/tools/src/main/java/org/apache/ignite/tools/surefire/testsuites/IgniteTestsProvider.java
@@ -18,23 +18,25 @@
package org.apache.ignite.tools.surefire.testsuites;
import java.util.Collections;
+import org.apache.maven.surefire.api.provider.AbstractProvider;
+import org.apache.maven.surefire.api.provider.ProviderParameters;
+import org.apache.maven.surefire.api.report.OutputReportEntry;
+import org.apache.maven.surefire.api.report.ReporterFactory;
+import org.apache.maven.surefire.api.report.RunListener;
+import org.apache.maven.surefire.api.report.SimpleReportEntry;
+import org.apache.maven.surefire.api.report.TestOutputReceiver;
+import org.apache.maven.surefire.api.suite.RunResult;
+import org.apache.maven.surefire.api.testset.TestSetFailedException;
+import org.apache.maven.surefire.api.util.ScanResult;
+import org.apache.maven.surefire.api.util.ScannerFilter;
import org.apache.maven.surefire.common.junit4.JUnit4StackTraceWriter;
import org.apache.maven.surefire.common.junit48.JUnit48TestChecker;
-import org.apache.maven.surefire.providerapi.AbstractProvider;
-import org.apache.maven.surefire.providerapi.ProviderParameters;
-import org.apache.maven.surefire.report.ConsoleOutputReceiver;
-import org.apache.maven.surefire.report.ReporterFactory;
-import org.apache.maven.surefire.report.RunListener;
-import org.apache.maven.surefire.report.SimpleReportEntry;
-import org.apache.maven.surefire.suite.RunResult;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.apache.maven.surefire.util.ScanResult;
-import org.apache.maven.surefire.util.ScannerFilter;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
-import static
org.apache.maven.surefire.report.ConsoleOutputCapture.startCapture;
+import static
org.apache.maven.surefire.api.report.ConsoleOutputCapture.startCapture;
+import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN;
/**
* Goal of the provider to find unit tests that are not part of any test suite
and notify user about it.
@@ -108,17 +110,17 @@ public class IgniteTestsProvider extends AbstractProvider
{
private void writeFailureToOutput(Failure failure) throws
TestSetFailedException {
try {
SimpleReportEntry report = SimpleReportEntry.withException(
+ NORMAL_RUN, 0L,
failure.getDescription().getClassName(), null,
failure.getDescription().getMethodName(), null,
new JUnit4StackTraceWriter(failure));
- RunListener reporter = reporterFactory.createReporter();
+ RunListener reporter = reporterFactory.createTestReportListener();
- startCapture((ConsoleOutputReceiver)reporter);
+ startCapture((TestOutputReceiver<OutputReportEntry>)reporter);
reporter.testFailed(report);
reporter.testSetCompleted(report);
-
}
catch (Exception e) {
throw new TestSetFailedException("Failed to dump exception to
stdout");
diff --git
a/modules/tools/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
b/modules/tools/src/main/resources/META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider
similarity index 100%
rename from
modules/tools/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
rename to
modules/tools/src/main/resources/META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider
diff --git a/parent/pom.xml b/parent/pom.xml
index e3fea1ca9e7..a1bcf26bdd2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -140,7 +140,7 @@
<snappy.version>1.1.8.4</snappy.version>
<spring.version>5.2.22.RELEASE</spring.version>
<storm.version>1.1.1</storm.version>
- <surefire.version>3.0.0-M4</surefire.version>
+ <surefire.version>3.0.0-M6</surefire.version>
<tomcat.version>9.0.63</tomcat.version>
<twitter.hbc.version>2.2.0</twitter.hbc.version>
<yammer.metrics.annotation.version>2.2.0</yammer.metrics.annotation.version>
