Rename launcher.main package to launcher.core

documentation/src/test/java/example/UsingTheLauncherDemo.java

@@ -19,9 +19,9 @@
 import org.junit.gen5.launcher.TestDiscoveryRequest;
 import org.junit.gen5.launcher.TestExecutionListener;
 import org.junit.gen5.launcher.TestPlan;
+import org.junit.gen5.launcher.core.LauncherFactory;
+import org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder;
 import org.junit.gen5.launcher.listeners.SummaryGeneratingListener;
-import org.junit.gen5.launcher.main.LauncherFactory;
-import org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder;
 import org.junit.jupiter.api.Test;
 // end::imports[]
 

junit-console/src/main/java/org/junit/gen5/console/tasks/DiscoveryRequestCreator.java

@@ -18,7 +18,7 @@
 import static org.junit.gen5.launcher.EngineFilter.includeEngines;
 import static org.junit.gen5.launcher.TagFilter.excludeTags;
 import static org.junit.gen5.launcher.TagFilter.includeTags;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 
 import java.io.File;
 import java.util.LinkedHashSet;

junit-console/src/main/java/org/junit/gen5/console/tasks/ExecuteTestsTask.java

@@ -24,9 +24,9 @@
 import org.junit.gen5.console.options.CommandLineOptions;
 import org.junit.gen5.launcher.Launcher;
 import org.junit.gen5.launcher.TestDiscoveryRequest;
+import org.junit.gen5.launcher.core.LauncherFactory;
 import org.junit.gen5.launcher.listeners.SummaryGeneratingListener;
 import org.junit.gen5.launcher.listeners.TestExecutionSummary;
-import org.junit.gen5.launcher.main.LauncherFactory;
 
 /**
  * @since 5.0

junit-launcher/src/main/java/org/junit/gen5/launcher/Launcher.java

@@ -24,7 +24,7 @@
  * each test engine has an {@linkplain org.junit.gen5.engine.TestEngine#getId ID}
  * that is unique among the registered test engines. For example, the
  * default implementation returned by
- * {@link org.junit.gen5.launcher.main.LauncherFactory#create LauncherFactory.create()}
+ * {@link org.junit.gen5.launcher.core.LauncherFactory#create LauncherFactory.create()}
  * dynamically discovers test engines via Java's
  * {@link java.util.ServiceLoader ServiceLoader} mechanism.
  *
@@ -46,7 +46,7 @@
  * @see TestDiscoveryRequest
  * @see TestPlan
  * @see TestExecutionListener
- * @see org.junit.gen5.launcher.main.LauncherFactory
+ * @see org.junit.gen5.launcher.core.LauncherFactory
  * @see org.junit.gen5.engine.TestEngine
  */
 @API(Experimental)

junit-launcher/src/main/java/org/junit/gen5/launcher/TestDiscoveryRequest.java

@@ -26,7 +26,7 @@
  * that provides access to filters which are applied by the {@link Launcher} itself.
  *
  * <p>Moreover, the {@code add*()} methods can be used by external clients that do
- * not want to use the {@link org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder}.
+ * not want to use the {@link org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder}.
  *
  * @since 5.0
  */

junit-launcher/src/main/java/org/junit/gen5/launcher/main/DefaultLauncher.java → junit-launcher/src/main/java/org/junit/gen5/launcher/core/DefaultLauncher.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.launcher.main;
+package org.junit.gen5.launcher.core;
 
 import java.util.HashSet;
 import java.util.Set;

junit-launcher/src/main/java/org/junit/gen5/launcher/main/DiscoveryRequest.java → junit-launcher/src/main/java/org/junit/gen5/launcher/core/DiscoveryRequest.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.launcher.main;
+package org.junit.gen5.launcher.core;
 
 import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.toList;

junit-launcher/src/main/java/org/junit/gen5/launcher/main/ExecutionListenerAdapter.java → junit-launcher/src/main/java/org/junit/gen5/launcher/core/ExecutionListenerAdapter.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.launcher.main;
+package org.junit.gen5.launcher.core;
 
 import org.junit.gen5.engine.EngineExecutionListener;
 import org.junit.gen5.engine.TestDescriptor;

junit-launcher/src/main/java/org/junit/gen5/launcher/main/LauncherConfigurationParameters.java → junit-launcher/src/main/java/org/junit/gen5/launcher/core/LauncherConfigurationParameters.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.launcher.main;
+package org.junit.gen5.launcher.core;
 
 import java.util.HashMap;
 import java.util.Map;

junit-launcher/src/main/java/org/junit/gen5/launcher/main/LauncherFactory.java → junit-launcher/src/main/java/org/junit/gen5/launcher/core/LauncherFactory.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.launcher.main;
+package org.junit.gen5.launcher.core;
 
 import static org.junit.gen5.commons.meta.API.Usage.Experimental;
 

junit-launcher/src/main/java/org/junit/gen5/launcher/main/Root.java → junit-launcher/src/main/java/org/junit/gen5/launcher/core/Root.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.launcher.main;
+package org.junit.gen5.launcher.core;
 
 import static org.junit.gen5.engine.Filter.composeFilters;
 

junit-launcher/src/main/java/org/junit/gen5/launcher/main/ServiceLoaderTestEngineRegistry.java → junit-launcher/src/main/java/org/junit/gen5/launcher/core/ServiceLoaderTestEngineRegistry.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.launcher.main;
+package org.junit.gen5.launcher.core;
 
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.StreamSupport.stream;

junit-launcher/src/main/java/org/junit/gen5/launcher/main/TestDiscoveryRequestBuilder.java → junit-launcher/src/main/java/org/junit/gen5/launcher/core/TestDiscoveryRequestBuilder.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.launcher.main;
+package org.junit.gen5.launcher.core;
 
 import static org.junit.gen5.commons.meta.API.Usage.Experimental;
 

junit-launcher/src/main/java/org/junit/gen5/launcher/main/TestExecutionListenerRegistry.java → junit-launcher/src/main/java/org/junit/gen5/launcher/core/TestExecutionListenerRegistry.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.launcher.main;
+package org.junit.gen5.launcher.core;
 
 import java.util.LinkedList;
 import java.util.List;

junit-launcher/src/main/java/org/junit/gen5/launcher/core/package-info.java

@@ -0,0 +1,8 @@
+/**
+ * Core support classes for the {@link org.junit.gen5.launcher.Launcher Launcher}
+ * including the {@link org.junit.gen5.launcher.core.LauncherFactory LauncherFactory}
+ * and the {@link org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder
+ * TestDiscoveryRequestBuilder}.
+ */
+
+package org.junit.gen5.launcher.core;

junit4-engine/src/test/java/org/junit/vintage/engine/JUnit4TestEngineDiscoveryTests.java

@@ -22,7 +22,7 @@
 import static org.junit.gen5.engine.discovery.MethodSelector.selectMethod;
 import static org.junit.gen5.engine.discovery.PackageSelector.selectPackage;
 import static org.junit.gen5.engine.discovery.UniqueIdSelector.selectUniqueId;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

junit4-engine/src/test/java/org/junit/vintage/engine/JUnit4TestEngineExecutionTests.java

@@ -25,7 +25,7 @@
 import static org.junit.gen5.engine.test.event.ExecutionEventConditions.uniqueIdSubstring;
 import static org.junit.gen5.engine.test.event.TestExecutionResultConditions.isA;
 import static org.junit.gen5.engine.test.event.TestExecutionResultConditions.message;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.runner.Description.createSuiteDescription;
 import static org.junit.runner.Description.createTestDescription;
 
@@ -41,29 +41,7 @@
 import org.junit.runner.Runner;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.vintage.engine.samples.junit3.PlainJUnit3TestCaseWithSingleTestWhichFails;
-import org.junit.vintage.engine.samples.junit4.EnclosedJUnit4TestCase;
-import org.junit.vintage.engine.samples.junit4.IgnoredJUnit4TestCase;
-import org.junit.vintage.engine.samples.junit4.JUnit4SuiteOfSuiteWithIgnoredJUnit4TestCase;
-import org.junit.vintage.engine.samples.junit4.JUnit4SuiteOfSuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass;
-import org.junit.vintage.engine.samples.junit4.JUnit4SuiteOfSuiteWithJUnit4TestCaseWithErrorInBeforeClass;
-import org.junit.vintage.engine.samples.junit4.JUnit4SuiteWithExceptionThrowingRunner;
-import org.junit.vintage.engine.samples.junit4.JUnit4SuiteWithIgnoredJUnit4TestCase;
-import org.junit.vintage.engine.samples.junit4.JUnit4SuiteWithJUnit3SuiteWithSingleTestCase;
-import org.junit.vintage.engine.samples.junit4.JUnit4SuiteWithJUnit4TestCaseWithAssumptionFailureInBeforeClass;
-import org.junit.vintage.engine.samples.junit4.JUnit4SuiteWithJUnit4TestCaseWithErrorInBeforeClass;
-import org.junit.vintage.engine.samples.junit4.JUnit4SuiteWithPlainJUnit4TestCaseWithSingleTestWhichIsIgnored;
-import org.junit.vintage.engine.samples.junit4.JUnit4TestCaseWithAssumptionFailureInBeforeClass;
-import org.junit.vintage.engine.samples.junit4.JUnit4TestCaseWithErrorInAfterClass;
-import org.junit.vintage.engine.samples.junit4.JUnit4TestCaseWithErrorInBeforeClass;
-import org.junit.vintage.engine.samples.junit4.JUnit4TestCaseWithExceptionThrowingRunner;
-import org.junit.vintage.engine.samples.junit4.JUnit4TestCaseWithOverloadedMethod;
-import org.junit.vintage.engine.samples.junit4.JUnit4TestCaseWithRunnerWithCustomUniqueIds;
-import org.junit.vintage.engine.samples.junit4.MalformedJUnit4TestCase;
-import org.junit.vintage.engine.samples.junit4.ParameterizedTestCase;
-import org.junit.vintage.engine.samples.junit4.PlainJUnit4TestCaseWithFiveTestMethods;
-import org.junit.vintage.engine.samples.junit4.PlainJUnit4TestCaseWithSingleTestWhichFails;
-import org.junit.vintage.engine.samples.junit4.PlainJUnit4TestCaseWithSingleTestWhichIsIgnored;
-import org.junit.vintage.engine.samples.junit4.PlainJUnit4TestCaseWithTwoTestMethods;
+import org.junit.vintage.engine.samples.junit4.*;
 
 /**
  * @since 5.0

junit4-engine/src/test/java/org/junit/vintage/engine/discovery/JUnit4DiscoveryRequestResolverTests.java

@@ -14,7 +14,7 @@
 import static org.junit.gen5.commons.util.CollectionUtils.getOnlyElement;
 import static org.junit.gen5.engine.FilterResult.includedIf;
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.vintage.engine.JUnit4UniqueIdBuilder.engineId;
 

junit4-runner/src/main/java/org/junit/gen5/junit4/runner/JUnitPlatform.java

@@ -19,7 +19,7 @@
 import static org.junit.gen5.launcher.EngineFilter.includeEngines;
 import static org.junit.gen5.launcher.TagFilter.excludeTags;
 import static org.junit.gen5.launcher.TagFilter.includeTags;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -37,7 +37,7 @@
 import org.junit.gen5.launcher.TestDiscoveryRequest;
 import org.junit.gen5.launcher.TestIdentifier;
 import org.junit.gen5.launcher.TestPlan;
-import org.junit.gen5.launcher.main.LauncherFactory;
+import org.junit.gen5.launcher.core.LauncherFactory;
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;

junit5-engine/src/test/java/org/junit/jupiter/engine/AbstractJUnit5TestEngineTests.java

@@ -11,7 +11,7 @@
 package org.junit.jupiter.engine;
 
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 
 import org.junit.gen5.engine.ExecutionRequest;
 import org.junit.gen5.engine.TestDescriptor;

junit5-engine/src/test/java/org/junit/jupiter/engine/DisabledTests.java

@@ -11,7 +11,7 @@
 package org.junit.jupiter.engine;
 
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 

junit5-engine/src/test/java/org/junit/jupiter/engine/DiscoveryFilterApplierTests.java

@@ -10,7 +10,7 @@
 
 package org.junit.jupiter.engine;
 
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.engine.descriptor.TestDescriptorBuilder.classTestDescriptor;
 import static org.junit.jupiter.engine.descriptor.TestDescriptorBuilder.engineDescriptor;
 import static org.junit.jupiter.engine.descriptor.TestDescriptorBuilder.nestedClassTestDescriptor;

junit5-engine/src/test/java/org/junit/jupiter/engine/DiscoveryTests.java

@@ -12,7 +12,7 @@
 
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
 import static org.junit.gen5.engine.discovery.UniqueIdSelector.selectUniqueId;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.lang.annotation.Retention;

junit5-engine/src/test/java/org/junit/jupiter/engine/DynamicTestGenerationTests.java

@@ -22,7 +22,7 @@
 import static org.junit.gen5.engine.test.event.ExecutionEventConditions.started;
 import static org.junit.gen5.engine.test.event.ExecutionEventConditions.test;
 import static org.junit.gen5.engine.test.event.TestExecutionResultConditions.message;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

junit5-engine/src/test/java/org/junit/jupiter/engine/ExceptionHandlingTests.java

@@ -22,7 +22,7 @@
 import static org.junit.gen5.engine.test.event.TestExecutionResultConditions.isA;
 import static org.junit.gen5.engine.test.event.TestExecutionResultConditions.message;
 import static org.junit.gen5.engine.test.event.TestExecutionResultConditions.suppressed;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;

junit5-engine/src/test/java/org/junit/jupiter/engine/NestedTestClassesTests.java

@@ -11,7 +11,7 @@
 package org.junit.jupiter.engine;
 
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

junit5-engine/src/test/java/org/junit/jupiter/engine/ReportingTests.java

@@ -11,7 +11,7 @@
 package org.junit.jupiter.engine;
 
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 

junit5-engine/src/test/java/org/junit/jupiter/engine/StandardTestClassTests.java

@@ -11,7 +11,7 @@
 package org.junit.jupiter.engine;
 
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;

junit5-engine/src/test/java/org/junit/jupiter/engine/TestCaseWithInheritanceTests.java

@@ -11,7 +11,7 @@
 package org.junit.jupiter.engine;
 
 import static org.junit.gen5.engine.discovery.MethodSelector.selectMethod;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;

junit5-engine/src/test/java/org/junit/jupiter/engine/discovery/DiscoverySelectorResolverTests.java

@@ -13,7 +13,7 @@
 import static java.util.Collections.singleton;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.gen5.engine.discovery.ClasspathSelector.selectClasspathRoots;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;

junit5-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterAllTests.java

@@ -12,7 +12,7 @@
 
 import static java.util.Arrays.asList;
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;

junit5-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterEachTests.java

@@ -12,7 +12,7 @@
 
 import static java.util.Arrays.asList;
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;

junit5-engine/src/test/java/org/junit/jupiter/engine/extension/BeforeAndAfterTestExecutionCallbackTests.java

@@ -12,7 +12,7 @@
 
 import static java.util.Arrays.asList;
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;

junit5-engine/src/test/java/org/junit/jupiter/engine/extension/ExecutionConditionTests.java

@@ -11,7 +11,7 @@
 package org.junit.jupiter.engine.extension;
 
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.engine.Constants.DEACTIVATE_CONDITIONS_PATTERN_PROPERTY_NAME;

junit5-engine/src/test/java/org/junit/jupiter/engine/extension/TestExecutionExceptionHandlerTests.java

@@ -22,7 +22,7 @@
 import static org.junit.gen5.engine.test.event.ExecutionEventConditions.test;
 import static org.junit.gen5.engine.test.event.TestExecutionResultConditions.isA;
 import static org.junit.gen5.engine.test.event.TestExecutionResultConditions.message;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;

junit5-engine/src/test/java/org/junit/jupiter/engine/extension/TestInstancePostProcessorTests.java

@@ -12,7 +12,7 @@
 
 import static java.util.Arrays.asList;
 import static org.junit.gen5.engine.discovery.ClassSelector.selectClass;
-import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request;
+import static org.junit.gen5.launcher.core.TestDiscoveryRequestBuilder.request;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;

platform-tests/src/test/java/org/junit/gen5/console/tasks/ExecuteTestsTaskTests.java

@@ -12,7 +12,7 @@
 
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.gen5.launcher.main.LauncherFactoryForTestingPurposesOnly.createLauncher;
+import static org.junit.gen5.launcher.core.LauncherFactoryForTestingPurposesOnly.createLauncher;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.fail;