From 4288cf1233b4af6002e922cb9ddd1b159fe2c9b3 Mon Sep 17 00:00:00 2001 From: Marc Philipp Date: Sat, 28 Jan 2023 13:56:34 +0100 Subject: [PATCH] Restore current import order --- .../platform/console/options/SelectorConverter.java | 1 + .../tooling/support/tests/AntStarterTests.java | 1 + .../tooling/support/tests/GradleModuleFileTests.java | 1 + .../support/tests/JarContainsManifestFirstTests.java | 1 + .../tooling/support/tests/MavenPomFileTests.java | 1 + .../support/tests/PackageCyclesDetectionTests.java | 1 + src/eclipse/junit-eclipse.importorder | 11 ++++++++--- 7 files changed, 14 insertions(+), 3 deletions(-) diff --git a/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java index 65f338daa2eb..72ea077e67bd 100644 --- a/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java +++ b/junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java @@ -36,6 +36,7 @@ import org.junit.platform.engine.discovery.ModuleSelector; import org.junit.platform.engine.discovery.PackageSelector; import org.junit.platform.engine.discovery.UriSelector; + import picocli.CommandLine.ITypeConverter; class SelectorConverter { diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java index 4125ae2c00dc..d891716c51d3 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java +++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java @@ -21,6 +21,7 @@ import org.apache.tools.ant.Main; import org.junit.jupiter.api.Test; + import platform.tooling.support.Request; /** diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java index 008e4bfba5bc..8c72f4ee63e3 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java +++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleModuleFileTests.java @@ -16,6 +16,7 @@ import java.util.List; import org.junit.jupiter.api.Test; + import platform.tooling.support.MavenRepo; /** diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java index ee2d7fae37d3..05c824ced1e6 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java +++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JarContainsManifestFirstTests.java @@ -19,6 +19,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; + import platform.tooling.support.MavenRepo; /** diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java index 5b5b6f428b94..db91462c78f7 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java +++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenPomFileTests.java @@ -16,6 +16,7 @@ import java.util.List; import org.junit.jupiter.api.Test; + import platform.tooling.support.MavenRepo; /** diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java index 1162db674359..78f35146f372 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java +++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/PackageCyclesDetectionTests.java @@ -18,6 +18,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; + import platform.tooling.support.MavenRepo; /** diff --git a/src/eclipse/junit-eclipse.importorder b/src/eclipse/junit-eclipse.importorder index daded8e1f6af..56cb0619d774 100644 --- a/src/eclipse/junit-eclipse.importorder +++ b/src/eclipse/junit-eclipse.importorder @@ -2,6 +2,11 @@ 0=java 1=javax 2=jdk -3=com -4=io -5=org +3=aQute +4=junit +5=de +6=com +7=example +8=extensions +9=io +10=org