Skip to content

Commit bf48af7

Browse files
committed
Revert "Add a separate import group for jakarta imports"
This reverts commit 3076583. Closes gh-301
1 parent a4cd7e2 commit bf48af7

File tree

4 files changed

+2
-44
lines changed

4 files changed

+2
-44
lines changed

spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/org.eclipse.jdt.ui.prefs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ formatter_settings_version=13
6464
org.eclipse.jdt.ui.exception.name=e
6565
org.eclipse.jdt.ui.gettersetter.use.is=true
6666
org.eclipse.jdt.ui.ignorelowercasenames=true
67-
org.eclipse.jdt.ui.importorder=java;javax;jakarta;;org.springframework;\#;
67+
org.eclipse.jdt.ui.importorder=java;javax;;org.springframework;\#;
6868
org.eclipse.jdt.ui.javadoc=true
6969
org.eclipse.jdt.ui.keywordthis=false
7070
org.eclipse.jdt.ui.ondemandthreshold=9999

spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/SpringImportOrderCheck.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public SpringImportOrderCheck() {
3939
}
4040

4141
public void setProjectRootPackage(String projectRootPackage) {
42-
setGroups("java", "/^javax?\\./", "/^jakarta?\\./", "*", projectRootPackage);
42+
setGroups("java", "/^javax?\\./", "*", projectRootPackage);
4343
}
4444

4545
}

spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/ImportOrderValid.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/ImportOrderValid.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)